patch to Vanilla Tomato 1.28

1 files changed, 26 insertions, 18 deletions

diff --git a/release/src/router/busybox/networking/libiproute/rtm_map.c b/release/src/router/busybox/networking/libiproute/rtm_map.c
index 5f6a9e69..ca2f4436 100644
--- a/release/src/router/busybox/networking/libiproute/rtm_map.c
+++ b/release/src/router/busybox/networking/libiproute/rtm_map.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
  * rtm_map.c
  *
@@ -10,13 +11,11 @@
  *
  */
 
-#include <stdlib.h>
-#include <string.h>
-
+#include "libbb.h"
 #include "rt_names.h"
 #include "utils.h"
 
-char *rtnl_rtntype_n2a(int id, char *buf, int len)
+const char *rtnl_rtntype_n2a(int id, char *buf, int len)
 {
 	switch (id) {
 	case RTN_UNSPEC:
@@ -52,31 +51,40 @@ char *rtnl_rtntype_n2a(int id, char *buf, int len)
 
 int rtnl_rtntype_a2n(int *id, char *arg)
 {
+	static const char keywords[] ALIGN1 =
+		"local\0""nat\0""broadcast\0""brd\0""anycast\0"
+		"multicast\0""prohibit\0""unreachable\0""blackhole\0"
+		"xresolve\0""unicast\0""throw\0";
+	enum {
+		ARG_local = 1, ARG_nat, ARG_broadcast, ARG_brd, ARG_anycast,
+		ARG_multicast, ARG_prohibit, ARG_unreachable, ARG_blackhole,
+		ARG_xresolve, ARG_unicast, ARG_throw
+	};
+	const smalluint key = index_in_substrings(keywords, arg) + 1;
 	char *end;
 	unsigned long res;
 
-	if (strcmp(arg, "local") == 0)
+	if (key == ARG_local)
 		res = RTN_LOCAL;
-	else if (strcmp(arg, "nat") == 0)
+	else if (key == ARG_nat)
 		res = RTN_NAT;
-	else if (matches(arg, "broadcast") == 0 ||
-		 strcmp(arg, "brd") == 0)
+	else if (key == ARG_broadcast || key == ARG_brd)
 		res = RTN_BROADCAST;
-	else if (matches(arg, "anycast") == 0)
+	else if (key == ARG_anycast)
 		res = RTN_ANYCAST;
-	else if (matches(arg, "multicast") == 0)
+	else if (key == ARG_multicast)
 		res = RTN_MULTICAST;
-	else if (matches(arg, "prohibit") == 0)
+	else if (key == ARG_prohibit)
 		res = RTN_PROHIBIT;
-	else if (matches(arg, "unreachable") == 0)
+	else if (key == ARG_unreachable)
 		res = RTN_UNREACHABLE;
-	else if (matches(arg, "blackhole") == 0)
+	else if (key == ARG_blackhole)
 		res = RTN_BLACKHOLE;
-	else if (matches(arg, "xresolve") == 0)
+	else if (key == ARG_xresolve)
 		res = RTN_XRESOLVE;
-	else if (matches(arg, "unicast") == 0)
+	else if (key == ARG_unicast)
 		res = RTN_UNICAST;
-	else if (strcmp(arg, "throw") == 0)
+	else if (key == ARG_throw)
 		res = RTN_THROW;
 	else {
 		res = strtoul(arg, &end, 0);
@@ -87,9 +95,9 @@ int rtnl_rtntype_a2n(int *id, char *arg)
 	return 0;
 }
 
-int get_rt_realms(__u32 *realms, char *arg)
+int get_rt_realms(uint32_t *realms, char *arg)
 {
-	__u32 realm = 0;
+	uint32_t realm = 0;
 	char *p = strchr(arg, '/');
 
 	*realms = 0;