diff options
Diffstat (limited to 'networking/libiproute/ipaddress.c')
-rw-r--r-- | networking/libiproute/ipaddress.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/networking/libiproute/ipaddress.c b/networking/libiproute/ipaddress.c index fadab6f39..644874f46 100644 --- a/networking/libiproute/ipaddress.c +++ b/networking/libiproute/ipaddress.c | |||
@@ -280,17 +280,16 @@ static int print_addrinfo(const struct sockaddr_nl *who UNUSED_PARAM, | |||
280 | 280 | ||
281 | if (rta_tb[IFA_LOCAL]) { | 281 | if (rta_tb[IFA_LOCAL]) { |
282 | fputs(rt_addr_n2a(ifa->ifa_family, | 282 | fputs(rt_addr_n2a(ifa->ifa_family, |
283 | RTA_PAYLOAD(rta_tb[IFA_LOCAL]), | ||
284 | RTA_DATA(rta_tb[IFA_LOCAL]), | 283 | RTA_DATA(rta_tb[IFA_LOCAL]), |
285 | abuf, sizeof(abuf)), stdout); | 284 | abuf, sizeof(abuf)), stdout); |
286 | 285 | ||
287 | if (rta_tb[IFA_ADDRESS] == NULL || | 286 | if (rta_tb[IFA_ADDRESS] == NULL |
288 | memcmp(RTA_DATA(rta_tb[IFA_ADDRESS]), RTA_DATA(rta_tb[IFA_LOCAL]), 4) == 0) { | 287 | || memcmp(RTA_DATA(rta_tb[IFA_ADDRESS]), RTA_DATA(rta_tb[IFA_LOCAL]), 4) == 0 |
288 | ) { | ||
289 | printf("/%d ", ifa->ifa_prefixlen); | 289 | printf("/%d ", ifa->ifa_prefixlen); |
290 | } else { | 290 | } else { |
291 | printf(" peer %s/%d ", | 291 | printf(" peer %s/%d ", |
292 | rt_addr_n2a(ifa->ifa_family, | 292 | rt_addr_n2a(ifa->ifa_family, |
293 | RTA_PAYLOAD(rta_tb[IFA_ADDRESS]), | ||
294 | RTA_DATA(rta_tb[IFA_ADDRESS]), | 293 | RTA_DATA(rta_tb[IFA_ADDRESS]), |
295 | abuf, sizeof(abuf)), | 294 | abuf, sizeof(abuf)), |
296 | ifa->ifa_prefixlen); | 295 | ifa->ifa_prefixlen); |
@@ -300,14 +299,12 @@ static int print_addrinfo(const struct sockaddr_nl *who UNUSED_PARAM, | |||
300 | if (rta_tb[IFA_BROADCAST]) { | 299 | if (rta_tb[IFA_BROADCAST]) { |
301 | printf("brd %s ", | 300 | printf("brd %s ", |
302 | rt_addr_n2a(ifa->ifa_family, | 301 | rt_addr_n2a(ifa->ifa_family, |
303 | RTA_PAYLOAD(rta_tb[IFA_BROADCAST]), | ||
304 | RTA_DATA(rta_tb[IFA_BROADCAST]), | 302 | RTA_DATA(rta_tb[IFA_BROADCAST]), |
305 | abuf, sizeof(abuf))); | 303 | abuf, sizeof(abuf))); |
306 | } | 304 | } |
307 | if (rta_tb[IFA_ANYCAST]) { | 305 | if (rta_tb[IFA_ANYCAST]) { |
308 | printf("any %s ", | 306 | printf("any %s ", |
309 | rt_addr_n2a(ifa->ifa_family, | 307 | rt_addr_n2a(ifa->ifa_family, |
310 | RTA_PAYLOAD(rta_tb[IFA_ANYCAST]), | ||
311 | RTA_DATA(rta_tb[IFA_ANYCAST]), | 308 | RTA_DATA(rta_tb[IFA_ANYCAST]), |
312 | abuf, sizeof(abuf))); | 309 | abuf, sizeof(abuf))); |
313 | } | 310 | } |