Skip to content

I
iproute2
Commit ff9d8f37 authored by Phil Sutter's avatar Phil Sutter Committed by Stephen Hemminger
Browse files
Options

ipaddress: colorize peer, broadcast and anycast addresses as well 

Signed-off-by: default avatarPhil Sutter <phil@nwl.cc>
parent a1121aa1
Hide whitespace changes
Inline Side-by-side
Showing with 17 additions and 14 deletions
ip/ipaddress.c
View file @ ff9d8f37
...@@ -862,7 +862,8 @@ int print_linkinfo(const struct sockaddr_nl *who, ...@@ -862,7 +862,8 @@ int print_linkinfo(const struct sockaddr_nl *who,
fprintf(fp, " peer "); fprintf(fp, " peer ");
else else
fprintf(fp, " brd "); fprintf(fp, " brd ");
fprintf(fp, "%s", ll_addr_n2a(RTA_DATA(tb[IFLA_BROADCAST]), color_fprintf(fp, COLOR_MAC, "%s",
ll_addr_n2a(RTA_DATA(tb[IFLA_BROADCAST]),
RTA_PAYLOAD(tb[IFLA_BROADCAST]), RTA_PAYLOAD(tb[IFLA_BROADCAST]),
ifi->ifi_type, ifi->ifi_type,
b1, sizeof(b1))); b1, sizeof(b1)));
...@@ -1062,32 +1063,34 @@ int print_addrinfo(const struct sockaddr_nl *who, struct nlmsghdr *n, ...@@ -1062,32 +1063,34 @@ int print_addrinfo(const struct sockaddr_nl *who, struct nlmsghdr *n,
RTA_PAYLOAD(rta_tb[IFA_LOCAL]), RTA_PAYLOAD(rta_tb[IFA_LOCAL]),
RTA_DATA(rta_tb[IFA_LOCAL]), RTA_DATA(rta_tb[IFA_LOCAL]),
abuf, sizeof(abuf))); abuf, sizeof(abuf)));
if (rta_tb[IFA_ADDRESS] == NULL || if (rta_tb[IFA_ADDRESS] &&
memcmp(RTA_DATA(rta_tb[IFA_ADDRESS]), RTA_DATA(rta_tb[IFA_LOCAL]), memcmp(RTA_DATA(rta_tb[IFA_ADDRESS]),
ifa->ifa_family == AF_INET ? 4 : 16) == 0) { RTA_DATA(rta_tb[IFA_LOCAL]),
fprintf(fp, "/%d ", ifa->ifa_prefixlen); ifa->ifa_family == AF_INET ? 4 : 16)) {
} else { fprintf(fp, " peer ");
fprintf(fp, " peer %s/%d ", color_fprintf(fp, ifa_family_color(ifa->ifa_family),
format_host(ifa->ifa_family, "%s", format_host(ifa->ifa_family,
RTA_PAYLOAD(rta_tb[IFA_ADDRESS]), RTA_PAYLOAD(rta_tb[IFA_ADDRESS]),
RTA_DATA(rta_tb[IFA_ADDRESS]), RTA_DATA(rta_tb[IFA_ADDRESS]),
abuf, sizeof(abuf)), abuf, sizeof(abuf)));
ifa->ifa_prefixlen);
} }
fprintf(fp, "/%d ", ifa->ifa_prefixlen);
} }
if (brief) if (brief)
goto brief_exit; goto brief_exit;
if (rta_tb[IFA_BROADCAST]) { if (rta_tb[IFA_BROADCAST]) {
fprintf(fp, "brd %s ", fprintf(fp, "brd ");
color_fprintf(fp, ifa_family_color(ifa->ifa_family), "%s ",
format_host(ifa->ifa_family, format_host(ifa->ifa_family,
RTA_PAYLOAD(rta_tb[IFA_BROADCAST]), RTA_PAYLOAD(rta_tb[IFA_BROADCAST]),
RTA_DATA(rta_tb[IFA_BROADCAST]), RTA_DATA(rta_tb[IFA_BROADCAST]),
abuf, sizeof(abuf))); abuf, sizeof(abuf)));
} }
if (rta_tb[IFA_ANYCAST]) { if (rta_tb[IFA_ANYCAST]) {
fprintf(fp, "any %s ", fprintf(fp, "any ");
color_fprintf(fp, ifa_family_color(ifa->ifa_family), "%s ",
format_host(ifa->ifa_family, format_host(ifa->ifa_family,
RTA_PAYLOAD(rta_tb[IFA_ANYCAST]), RTA_PAYLOAD(rta_tb[IFA_ANYCAST]),
RTA_DATA(rta_tb[IFA_ANYCAST]), RTA_DATA(rta_tb[IFA_ANYCAST]),
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7