Merge pull request #3076 from brauner/2019-07-03/network_fixes

src/lxc/network.h

@@ -278,8 +278,8 @@ extern int lxc_requests_empty_network(struct lxc_handler *handler);
 extern int lxc_restore_phys_nics_to_netns(struct lxc_handler *handler);
 extern int lxc_setup_network_in_child_namespaces(const struct lxc_conf *conf,
 						 struct lxc_list *network);
-extern int lxc_network_send_veth_names_to_child(struct lxc_handler *handler);
-extern int lxc_network_recv_veth_names_from_parent(struct lxc_handler *handler);
+extern int lxc_network_send_to_child(struct lxc_handler *handler);
+extern int lxc_network_recv_from_parent(struct lxc_handler *handler);
 extern int lxc_network_send_name_and_ifindex_to_parent(struct lxc_handler *handler);
 extern int lxc_network_recv_name_and_ifindex_from_child(struct lxc_handler *handler);
 extern int lxc_netns_set_nsid(int netns_fd);

src/lxc/start.c

@@ -1194,7 +1194,7 @@ static int do_start(void *data)
 		goto out_error;
 
 	if (handler->ns_clone_flags & CLONE_NEWNET) {
-		ret = lxc_network_recv_veth_names_from_parent(handler);
+		ret = lxc_network_recv_from_parent(handler);
 		if (ret < 0) {
 			ERROR("Failed to receive veth names from parent");
 			goto out_warn_father;
@@ -1839,7 +1839,7 @@ static int lxc_spawn(struct lxc_handler *handler)
 			goto out_delete_net;
 		}
 
-		ret = lxc_network_send_veth_names_to_child(handler);
+		ret = lxc_network_send_to_child(handler);
 		if (ret < 0) {
 			ERROR("Failed to send veth names to child");
 			goto out_delete_net;