Tree wide: Drop sockaddr_nl arg

[mirror_iproute2.git] / lib / ll_addr.c

diff --git a/lib/ll_addr.c b/lib/ll_addr.c
index ea3d66092824373621d0b8551cfb3b7929930bdb..84de64e2e05373feb9265ae243282885b3e19e8a 100644 (file)
--- a/lib/ll_addr.c
+++ b/lib/ll_addr.c
@@ -12,11 +12,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include <syslog.h>
 #include <fcntl.h>
 #include <sys/ioctl.h>
 #include <sys/socket.h>
-#include <sys/ioctl.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <string.h>
@@ -29,7 +27,7 @@
 #include "utils.h"
 
 
-const char *ll_addr_n2a(unsigned char *addr, int alen, int type, char *buf, int blen)
+const char *ll_addr_n2a(const unsigned char *addr, int alen, int type, char *buf, int blen)
 {
        int i;
        int l;
@@ -38,22 +36,18 @@ const char *ll_addr_n2a(unsigned char *addr, int alen, int type, char *buf, int
            (type == ARPHRD_TUNNEL || type == ARPHRD_SIT || type == ARPHRD_IPGRE)) {
                return inet_ntop(AF_INET, addr, buf, blen);
        }
-       l = 0;
-       for (i=0; i<alen; i++) {
-               if (i==0) {
-                       snprintf(buf+l, blen, "%02x", addr[i]);
-                       blen -= 2;
-                       l += 2;
-               } else {
-                       snprintf(buf+l, blen, ":%02x", addr[i]);
-                       blen -= 3;
-                       l += 3;
-               }
+       if (alen == 16 &&
+           (type == ARPHRD_TUNNEL6 || type == ARPHRD_IP6GRE)) {
+               return inet_ntop(AF_INET6, addr, buf, blen);
        }
+       snprintf(buf, blen, "%02x", addr[0]);
+       for (i = 1, l = 2; i < alen && l < blen; i++, l += 3)
+               snprintf(buf + l, blen - l, ":%02x", addr[i]);
        return buf;
 }
 
-int ll_addr_a2n(unsigned char *lladdr, int len, char *arg)
+/*NB: lladdr is char * (rather than u8 *) because sa_data is char * (1003.1g) */
+int ll_addr_a2n(char *lladdr, int len, const char *arg)
 {
        if (strchr(arg, '.')) {
                inet_prefix pfx;