From a3c9bb79b1f03896d09df67a7095cd545e495ab0 Mon Sep 17 00:00:00 2001 From: Davide Caratti Date: Wed, 6 Jul 2016 18:41:31 +0200 Subject: [PATCH] iproute2: arpd: use ll_addr_a2n and ll_addr_n2a Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1300765 Upstream Status: iproute2.git commit dd50247dba85 commit dd50247dba85255538d659551305b4bb75bcae62 Author: Jiri Pirko Date: Thu May 15 15:10:20 2014 +0200 iproute2: arpd: use ll_addr_a2n and ll_addr_n2a Signed-off-by: Jiri Pirko Signed-off-by: Davide Caratti --- misc/arpd.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/misc/arpd.c b/misc/arpd.c index cc5e1ca..7919eb8 100644 --- a/misc/arpd.c +++ b/misc/arpd.c @@ -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, -- 1.8.3.1