summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenis Vlasenko2006-12-15 00:59:35 +0000
committerDenis Vlasenko2006-12-15 00:59:35 +0000
commitcda6c636ca37790c451b08fd62b7d5fe08e8fcd1 (patch)
tree0296f12f9eeb7b4348c01c73fe04088ee2ac2e98
parent44b2ea786ea5acd92af3159b79a54f7f5e58e2aa (diff)
downloadbusybox-cda6c636ca37790c451b08fd62b7d5fe08e8fcd1.zip
busybox-cda6c636ca37790c451b08fd62b7d5fe08e8fcd1.tar.gz
re-applying first post-1.3.x change
version change to 1.4.0.svn
-rw-r--r--Makefile4
-rw-r--r--networking/libiproute/iproute.c12
2 files changed, 14 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index e05fad1..be8b194 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
VERSION = 1
-PATCHLEVEL = 3
+PATCHLEVEL = 4
SUBLEVEL = 0
-EXTRAVERSION =
+EXTRAVERSION = .svn
NAME = Unnamed
# *DOCUMENTATION*
diff --git a/networking/libiproute/iproute.c b/networking/libiproute/iproute.c
index 9c3b870..30d4556 100644
--- a/networking/libiproute/iproute.c
+++ b/networking/libiproute/iproute.c
@@ -353,6 +353,14 @@ static int iproute_modify(int cmd, unsigned flags, int argc, char **argv)
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 @@ static int iproute_list_or_flush(int argc, char **argv, int flush)
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 {