emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

re-applying first post-1.3.x change

Browse Source 
version change to 1.4.0.svn
This commit is contained in:
Denis Vlasenko 2006-12-15 00:59:35 +00:00
parent 44b2ea786e
commit cda6c636ca
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -1,7 +1,7 @@
VERSION = 1 VERSION = 1
PATCHLEVEL = 3 PATCHLEVEL = 4
SUBLEVEL = 0 SUBLEVEL = 0
EXTRAVERSION = EXTRAVERSION = .svn
NAME = Unnamed NAME = Unnamed
# *DOCUMENTATION* # *DOCUMENTATION*

12
networking/libiproute/iproute.c
View File

@ -353,6 +353,14 @@ static int iproute_modify(int cmd, unsigned flags, int argc, char **argv)
invarg(*argv, "protocol"); invarg(*argv, "protocol");
req.r.rtm_protocol = prot; req.r.rtm_protocol = prot;
proto_ok =1; 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 || } else if (strcmp(*argv, "dev") == 0 ||
strcmp(*argv, "oif") == 0) { strcmp(*argv, "oif") == 0) {
NEXT_ARG(); NEXT_ARG();
@ -540,9 +548,13 @@ static int iproute_list_or_flush(int argc, char **argv, int flush)
NEXT_ARG(); NEXT_ARG();
if (matches(*argv, "cache") == 0) { if (matches(*argv, "cache") == 0) {
filter.tb = -1; filter.tb = -1;
#if 0 && ENABLE_FEATURE_IP_RULE
#else
} else if (matches(*argv, "main") != 0) { } else if (matches(*argv, "main") != 0) {
invarg(*argv, "table"); invarg(*argv, "table");
} }
#endif
} else if (matches(*argv, "cache") == 0) { } else if (matches(*argv, "cache") == 0) {
filter.tb = -1; filter.tb = -1;
} else { } else {