Merge ../iproute2-next

[mirror_iproute2.git] / ip / ipaddress.c

diff --git a/ip/ipaddress.c b/ip/ipaddress.c
index 44af56cd0392ffaf47597faf6483793430f07697..bbd35e797e3b305d3c33294f43f5091f834efc38 100644 (file)
--- a/ip/ipaddress.c
+++ b/ip/ipaddress.c
@@ -955,10 +955,16 @@ int print_linkinfo(const struct sockaddr_nl *who,
                if (is_json_context()) {
                        print_int(PRINT_JSON, "link_netnsid", NULL, id);
                } else {
-                       if (id >= 0)
-                               print_int(PRINT_FP, NULL,
-                                         " link-netnsid %d", id);
-                       else
+                       if (id >= 0) {
+                               char *name = get_name_from_nsid(id);
+
+                               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,
                                             " link-netnsid %s", "unknown");
                }
@@ -966,8 +972,12 @@ int print_linkinfo(const struct sockaddr_nl *who,
 
        if (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]) {
                int id = rta_getattr_u32(tb[IFLA_NEW_IFINDEX]);