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

ipnetns: treat NETNSA_NSID and NETNSA_CURRENT_NSID as signed 

These attributes are signed (with -1 meaning NETNSA_NSID_NOT_ASSIGNED).
So let's use rta_getattr_s32() and print_int() instead of their
unsigned counterpart to avoid confusion.

Signed-off-by: Guillaume Nault <gnault@redhat.com>
Signed-off-by: David Ahern <dsahern@gmail.com>
This commit is contained in:
Guillaume Nault 2019-11-08 18:00:12 +01:00 committed by David Ahern
parent c3f69bf923
commit f19966efee
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ip/ipnetns.c
View File

@ -137,7 +137,7 @@ int get_netnsid_from_name(const char *name)
parse_rtattr(tb, NETNSA_MAX, NETNS_RTA(rthdr), len); parse_rtattr(tb, NETNSA_MAX, NETNS_RTA(rthdr), len);
if (tb[NETNSA_NSID]) { if (tb[NETNSA_NSID]) {
ret = rta_getattr_u32(tb[NETNSA_NSID]); ret = rta_getattr_s32(tb[NETNSA_NSID]);
} }
out: out:
@ -317,20 +317,20 @@ int print_nsid(struct nlmsghdr *n, void *arg)
if (n->nlmsg_type == RTM_DELNSID) if (n->nlmsg_type == RTM_DELNSID)
print_bool(PRINT_ANY, "deleted", "Deleted ", true); print_bool(PRINT_ANY, "deleted", "Deleted ", true);
nsid = rta_getattr_u32(tb[NETNSA_NSID]); nsid = rta_getattr_s32(tb[NETNSA_NSID]);
if (nsid < 0) if (nsid < 0)
print_string(PRINT_ANY, "nsid", "nsid %s ", "not-assigned"); print_string(PRINT_ANY, "nsid", "nsid %s ", "not-assigned");
else else
print_uint(PRINT_ANY, "nsid", "nsid %u ", nsid); print_int(PRINT_ANY, "nsid", "nsid %d ", nsid);
if (tb[NETNSA_CURRENT_NSID]) { if (tb[NETNSA_CURRENT_NSID]) {
current = rta_getattr_u32(tb[NETNSA_CURRENT_NSID]); current = rta_getattr_s32(tb[NETNSA_CURRENT_NSID]);
if (current < 0) if (current < 0)
print_string(PRINT_ANY, "current-nsid", print_string(PRINT_ANY, "current-nsid",
"current-nsid %s ", "not-assigned"); "current-nsid %s ", "not-assigned");
else else
print_uint(PRINT_ANY, "current-nsid", print_int(PRINT_ANY, "current-nsid",
"current-nsid %u ", current); "current-nsid %d ", current);
} }
c = netns_map_get_by_nsid(tb[NETNSA_CURRENT_NSID] ? current : nsid); c = netns_map_get_by_nsid(tb[NETNSA_CURRENT_NSID] ? current : nsid);
@ -491,8 +491,7 @@ static int netns_list(int argc, char **argv)
if (ipnetns_have_nsid()) { if (ipnetns_have_nsid()) {
id = get_netnsid_from_name(entry->d_name); id = get_netnsid_from_name(entry->d_name);
if (id >= 0) if (id >= 0)
print_uint(PRINT_ANY, "id", print_int(PRINT_ANY, "id", " (id: %d)", id);
" (id: %d)", id);
} }
print_string(PRINT_FP, NULL, "\n", NULL); print_string(PRINT_FP, NULL, "\n", NULL);
close_json_object(); close_json_object();