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

Handle case wher non-root user runs ip flush. 

Timeout after attempts to delete fail.

(Logical change 1.14)
This commit is contained in:
osdl.org!shemminger 2004-06-08 22:51:46 +00:00
parent 7bbc17647b
commit 33551240de
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ip/iproute.c
View File

@ -21,6 +21,7 @@
#include <syslog.h> #include <syslog.h>
#include <fcntl.h> #include <fcntl.h>
#include <string.h> #include <string.h>
#include <time.h>
#include <sys/time.h> #include <sys/time.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <netinet/in.h> #include <netinet/in.h>
@ -1133,6 +1134,7 @@ static int iproute_list_or_flush(int argc, char **argv, int flush)
if (flush) { if (flush) {
int round = 0; int round = 0;
char flushb[4096-512]; char flushb[4096-512];
time_t start = time(0);
if (filter.tb == -1) { if (filter.tb == -1) {
if (do_ipv6 != AF_INET6) { if (do_ipv6 != AF_INET6) {
@ -1171,6 +1173,13 @@ static int iproute_list_or_flush(int argc, char **argv, int flush)
round++; round++;
if (flush_update() < 0) if (flush_update() < 0)
exit(1); exit(1);
if (time(0) - start > 30) {
printf("\n*** Flush not completed after %ld seconds, %d entries remain ***\n",
time(0) - start, filter.flushed);
exit(1);
}
if (show_stats) { if (show_stats) {
printf("\n*** Round %d, deleting %d entries ***\n", round, filter.flushed); printf("\n*** Round %d, deleting %d entries ***\n", round, filter.flushed);
fflush(stdout); fflush(stdout);