aboutsummaryrefslogtreecommitdiff
path: root/networking/libiproute/ipaddress.c
diff options
context:
space:
mode:
Diffstat (limited to 'networking/libiproute/ipaddress.c')
-rw-r--r--networking/libiproute/ipaddress.c22
1 files changed, 9 insertions, 13 deletions
diff --git a/networking/libiproute/ipaddress.c b/networking/libiproute/ipaddress.c
index c0f27c70d..5c975d8c5 100644
--- a/networking/libiproute/ipaddress.c
+++ b/networking/libiproute/ipaddress.c
@@ -214,8 +214,7 @@ static int FAST_FUNC print_addrinfo(const struct sockaddr_nl *who UNUSED_PARAM,
214{ 214{
215 struct ifaddrmsg *ifa = NLMSG_DATA(n); 215 struct ifaddrmsg *ifa = NLMSG_DATA(n);
216 int len = n->nlmsg_len; 216 int len = n->nlmsg_len;
217 struct rtattr * rta_tb[IFA_MAX+1]; 217 struct rtattr *rta_tb[IFA_MAX+1];
218 char abuf[256];
219 218
220 if (n->nlmsg_type != RTM_NEWADDR && n->nlmsg_type != RTM_DELADDR) 219 if (n->nlmsg_type != RTM_NEWADDR && n->nlmsg_type != RTM_DELADDR)
221 return 0; 220 return 0;
@@ -291,9 +290,9 @@ static int FAST_FUNC print_addrinfo(const struct sockaddr_nl *who UNUSED_PARAM,
291 printf(" family %d ", ifa->ifa_family); 290 printf(" family %d ", ifa->ifa_family);
292 291
293 if (rta_tb[IFA_LOCAL]) { 292 if (rta_tb[IFA_LOCAL]) {
294 fputs(rt_addr_n2a(ifa->ifa_family, 293 fputs(rt_addr_n2a(ifa->ifa_family, RTA_DATA(rta_tb[IFA_LOCAL])),
295 RTA_DATA(rta_tb[IFA_LOCAL]), 294 stdout
296 abuf, sizeof(abuf)), stdout); 295 );
297 296
298 if (rta_tb[IFA_ADDRESS] == NULL 297 if (rta_tb[IFA_ADDRESS] == NULL
299 || memcmp(RTA_DATA(rta_tb[IFA_ADDRESS]), RTA_DATA(rta_tb[IFA_LOCAL]), 4) == 0 298 || memcmp(RTA_DATA(rta_tb[IFA_ADDRESS]), RTA_DATA(rta_tb[IFA_LOCAL]), 4) == 0
@@ -301,25 +300,22 @@ static int FAST_FUNC print_addrinfo(const struct sockaddr_nl *who UNUSED_PARAM,
301 printf("/%d ", ifa->ifa_prefixlen); 300 printf("/%d ", ifa->ifa_prefixlen);
302 } else { 301 } else {
303 printf(" peer %s/%d ", 302 printf(" peer %s/%d ",
304 rt_addr_n2a(ifa->ifa_family, 303 rt_addr_n2a(ifa->ifa_family, RTA_DATA(rta_tb[IFA_ADDRESS])),
305 RTA_DATA(rta_tb[IFA_ADDRESS]), 304 ifa->ifa_prefixlen
306 abuf, sizeof(abuf)), 305 );
307 ifa->ifa_prefixlen);
308 } 306 }
309 } 307 }
310 308
311 if (rta_tb[IFA_BROADCAST]) { 309 if (rta_tb[IFA_BROADCAST]) {
312 printf("brd %s ", 310 printf("brd %s ",
313 rt_addr_n2a(ifa->ifa_family, 311 rt_addr_n2a(ifa->ifa_family,
314 RTA_DATA(rta_tb[IFA_BROADCAST]), 312 RTA_DATA(rta_tb[IFA_BROADCAST]))
315 abuf, sizeof(abuf))
316 ); 313 );
317 } 314 }
318 if (rta_tb[IFA_ANYCAST]) { 315 if (rta_tb[IFA_ANYCAST]) {
319 printf("any %s ", 316 printf("any %s ",
320 rt_addr_n2a(ifa->ifa_family, 317 rt_addr_n2a(ifa->ifa_family,
321 RTA_DATA(rta_tb[IFA_ANYCAST]), 318 RTA_DATA(rta_tb[IFA_ANYCAST]))
322 abuf, sizeof(abuf))
323 ); 319 );
324 } 320 }
325 printf("scope %s ", rtnl_rtscope_n2a(ifa->ifa_scope)); 321 printf("scope %s ", rtnl_rtscope_n2a(ifa->ifa_scope));