matthias
/
iproute2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

iplink: enable to specify a name for the link-netns 

The 'link-netnsid' argument needs a number. Add 'link-netns' when the user
wants to use the iproute2 netns name instead of the nsid.

Example:
ip link add ipip1 link-netns foo type ipip remote 10.16.0.121 local 10.16.0.249

Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
This commit is contained in:
Nicolas Dichtel 2018-06-05 15:08:31 +02:00 committed by Stephen Hemminger
parent 9580bad7b9
commit 974ef93bf1
3 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ip/ip_common.h
View File

@ -61,6 +61,8 @@ void netns_nsid_socket_init(void);
int print_nsid(const struct sockaddr_nl *who, int print_nsid(const struct sockaddr_nl *who,
struct nlmsghdr *n, void *arg); struct nlmsghdr *n, void *arg);
char *get_name_from_nsid(int nsid); char *get_name_from_nsid(int nsid);
int get_netnsid_from_name(const char *name);
int set_netnsid_from_name(const char *name, int nsid);
int do_ipaddr(int argc, char **argv); int do_ipaddr(int argc, char **argv);
int do_ipaddrlabel(int argc, char **argv); int do_ipaddrlabel(int argc, char **argv);
int do_iproute(int argc, char **argv); int do_iproute(int argc, char **argv);

18
ip/iplink.c
View File

@ -85,7 +85,7 @@ void iplink_usage(void)
" [ broadcast LLADDR ]\n" " [ broadcast LLADDR ]\n"
" [ mtu MTU ]\n" " [ mtu MTU ]\n"
" [ netns { PID | NAME } ]\n" " [ netns { PID | NAME } ]\n"
" [ link-netnsid ID ]\n" " [ link-netns NAME | link-netnsid ID ]\n"
" [ alias NAME ]\n" " [ alias NAME ]\n"
" [ vf NUM [ mac LLADDR ]\n" " [ vf NUM [ mac LLADDR ]\n"
" [ vlan VLANID [ qos VLAN-QOS ] [ proto VLAN-PROTO ] ]\n" " [ vlan VLANID [ qos VLAN-QOS ] [ proto VLAN-PROTO ] ]\n"
@ -865,10 +865,24 @@ int iplink_parse(int argc, char **argv, struct iplink_req *req, char **type)
IFLA_INET6_ADDR_GEN_MODE, mode); IFLA_INET6_ADDR_GEN_MODE, mode);
addattr_nest_end(&req->n, afs6); addattr_nest_end(&req->n, afs6);
addattr_nest_end(&req->n, afs); addattr_nest_end(&req->n, afs);
} else if (matches(*argv, "link-netns") == 0) {
NEXT_ARG();
if (link_netnsid != -1)
duparg("link-netns/link-netnsid", *argv);
link_netnsid = get_netnsid_from_name(*argv);
/* No nsid? Try to assign one. */
if (link_netnsid < 0)
set_netnsid_from_name(*argv, -1);
link_netnsid = get_netnsid_from_name(*argv);
if (link_netnsid < 0)
invarg("Invalid \"link-netns\" value\n",
*argv);
addattr32(&req->n, sizeof(*req), IFLA_LINK_NETNSID,
link_netnsid);
} else if (matches(*argv, "link-netnsid") == 0) { } else if (matches(*argv, "link-netnsid") == 0) {
NEXT_ARG(); NEXT_ARG();
if (link_netnsid != -1) if (link_netnsid != -1)
duparg("link-netnsid", *argv); duparg("link-netns/link-netnsid", *argv);
if (get_integer(&link_netnsid, *argv, 0)) if (get_integer(&link_netnsid, *argv, 0))
invarg("Invalid \"link-netnsid\" value\n", invarg("Invalid \"link-netnsid\" value\n",
*argv); *argv);

8
ip/ipnetns.c
View File

@ -91,7 +91,7 @@ static int ipnetns_have_nsid(void)
return have_rtnl_getnsid; return have_rtnl_getnsid;
} }
static int get_netnsid_from_name(const char *name) int get_netnsid_from_name(const char *name)
{ {
struct { struct {
struct nlmsghdr n; struct nlmsghdr n;
@ -108,6 +108,8 @@ static int get_netnsid_from_name(const char *name)
struct rtgenmsg *rthdr; struct rtgenmsg *rthdr;
int len, fd; int len, fd;
netns_nsid_socket_init();
fd = netns_get_fd(name); fd = netns_get_fd(name);
if (fd < 0) if (fd < 0)
return fd; return fd;
@ -705,7 +707,7 @@ out_delete:
return -1; return -1;
} }
static int set_netnsid_from_name(const char *name, int nsid) int set_netnsid_from_name(const char *name, int nsid)
{ {
struct { struct {
struct nlmsghdr n; struct nlmsghdr n;
@ -719,6 +721,8 @@ static int set_netnsid_from_name(const char *name, int nsid)
}; };
int fd, err = 0; int fd, err = 0;
netns_nsid_socket_init();
fd = netns_get_fd(name); fd = netns_get_fd(name);
if (fd < 0) if (fd < 0)
return fd; return fd;