]> git.proxmox.com Git - mirror_iproute2.git/commitdiff
iproute2: arpd: use ll_addr_a2n and ll_addr_n2a
authorJiri Pirko <jiri@resnulli.us>
Thu, 15 May 2014 13:10:20 +0000 (15:10 +0200)
committerStephen Hemminger <stephen@networkplumber.org>
Mon, 9 Jun 2014 19:45:54 +0000 (12:45 -0700)
Signed-off-by: Jiri Pirko <jiri@resnulli.us>
misc/arpd.c

index bfe7de94feb82639045bbef24c6de64c63e29289..0839e3f519dc49dae18281304348ffb0ac1e4867 100644 (file)
@@ -36,6 +36,7 @@
 
 #include "libnetlink.h"
 #include "utils.h"
+#include "rt_names.h"
 
 int resolve_hosts;
 
@@ -721,8 +722,7 @@ int main(int argc, char **argv)
                                goto do_abort;
                        }
 
-                       dbdat.data = hexstring_a2n(macbuf, b1, 6);
-                       if (dbdat.data == NULL)
+                       if (ll_addr_a2n((char *) b1, 6, macbuf) != 6)
                                goto do_abort;
                        dbdat.size = 6;
 
@@ -747,7 +747,7 @@ int main(int argc, char **argv)
                                        printf("%-8d %-15s %s\n",
                                               key->iface,
                                               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 {
                                        printf("%-8d %-15s FAILED: %dsec ago\n",
                                               key->iface,