Commit 24abb62e authored by Florian Westphal's avatar Florian Westphal Committed by Stephen Hemminger

iproute2: fix addrlabel interface names handling

ip addrlabel outputs if%d names due to missing init call:
$ ip addrlabel s
prefix a::42/128 dev if4 label 1000

Also, ip did not accept "if%d" interfaces on input.
Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
parent 608a96c7
...@@ -252,6 +252,8 @@ static int ipaddrlabel_flush(int argc, char **argv) ...@@ -252,6 +252,8 @@ static int ipaddrlabel_flush(int argc, char **argv)
int do_ipaddrlabel(int argc, char **argv) int do_ipaddrlabel(int argc, char **argv)
{ {
ll_init_map(&rth);
if (argc < 1) { if (argc < 1) {
return ipaddrlabel_list(0, NULL); return ipaddrlabel_list(0, NULL);
} else if (matches(argv[0], "list") == 0 || } else if (matches(argv[0], "list") == 0 ||
......
...@@ -161,6 +161,7 @@ unsigned ll_name_to_index(const char *name) ...@@ -161,6 +161,7 @@ unsigned ll_name_to_index(const char *name)
static int icache; static int icache;
struct idxmap *im; struct idxmap *im;
int i; int i;
unsigned idx;
if (name == NULL) if (name == NULL)
return 0; return 0;
...@@ -176,7 +177,10 @@ unsigned ll_name_to_index(const char *name) ...@@ -176,7 +177,10 @@ unsigned ll_name_to_index(const char *name)
} }
} }
return if_nametoindex(name); idx = if_nametoindex(name);
if (idx == 0)
sscanf(name, "if%u", &idx);
return idx;
} }
int ll_init_map(struct rtnl_handle *rth) int ll_init_map(struct rtnl_handle *rth)
......
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