proxmox-mirrors/mirror_iproute2
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_iproute2 synced 2025-08-18 02:10:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ipaddress: ll_map: Replace ll_idx_n2a() with ll_index_to_name()

Browse Source 
There is no reentrancy as well as deferred result usage for all cases
where ll_idx_n2a() being used: it is safe to use ll_index_to_name() that
internally calls ll_idx_n2a() with static buffer to hold result.

While there print master network device name using correct color.

Signed-off-by: Serhey Popovych <serhe.popovych@gmail.com>
Signed-off-by: David Ahern <dsahern@gmail.com>
This commit is contained in:
Serhey Popovych 2018-02-15 23:23:17 +02:00 committed by David Ahern
parent 17df3d607d
commit d92cc2d087
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
ip/ipaddress.c
View File

@ -813,14 +813,13 @@ int print_linkinfo_brief(const struct sockaddr_nl *who,
print_bool(PRINT_ANY, "deleted", "Deleted ", true); print_bool(PRINT_ANY, "deleted", "Deleted ", true);
if (tb[IFLA_LINK]) { if (tb[IFLA_LINK]) {
SPRINT_BUF(b1);
int iflink = rta_getattr_u32(tb[IFLA_LINK]); int iflink = rta_getattr_u32(tb[IFLA_LINK]);
if (iflink == 0) { if (iflink == 0) {
snprintf(buf, sizeof(buf), "%s@NONE", name); snprintf(buf, sizeof(buf), "%s@NONE", name);
print_null(PRINT_JSON, "link", NULL, NULL); print_null(PRINT_JSON, "link", NULL, NULL);
} else { } else {
const char *link = ll_idx_n2a(iflink, b1); const char *link = ll_index_to_name(iflink);
print_string(PRINT_JSON, "link", NULL, link); print_string(PRINT_JSON, "link", NULL, link);
snprintf(buf, sizeof(buf), "%s@%s", name, link); snprintf(buf, sizeof(buf), "%s@%s", name, link);
@ -957,12 +956,10 @@ int print_linkinfo(const struct sockaddr_nl *who,
print_int(PRINT_ANY, print_int(PRINT_ANY,
"link_index", "@if%d: ", iflink); "link_index", "@if%d: ", iflink);
else { else {
SPRINT_BUF(b1);
print_string(PRINT_ANY, print_string(PRINT_ANY,
"link", "link",
"@%s: ", "@%s: ",
ll_idx_n2a(iflink, b1)); ll_index_to_name(iflink));
m_flag = ll_index_to_flags(iflink); m_flag = ll_index_to_flags(iflink);
m_flag = !(m_flag & IFF_UP); m_flag = !(m_flag & IFF_UP);
} }
@ -984,12 +981,13 @@ int print_linkinfo(const struct sockaddr_nl *who,
"qdisc %s ", "qdisc %s ",
rta_getattr_str(tb[IFLA_QDISC])); rta_getattr_str(tb[IFLA_QDISC]));
if (tb[IFLA_MASTER]) { if (tb[IFLA_MASTER]) {
SPRINT_BUF(b1); int master = rta_getattr_u32(tb[IFLA_MASTER]);
print_string(PRINT_ANY, print_color_string(PRINT_ANY,
"master", COLOR_IFNAME,
"master %s ", "master",
ll_idx_n2a(rta_getattr_u32(tb[IFLA_MASTER]), b1)); "master %s ",
ll_index_to_name(master));
} }
if (tb[IFLA_OPERSTATE]) if (tb[IFLA_OPERSTATE])
@ -1308,7 +1306,6 @@ static int get_filter(const char *arg)
static int ifa_label_match_rta(int ifindex, const struct rtattr *rta) static int ifa_label_match_rta(int ifindex, const struct rtattr *rta)
{ {
const char *label; const char *label;
SPRINT_BUF(b1);
if (!filter.label) if (!filter.label)
return 0; return 0;
@ -1316,7 +1313,7 @@ static int ifa_label_match_rta(int ifindex, const struct rtattr *rta)
if (rta) if (rta)
label = RTA_DATA(rta); label = RTA_DATA(rta);
else else
label = ll_idx_n2a(ifindex, b1); label = ll_index_to_name(ifindex);
return fnmatch(filter.label, label, 0); return fnmatch(filter.label, label, 0);
} }