aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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 e05fad166..be8b1948f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
1VERSION = 1 1VERSION = 1
2PATCHLEVEL = 3 2PATCHLEVEL = 4
3SUBLEVEL = 0 3SUBLEVEL = 0
4EXTRAVERSION = 4EXTRAVERSION = .svn
5NAME = Unnamed 5NAME = Unnamed
6 6
7# *DOCUMENTATION* 7# *DOCUMENTATION*
diff --git a/networking/libiproute/iproute.c b/networking/libiproute/iproute.c
index 9c3b87040..30d455602 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)
353 invarg(*argv, "protocol"); 353 invarg(*argv, "protocol");
354 req.r.rtm_protocol = prot; 354 req.r.rtm_protocol = prot;
355 proto_ok =1; 355 proto_ok =1;
356#if ENABLE_FEATURE_IP_RULE
357 } else if (matches(*argv, "table") == 0) {
358 uint32_t tid;
359 NEXT_ARG();
360 if (rtnl_rttable_a2n(&tid, *argv))
361 invarg(*argv, "table");
362 req.r.rtm_table = tid;
363#endif
356 } else if (strcmp(*argv, "dev") == 0 || 364 } else if (strcmp(*argv, "dev") == 0 ||
357 strcmp(*argv, "oif") == 0) { 365 strcmp(*argv, "oif") == 0) {
358 NEXT_ARG(); 366 NEXT_ARG();
@@ -540,9 +548,13 @@ static int iproute_list_or_flush(int argc, char **argv, int flush)
540 NEXT_ARG(); 548 NEXT_ARG();
541 if (matches(*argv, "cache") == 0) { 549 if (matches(*argv, "cache") == 0) {
542 filter.tb = -1; 550 filter.tb = -1;
551#if 0 && ENABLE_FEATURE_IP_RULE
552
553#else
543 } else if (matches(*argv, "main") != 0) { 554 } else if (matches(*argv, "main") != 0) {
544 invarg(*argv, "table"); 555 invarg(*argv, "table");
545 } 556 }
557#endif
546 } else if (matches(*argv, "cache") == 0) { 558 } else if (matches(*argv, "cache") == 0) {
547 filter.tb = -1; 559 filter.tb = -1;
548 } else { 560 } else {