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

iproute2: arpd: use ll_addr_a2n and ll_addr_n2a 

Signed-off-by: Jiri Pirko <jiri@resnulli.us>
This commit is contained in:
Jiri Pirko 2014-05-15 15:10:20 +02:00 committed by Stephen Hemminger
parent aeb199d5ce
commit dd50247dba
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
misc/arpd.c
View File

@ -36,6 +36,7 @@
#include "libnetlink.h" #include "libnetlink.h"
#include "utils.h" #include "utils.h"
#include "rt_names.h"
int resolve_hosts; int resolve_hosts;
@ -721,8 +722,7 @@ int main(int argc, char **argv)
goto do_abort; goto do_abort;
} }
dbdat.data = hexstring_a2n(macbuf, b1, 6); if (ll_addr_a2n((char *) b1, 6, macbuf) != 6)
if (dbdat.data == NULL)
goto do_abort; goto do_abort;
dbdat.size = 6; dbdat.size = 6;
@ -747,7 +747,7 @@ int main(int argc, char **argv)
printf("%-8d %-15s %s\n", printf("%-8d %-15s %s\n",
key->iface, key->iface,
inet_ntoa(*(struct in_addr*)&key->addr), inet_ntoa(*(struct in_addr*)&key->addr),
hexstring_n2a(dbdat.data, 6, b1, 18)); ll_addr_n2a(dbdat.data, 6, ARPHRD_ETHER, b1, 18));
} else { } else {
printf("%-8d %-15s FAILED: %dsec ago\n", printf("%-8d %-15s FAILED: %dsec ago\n",
key->iface, key->iface,