From 4aca87515a5083ae0e31ce3177189fd43b6d05ac Mon Sep 17 00:00:00 2001
From: Andreas Baumann <mail@andreasbaumann.cc>
Date: Sat, 3 Jan 2015 13:58:15 +0100
Subject: patch to Vanilla Tomato 1.28

---
 .../router/busybox/networking/libiproute/ll_addr.c | 54 +++++++++++-----------
 1 file changed, 26 insertions(+), 28 deletions(-)

(limited to 'release/src/router/busybox/networking/libiproute/ll_addr.c')

diff --git a/release/src/router/busybox/networking/libiproute/ll_addr.c b/release/src/router/busybox/networking/libiproute/ll_addr.c
index ada685f4..f50e3719 100644
--- a/release/src/router/busybox/networking/libiproute/ll_addr.c
+++ b/release/src/router/busybox/networking/libiproute/ll_addr.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
  * ll_addr.c
  *
@@ -9,11 +10,12 @@
  * Authors:	Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
  */
 
-#include <arpa/inet.h>
-#include <string.h>
 #include <net/if_arp.h>
-#include "utils.h"
+
 #include "libbb.h"
+#include "rt_names.h"
+#include "utils.h"
+
 
 const char *ll_addr_n2a(unsigned char *addr, int alen, int type, char *buf, int blen)
 {
@@ -27,7 +29,7 @@ const char *ll_addr_n2a(unsigned char *addr, int alen, int type, char *buf, int
 	l = 0;
 	for (i=0; i<alen; i++) {
 		if (i==0) {
-			snprintf(buf+l, blen, "%02x", addr[i]);
+			snprintf(buf+l, blen, ":%02x"+1, addr[i]);
 			blen -= 2;
 			l += 2;
 		} else {
@@ -41,10 +43,12 @@ const char *ll_addr_n2a(unsigned char *addr, int alen, int type, char *buf, int
 
 int ll_addr_a2n(unsigned char *lladdr, int len, char *arg)
 {
+	int i;
+
 	if (strchr(arg, '.')) {
 		inet_prefix pfx;
 		if (get_addr_1(&pfx, arg, AF_INET)) {
-			bb_error_msg("\"%s\" is invalid lladdr.", arg);
+			bb_error_msg("\"%s\" is invalid lladdr", arg);
 			return -1;
 		}
 		if (len < 4) {
@@ -52,30 +56,24 @@ int ll_addr_a2n(unsigned char *lladdr, int len, char *arg)
 		}
 		memcpy(lladdr, pfx.data, 4);
 		return 4;
-	} else {
-		int i;
+	}
 
-		for (i=0; i<len; i++) {
-			int temp;
-			char *cp = strchr(arg, ':');
-			if (cp) {
-				*cp = 0;
-				cp++;
-			}
-			if (sscanf(arg, "%x", &temp) != 1) {
-				bb_error_msg("\"%s\" is invalid lladdr.", arg);
-				return -1;
-			}
-			if (temp < 0 || temp > 255) {
-				bb_error_msg("\"%s\" is invalid lladdr.", arg);
-				return -1;
-			}
-			lladdr[i] = temp;
-			if (!cp) {
-				break;
-			}
-			arg = cp;
+	for (i = 0; i < len; i++) {
+		int temp;
+		char *cp = strchr(arg, ':');
+		if (cp) {
+			*cp = 0;
+			cp++;
+		}
+		if (sscanf(arg, "%x", &temp) != 1 || (temp < 0 || temp > 255)) {
+			bb_error_msg("\"%s\" is invalid lladdr", arg);
+			return -1;
+		}
+		lladdr[i] = temp;
+		if (!cp) {
+			break;
 		}
-		return i+1;
+		arg = cp;
 	}
+	return i+1;
 }
-- 
cgit v1.2.3-54-g00ecf