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

ip: display netns name instead of nsid 

When iproute2 has a name for the nsid, let's display it. It's more
user friendly than a number.

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:30 +02:00 committed by Stephen Hemminger
parent 9e4a92e5aa
commit 9580bad7b9
3 changed files with 30 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ip/ip_common.h
View File

@ -60,6 +60,7 @@ void netns_map_init(void);
void netns_nsid_socket_init(void); 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);
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);

20
ip/ipaddress.c
View File

@ -955,10 +955,16 @@ int print_linkinfo(const struct sockaddr_nl *who,
if (is_json_context()) { if (is_json_context()) {
print_int(PRINT_JSON, "link_netnsid", NULL, id); print_int(PRINT_JSON, "link_netnsid", NULL, id);
} else { } else {
if (id >= 0) if (id >= 0) {
print_int(PRINT_FP, NULL, char *name = get_name_from_nsid(id);
" link-netnsid %d", id);
else if (name)
print_string(PRINT_FP, NULL,
" link-netns %s", name);
else
print_int(PRINT_FP, NULL,
" link-netnsid %d", id);
} else
print_string(PRINT_FP, NULL, print_string(PRINT_FP, NULL,
" link-netnsid %s", "unknown"); " link-netnsid %s", "unknown");
} }
@ -966,8 +972,12 @@ int print_linkinfo(const struct sockaddr_nl *who,
if (tb[IFLA_NEW_NETNSID]) { if (tb[IFLA_NEW_NETNSID]) {
int id = rta_getattr_u32(tb[IFLA_NEW_NETNSID]); int id = rta_getattr_u32(tb[IFLA_NEW_NETNSID]);
char *name = get_name_from_nsid(id);
print_int(PRINT_FP, NULL, " new-nsid %d", id); if (name)
print_string(PRINT_FP, NULL, " new-netns %s", name);
else
print_int(PRINT_FP, NULL, " new-netnsid %d", id);
} }
if (tb[IFLA_NEW_IFINDEX]) { if (tb[IFLA_NEW_IFINDEX]) {
int id = rta_getattr_u32(tb[IFLA_NEW_IFINDEX]); int id = rta_getattr_u32(tb[IFLA_NEW_IFINDEX]);

14
ip/ipnetns.c
View File

@ -169,6 +169,20 @@ static struct nsid_cache *netns_map_get_by_nsid(int nsid)
return NULL; return NULL;
} }
char *get_name_from_nsid(int nsid)
{
struct nsid_cache *c;
netns_nsid_socket_init();
netns_map_init();
c = netns_map_get_by_nsid(nsid);
if (c)
return c->name;
return NULL;
}
static int netns_map_add(int nsid, const char *name) static int netns_map_add(int nsid, const char *name)
{ {
struct nsid_cache *c; struct nsid_cache *c;