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

bridge: minor change to mdb print 

Get port ifname once rather than on both sides of if(is_json_context).

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
This commit is contained in:
Stephen Hemminger 2018-09-06 14:14:46 +01:00
parent 781ee3270d
commit f5fc738736
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bridge/mdb.c
View File

@ -208,19 +208,19 @@ static void print_router_entries(FILE *fp, struct nlmsghdr *n,
} else { } else {
struct rtattr *i = RTA_DATA(router); struct rtattr *i = RTA_DATA(router);
uint32_t *port_ifindex = RTA_DATA(i); uint32_t *port_ifindex = RTA_DATA(i);
const char *port_name = ll_index_to_name(*port_ifindex);
if (is_json_context()) { if (is_json_context()) {
open_json_array(PRINT_JSON, brifname); open_json_array(PRINT_JSON, brifname);
open_json_object(NULL); open_json_object(NULL);
print_string(PRINT_JSON, "port", NULL, print_string(PRINT_JSON, "port", NULL,
ll_index_to_name(*port_ifindex)); port_name);
close_json_object(); close_json_object();
close_json_array(PRINT_JSON, NULL); close_json_array(PRINT_JSON, NULL);
} else { } else {
fprintf(fp, "router port dev %s master %s\n", fprintf(fp, "router port dev %s master %s\n",
ll_index_to_name(*port_ifindex), port_name, brifname);
brifname);
} }
} }
close_json_array(PRINT_JSON, NULL); close_json_array(PRINT_JSON, NULL);