svn commit: trunk/busybox: networking/libiproute

[vda at busybox.net]

Author: vda
Date: 2006-12-14 16:59:35 -0800 (Thu, 14 Dec 2006)
New Revision: 16935

Log:
re-applying first post-1.3.x change
version change to 1.4.0.svn


Modified:
   trunk/busybox/Makefile
   trunk/busybox/networking/libiproute/iproute.c


Changeset:
Modified: trunk/busybox/Makefile
===================================================================
--- trunk/busybox/Makefile	2006-12-15 00:48:49 UTC (rev 16934)
+++ trunk/busybox/Makefile	2006-12-15 00:59:35 UTC (rev 16935)
@@ -1,7 +1,7 @@
 VERSION = 1
-PATCHLEVEL = 3
+PATCHLEVEL = 4
 SUBLEVEL = 0
-EXTRAVERSION =
+EXTRAVERSION = .svn
 NAME = Unnamed
 
 # *DOCUMENTATION*

Modified: trunk/busybox/networking/libiproute/iproute.c
===================================================================
--- trunk/busybox/networking/libiproute/iproute.c	2006-12-15 00:48:49 UTC (rev 16934)
+++ trunk/busybox/networking/libiproute/iproute.c	2006-12-15 00:59:35 UTC (rev 16935)
@@ -353,6 +353,14 @@
 				invarg(*argv, "protocol");
 			req.r.rtm_protocol = prot;
 			proto_ok =1;
+#if ENABLE_FEATURE_IP_RULE
+		} else if (matches(*argv, "table") == 0) {
+			uint32_t tid;
+			NEXT_ARG();
+			if (rtnl_rttable_a2n(&tid, *argv))
+				invarg(*argv, "table");
+			req.r.rtm_table = tid;
+#endif
 		} else if (strcmp(*argv, "dev") == 0 ||
 			   strcmp(*argv, "oif") == 0) {
 			NEXT_ARG();
@@ -540,9 +548,13 @@
 				NEXT_ARG();
 				if (matches(*argv, "cache") == 0) {
 					filter.tb = -1;
+#if 0 && ENABLE_FEATURE_IP_RULE
+				
+#else
 				} else if (matches(*argv, "main") != 0) {
 					invarg(*argv, "table");
 				}
+#endif
 			} else if (matches(*argv, "cache") == 0) {
 				filter.tb = -1;
 			} else {