matthias
/
iproute2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update include files and fix a couple of minor bugs

This commit is contained in:
shemminger 2005-08-16 21:10:51 +00:00
parent 6864c1e789
commit 660818498d
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2005-08-16 Stephen Hemminger <shemminger@osdl.org>
* Limit ip route flush to 10 rounds.
* Cleanup ip rule flush error message
2005-08-08 Stephen Hemminger <shemminger@osdl.org> 2005-08-08 Stephen Hemminger <shemminger@osdl.org>
* Update to 2.6.13+ kernel headers * Update to 2.6.13+ kernel headers

6
ip/ipneigh.c
View File

@ -31,6 +31,7 @@
#include "ip_common.h" #include "ip_common.h"
#define NUD_VALID (NUD_PERMANENT|NUD_NOARP|NUD_REACHABLE|NUD_PROBE|NUD_STALE|NUD_DELAY) #define NUD_VALID (NUD_PERMANENT|NUD_NOARP|NUD_REACHABLE|NUD_PROBE|NUD_STALE|NUD_DELAY)
#define MAX_ROUNDS 10
static struct static struct
{ {
@ -402,7 +403,7 @@ int do_show_or_flush(int argc, char **argv, int flush)
filter.rth = &rth; filter.rth = &rth;
filter.state &= ~NUD_FAILED; filter.state &= ~NUD_FAILED;
for (;;) { while (round < MAX_ROUNDS) {
if (rtnl_wilddump_request(&rth, filter.family, RTM_GETNEIGH) < 0) { if (rtnl_wilddump_request(&rth, filter.family, RTM_GETNEIGH) < 0) {
perror("Cannot send dump request"); perror("Cannot send dump request");
exit(1); exit(1);
@ -428,6 +429,9 @@ int do_show_or_flush(int argc, char **argv, int flush)
fflush(stdout); fflush(stdout);
} }
} }
printf("*** Flush not complete bailing out after %d rounds\n",
MAX_ROUNDS);
return 1;
} }
if (rtnl_wilddump_request(&rth, filter.family, RTM_GETNEIGH) < 0) { if (rtnl_wilddump_request(&rth, filter.family, RTM_GETNEIGH) < 0) {

2
ip/iprule.c
View File

@ -340,7 +340,7 @@ static int iprule_flush(int argc, char **argv)
af = AF_INET; af = AF_INET;
if (argc > 0) { if (argc > 0) {
fprintf(stderr, "\"ip rule flush\" need not any arguments.\n"); fprintf(stderr, "\"ip rule flush\" does not allow arguments\n");
return -1; return -1;
} }