Commit 5902eb21 authored by Andrei Vagin's avatar Andrei Vagin

net: rename pid into nsid for prepare_net_ns()

PID ussualy means processs ID, but prepare_net_ns works with namespaces.

travis-ci: success for Dump and restore nested network namespaces (rev4)
Signed-off-by: 's avatarAndrei Vagin <avagin@virtuozzo.com>
Reviewed-by: 's avatarDmitry Safonov <dsafonov@virtuozzo.com>
Signed-off-by: 's avatarPavel Emelyanov <xemul@virtuozzo.com>
parent 4ea9cf33
...@@ -1902,32 +1902,32 @@ int dump_net_ns(int ns_id) ...@@ -1902,32 +1902,32 @@ int dump_net_ns(int ns_id)
return ret; return ret;
} }
int prepare_net_ns(int pid) int prepare_net_ns(int nsid)
{ {
int ret = 0; int ret = 0;
NetnsEntry *netns = NULL; NetnsEntry *netns = NULL;
if (!(opts.empty_ns & CLONE_NEWNET)) { if (!(opts.empty_ns & CLONE_NEWNET)) {
ret = restore_netns_conf(pid, &netns); ret = restore_netns_conf(nsid, &netns);
if (!ret) if (!ret)
ret = restore_links(pid, &netns); ret = restore_links(nsid, &netns);
if (netns) if (netns)
netns_entry__free_unpacked(netns, NULL); netns_entry__free_unpacked(netns, NULL);
if (!ret) if (!ret)
ret = restore_ifaddr(pid); ret = restore_ifaddr(nsid);
if (!ret) if (!ret)
ret = restore_route(pid); ret = restore_route(nsid);
if (!ret) if (!ret)
ret = restore_rule(pid); ret = restore_rule(nsid);
if (!ret) if (!ret)
ret = restore_iptables(pid); ret = restore_iptables(nsid);
} }
if (!ret) if (!ret)
ret = restore_nf_ct(pid, CR_FD_NETNF_CT); ret = restore_nf_ct(nsid, CR_FD_NETNF_CT);
if (!ret) if (!ret)
ret = restore_nf_ct(pid, CR_FD_NETNF_EXP); ret = restore_nf_ct(nsid, CR_FD_NETNF_EXP);
close_service_fd(NS_FD_OFF); close_service_fd(NS_FD_OFF);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment