95ca85a
diff -up net-tools-2.0/lib/interface.c.cycle net-tools-2.0/lib/interface.c
906023f
--- net-tools-2.0/lib/interface.c.cycle	2015-08-29 08:59:31.000000000 +0200
906023f
+++ net-tools-2.0/lib/interface.c	2015-09-15 18:09:54.089697132 +0200
626e1f7
@@ -93,6 +93,7 @@ int if_list_all = 0;	/* do we have reque
cvsdist 5f913e2
 static struct interface *int_list, *int_last;
cvsdist 5f913e2
 
fbff637
 static int if_readlist_proc(const char *);
fbff637
+static int if_readlist_rep(const char *, struct interface *);
cvsdist 5f913e2
 
fbff637
 static struct interface *if_cache_add(const char *name)
cvsdist 5f913e2
 {
fbff637
@@ -138,11 +139,14 @@ struct interface *lookup_interface(const
cvsdist 5f913e2
 int for_all_interfaces(int (*doit) (struct interface *, void *), void *cookie)
cvsdist 5f913e2
 {
cvsdist 5f913e2
     struct interface *ife;
cvsdist 5f913e2
+    int err;
cvsdist 5f913e2
 
626e1f7
     if (!if_list_all && (if_readlist() < 0))
cvsdist 5f913e2
 	return -1;
cvsdist 5f913e2
     for (ife = int_list; ife; ife = ife->next) {
cvsdist 5f913e2
-	int err = doit(ife, cookie);
626e1f7
+	if_readlist_rep(ife->name, ife);
cvsdist 5f913e2
+	err = doit(ife, cookie);
626e1f7
+
cvsdist 5f913e2
 	if (err)
cvsdist 5f913e2
 	    return err;
cvsdist 5f913e2
     }
fbff637
@@ -379,6 +383,41 @@ static int if_readlist_proc(const char *
626e1f7
     fclose(fh);
cvsdist 5f913e2
     return err;
cvsdist 5f913e2
 }
cvsdist 5f913e2
+
fbff637
+static int if_readlist_rep(const char *target, struct interface *ife)
cvsdist 5f913e2
+{
cvsdist 5f913e2
+    FILE *fh;
cvsdist 5f913e2
+    char buf[512];
cvsdist 5f913e2
+    int err;
cvsdist 5f913e2
+
cvsdist 5f913e2
+    fh = fopen(_PATH_PROCNET_DEV, "r");
cvsdist 5f913e2
+    if (!fh) {
cvsdist 5f913e2
+		fprintf(stderr, _("Warning: cannot open %s (%s). Limited output.\n"),
cvsdist 5f913e2
+			_PATH_PROCNET_DEV, strerror(errno)); 
cvsdist 5f913e2
+		return if_readconf();
cvsdist 5f913e2
+	}	
cvsdist 5f913e2
+    fgets(buf, sizeof buf, fh);	/* eat line */
cvsdist 5f913e2
+    fgets(buf, sizeof buf, fh);
cvsdist 5f913e2
+
cvsdist 5f913e2
+    procnetdev_vsn = procnetdev_version(buf);
cvsdist 5f913e2
+
cvsdist 5f913e2
+    err = 0;
cvsdist 5f913e2
+    while (fgets(buf, sizeof buf, fh)) {
cvsdist 5f913e2
+	char *s, name[IFNAMSIZ];
cvsdist 5f913e2
+	s = get_name(name, buf);    
cvsdist 5f913e2
+	get_dev_fields(s, ife);
cvsdist 5f913e2
+	ife->statistics_valid = 1;
cvsdist 5f913e2
+	if (target && !strcmp(target,name))
cvsdist 5f913e2
+		break;
cvsdist 5f913e2
+    }
cvsdist 5f913e2
+    if (ferror(fh)) {
cvsdist 5f913e2
+	perror(_PATH_PROCNET_DEV);
cvsdist 5f913e2
+	err = -1;
cvsdist 5f913e2
+    }
cvsdist 5f913e2
+
cvsdist 5f913e2
+    fclose(fh);
cvsdist 5f913e2
+    return err;
cvsdist 5f913e2
+}
626e1f7
 
c90847a
 int if_readlist(void)
c90847a
 {
95ca85a
diff -up net-tools-2.0/man/en_US/netstat.8.cycle net-tools-2.0/man/en_US/netstat.8
906023f
--- net-tools-2.0/man/en_US/netstat.8.cycle	2015-08-29 08:59:31.000000000 +0200
906023f
+++ net-tools-2.0/man/en_US/netstat.8	2015-09-15 18:09:54.090697129 +0200
fbff637
@@ -36,6 +36,7 @@ netstat \- Print network connections, ro
cvsdist 5f913e2
 .RB [ \-\-verbose | \-v ]
cvsdist 5f913e2
 .RB [ \-\-continuous | \-c]
fbff637
 .RB [ \-\-wide | \-W ]
cvsdist 5f913e2
+.RB [delay]
cvsdist 5f913e2
 .P
cvsdist 5f913e2
 .B netstat 
cvsdist 5f913e2
 .RB { \-\-route | \-r }
fbff637
@@ -45,6 +46,7 @@ netstat \- Print network connections, ro
cvsdist 5f913e2
 .RB [ \-\-numeric | \-n ]
626e1f7
 .RB [ \-\-numeric\-hosts "] [" \-\-numeric\-ports "] [" \-\-numeric\-users ]
fbff637
 .RB [ \-\-continuous | \-c ]
cvsdist 5f913e2
+.RB [delay]
cvsdist 5f913e2
 .P
cvsdist 5f913e2
 .B netstat
cvsdist 5f913e2
 .RB { \-\-interfaces | \-i }
fbff637
@@ -55,12 +57,14 @@ netstat \- Print network connections, ro
cvsdist 5f913e2
 .RB [ \-\-numeric | \-n ]
626e1f7
 .RB [ \-\-numeric-hosts "] [" \-\-numeric-ports "] [" \-\-numeric-users ]
fbff637
 .RB [ \-\-continuous | \-c ]
cvsdist 5f913e2
+.RB [delay]
cvsdist 5f913e2
 .P
cvsdist 5f913e2
 .B netstat
cvsdist 5f913e2
 .RB { \-\-groups | \-g }
cvsdist 5f913e2
 .RB [ \-\-numeric | \-n ]
626e1f7
 .RB [ \-\-numeric\-hosts "] [" \-\-numeric\-ports "] [" \-\-numeric\-users ]
fbff637
 .RB [ \-\-continuous | \-c ]
cvsdist 5f913e2
+.RB [delay]
cvsdist 5f913e2
 .P
cvsdist 5f913e2
 .B netstat
cvsdist 5f913e2
 .RB { \-\-masquerade | \-M }
fbff637
@@ -68,6 +72,7 @@ netstat \- Print network connections, ro
cvsdist 5f913e2
 .RB [ \-\-numeric | \-n ]
626e1f7
 .RB [ \-\-numeric\-hosts "] [" \-\-numeric\-ports "] [" \-\-numeric\-users ]
fbff637
 .RB [ \-\-continuous | \-c ]
cvsdist 5f913e2
+.RB [delay]
cvsdist 5f913e2
 .P
cvsdist 5f913e2
 .B netstat
cvsdist 5f913e2
 .RB { \-\-statistics | -s }
fbff637
@@ -76,6 +81,7 @@ netstat \- Print network connections, ro
626e1f7
 .RB [ \-\-udplite | \-U ]
ec3d3bc
 .RB [ \-\-sctp | \-S ]
cvsdist 5f913e2
 .RB [ \-\-raw | \-w ]
cvsdist 5f913e2
+.RB [delay]
cvsdist 5f913e2
 .P
cvsdist 5f913e2
 .B netstat 
cvsdist 5f913e2
 .RB { \-\-version | \-V }
fbff637
@@ -208,6 +214,10 @@ option, show interfaces that are not up
cvsdist 5f913e2
 Print routing information from the FIB.  (This is the default.)
cvsdist 5f913e2
 .SS "\-C"
cvsdist 5f913e2
 Print routing information from the route cache.
cvsdist 5f913e2
+.SS delay
cvsdist 5f913e2
+Netstat will cycle printing through statistics every 
cvsdist 5f913e2
+.B delay 
cvsdist 5f913e2
+seconds.
cvsdist 5f913e2
 .P
cvsdist 5f913e2
 .SH OUTPUT
626e1f7
 .P
95ca85a
diff -up net-tools-2.0/netstat.c.cycle net-tools-2.0/netstat.c
906023f
--- net-tools-2.0/netstat.c.cycle	2015-08-29 08:59:31.000000000 +0200
906023f
+++ net-tools-2.0/netstat.c	2015-09-15 18:09:54.090697129 +0200
906023f
@@ -115,8 +115,8 @@
cvsdist 5f913e2
 #endif
cvsdist 5f913e2
 
cvsdist 5f913e2
 /* prototypes for statistics.c */
906023f
-void parsesnmp(int, int, int, int);
626e1f7
-void parsesnmp6(int, int, int);
906023f
+int parsesnmp(int, int, int, int);
626e1f7
+int parsesnmp6(int, int, int);
cvsdist 5f913e2
 
cvsdist 5f913e2
 typedef enum {
906023f
     SS_FREE = 0,		/* not allocated                */
906023f
@@ -340,10 +340,10 @@ static void prg_cache_clear(void)
2c75ca1
     prg_cache_loaded = 0;
626e1f7
 }
626e1f7
 
626e1f7
-static void wait_continous(void)
626e1f7
+static void wait_continous(int reptimer)
626e1f7
 {
626e1f7
     fflush(stdout);
626e1f7
-    sleep(1);
626e1f7
+    sleep(reptimer);
626e1f7
 }
626e1f7
 
626e1f7
 static int extract_type_1_socket_inode(const char lname[], unsigned long * inode_p) {
906023f
@@ -1892,6 +1892,8 @@ static int rfcomm_info(void)
cvsdist 5f913e2
 
cvsdist 5f913e2
 static int iface_info(void)
cvsdist 5f913e2
 {
cvsdist 5f913e2
+    static int count=0;
cvsdist 5f913e2
+
cvsdist 5f913e2
     if (skfd < 0) {
cvsdist 5f913e2
 	if ((skfd = sockets_open(0)) < 0) {
cvsdist 5f913e2
 	    perror("socket");
906023f
@@ -1901,20 +1903,21 @@ static int iface_info(void)
cvsdist 5f913e2
     }
cvsdist 5f913e2
     if (flag_exp < 2) {
cvsdist 5f913e2
 	ife_short = 1;
9dd4855
-	printf(_("Iface      MTU    RX-OK RX-ERR RX-DRP RX-OVR    TX-OK TX-ERR TX-DRP TX-OVR Flg\n"));
cvsdist 5f913e2
+	if(!(count % 8))
9dd4855
+	    printf(_("Iface      MTU    RX-OK RX-ERR RX-DRP RX-OVR    TX-OK TX-ERR TX-DRP TX-OVR Flg\n"));
cvsdist 5f913e2
     }
cvsdist 5f913e2
 
cvsdist 5f913e2
     if (for_all_interfaces(do_if_print, &flag_all) < 0) {
cvsdist 5f913e2
 	perror(_("missing interface information"));
cvsdist 5f913e2
 	exit(1);
cvsdist 5f913e2
     }
cvsdist 5f913e2
-    if (flag_cnt)
cvsdist 5f913e2
+    if (!flag_cnt) {
626e1f7
 	if_cache_free();
cvsdist 5f913e2
-    else {
cvsdist 5f913e2
 	close(skfd);
cvsdist 5f913e2
 	skfd = -1;
cvsdist 5f913e2
     }
cvsdist 5f913e2
 
cvsdist 5f913e2
+    count++;
cvsdist 5f913e2
     return 0;
cvsdist 5f913e2
 }
cvsdist 5f913e2
 
906023f
@@ -1930,7 +1933,7 @@ static void usage(void)
cvsdist 5f913e2
 {
626e1f7
     fprintf(stderr, _("usage: netstat [-vWeenNcCF] [<Af>] -r         netstat {-V|--version|-h|--help}\n"));
626e1f7
     fprintf(stderr, _("       netstat [-vWnNcaeol] [<Socket> ...]\n"));
626e1f7
-    fprintf(stderr, _("       netstat { [-vWeenNac] -i | [-cnNe] -M | -s [-6tuw] }\n\n"));
626e1f7
+    fprintf(stderr, _("       netstat { [-vWeenNac] -i | [-cnNe] -M | -s [-6tuw] } [delay]\n\n"));
cvsdist 5f913e2
 
cvsdist 5f913e2
     fprintf(stderr, _("        -r, --route              display routing table\n"));
cvsdist 5f913e2
     fprintf(stderr, _("        -i, --interfaces         display interface table\n"));
906023f
@@ -1972,6 +1975,7 @@ int main
cvsdist 5f913e2
  (int argc, char *argv[]) {
cvsdist 5f913e2
     int i;
cvsdist 5f913e2
     int lop;
cvsdist 5f913e2
+    int reptimer = 1;
626e1f7
     static struct option longopts[] =
cvsdist 5f913e2
     {
cvsdist 5f913e2
 	AFTRANS_OPTS,
906023f
@@ -2154,6 +2158,12 @@ int main
cvsdist 5f913e2
 	    flag_sta++;
cvsdist 5f913e2
 	}
cvsdist 5f913e2
 
cvsdist 5f913e2
+    if(argc == optind + 1) {
cvsdist 5f913e2
+      if((reptimer = atoi(argv[optind])) <= 0)
cvsdist 5f913e2
+	usage();
cvsdist 5f913e2
+      flag_cnt++;
cvsdist 5f913e2
+    }
cvsdist 5f913e2
+    
cvsdist 5f913e2
     if (flag_int + flag_rou + flag_mas + flag_sta > 1)
cvsdist 5f913e2
 	usage();
cvsdist 5f913e2
 
906023f
@@ -2183,7 +2193,7 @@ int main
cvsdist 5f913e2
 			     flag_not & FLAG_NUM_PORT, flag_exp);
cvsdist 5f913e2
 	    if (i || !flag_cnt)
cvsdist 5f913e2
 		break;
626e1f7
-	    wait_continous();
626e1f7
+	    wait_continous(reptimer);
cvsdist 5f913e2
 	}
cvsdist 5f913e2
 #else
626e1f7
 	ENOSUPP("netstat", "FW_MASQUERADE");
906023f
@@ -2196,15 +2206,16 @@ int main
626e1f7
         if (!afname[0])
b381fc1
             safe_strncpy(afname, DFLT_AF, sizeof(afname));
c90847a
 
626e1f7
+        for (;;) {
626e1f7
         if (!strcmp(afname, "inet")) {
626e1f7
 #if HAVE_AFINET
906023f
-            parsesnmp(flag_raw, flag_tcp, flag_udp, flag_sctp);
906023f
+            i = parsesnmp(flag_raw, flag_tcp, flag_udp, flag_sctp);
626e1f7
 #else
626e1f7
             ENOSUPP("netstat", "AF INET");
626e1f7
 #endif
626e1f7
         } else if(!strcmp(afname, "inet6")) {
626e1f7
 #if HAVE_AFINET6
626e1f7
-            parsesnmp6(flag_raw, flag_tcp, flag_udp);
626e1f7
+            i = parsesnmp6(flag_raw, flag_tcp, flag_udp);
626e1f7
 #else
626e1f7
             ENOSUPP("netstat", "AF INET6");
626e1f7
 #endif
906023f
@@ -2212,7 +2223,11 @@ int main
626e1f7
           printf(_("netstat: No statistics support for specified address family: %s\n"), afname);
626e1f7
           exit(1);
626e1f7
         }
626e1f7
-        exit(0);
cvsdist 5f913e2
+	if(i || !flag_cnt)
cvsdist 5f913e2
+	  break;
cvsdist 5f913e2
+	sleep(reptimer);
626e1f7
+        }
626e1f7
+        return (i);
cvsdist 5f913e2
     }
c90847a
 
cvsdist 5f913e2
     if (flag_rou) {
906023f
@@ -2234,7 +2249,7 @@ int main
cvsdist 5f913e2
 	    i = route_info(afname, options);
cvsdist 5f913e2
 	    if (i || !flag_cnt)
cvsdist 5f913e2
 		break;
626e1f7
-            wait_continous();
626e1f7
+            wait_continous(reptimer);
cvsdist 5f913e2
 	}
cvsdist 5f913e2
 	return (i);
cvsdist 5f913e2
     }
906023f
@@ -2243,7 +2258,7 @@ int main
cvsdist 5f913e2
 	    i = iface_info();
cvsdist 5f913e2
 	    if (!flag_cnt || i)
cvsdist 5f913e2
 		break;
626e1f7
-            wait_continous();
626e1f7
+            wait_continous(reptimer);
cvsdist 5f913e2
 	}
cvsdist 5f913e2
 	return (i);
cvsdist 5f913e2
     }
906023f
@@ -2430,7 +2445,7 @@ int main
3f72065
 
cvsdist 5f913e2
 	if (!flag_cnt || i)
cvsdist 5f913e2
 	    break;
626e1f7
-        wait_continous();
626e1f7
+        wait_continous(reptimer);
cvsdist 5f913e2
 	prg_cache_clear();
cvsdist 5f913e2
     }
cvsdist 5f913e2
     return (i);
95ca85a
diff -up net-tools-2.0/statistics.c.cycle net-tools-2.0/statistics.c
906023f
--- net-tools-2.0/statistics.c.cycle	2015-08-29 08:59:31.000000000 +0200
906023f
+++ net-tools-2.0/statistics.c	2015-09-15 18:10:34.608582779 +0200
906023f
@@ -527,7 +527,7 @@ static void process_fd2(FILE *f, const c
906023f
     }
626e1f7
 }
cvsdist 5f913e2
 
906023f
-void parsesnmp(int flag_raw, int flag_tcp, int flag_udp, int flag_sctp)
906023f
+int parsesnmp(int flag_raw, int flag_tcp, int flag_udp, int flag_sctp)
cvsdist 5f913e2
 {
cvsdist 5f913e2
     FILE *f;
cvsdist 5f913e2
 
906023f
@@ -536,14 +536,17 @@ void parsesnmp(int flag_raw, int flag_tc
626e1f7
     f = proc_fopen("/proc/net/snmp");
cvsdist 5f913e2
     if (!f) {
cvsdist 5f913e2
 	perror(_("cannot open /proc/net/snmp"));
cvsdist 5f913e2
-	return;
cvsdist 5f913e2
+	return(1);
cvsdist 5f913e2
     }
626e1f7
 
626e1f7
     if (process_fd(f, 1, NULL) < 0)
626e1f7
       fprintf(stderr, _("Problem while parsing /proc/net/snmp\n"));
cvsdist 5f913e2
 
cvsdist 5f913e2
-    if (ferror(f))
cvsdist 5f913e2
+    if (ferror(f)) {
cvsdist 5f913e2
 	perror("/proc/net/snmp");
579c9b0
+	fclose(f);
cvsdist 5f913e2
+	return(1);
cvsdist 5f913e2
+    }
cvsdist 5f913e2
 
cvsdist 5f913e2
     fclose(f);
cvsdist 5f913e2
 
906023f
@@ -553,8 +556,11 @@ void parsesnmp(int flag_raw, int flag_tc
626e1f7
     	if (process_fd(f, 1, NULL) <0)
626e1f7
           fprintf(stderr, _("Problem while parsing /proc/net/netstat\n"));
cvsdist 5f913e2
 
cvsdist 5f913e2
-        if (ferror(f))
cvsdist 5f913e2
-	    perror("/proc/net/netstat");
cvsdist 5f913e2
+        if (ferror(f)) {
cvsdist 5f913e2
+	  perror("/proc/net/netstat");
579c9b0
+	  fclose(f);
cvsdist 5f913e2
+	  return(1);
626e1f7
+        }
c90847a
 
cvsdist 5f913e2
         fclose(f);
cvsdist 5f913e2
     }
906023f
@@ -567,9 +573,10 @@ void parsesnmp(int flag_raw, int flag_tc
906023f
 	    fclose(f);
906023f
 	}
906023f
     }
cvsdist 5f913e2
+    return(0);
cvsdist 5f913e2
 }
c90847a
 
626e1f7
-void parsesnmp6(int flag_raw, int flag_tcp, int flag_udp)
626e1f7
+int parsesnmp6(int flag_raw, int flag_tcp, int flag_udp)
626e1f7
 {
626e1f7
     FILE *f;
626e1f7
 
906023f
@@ -578,7 +585,7 @@ void parsesnmp6(int flag_raw, int flag_t
626e1f7
     f = fopen("/proc/net/snmp6", "r");
626e1f7
     if (!f) {
626e1f7
         perror(_("cannot open /proc/net/snmp6"));
626e1f7
-        return;
626e1f7
+        return(1);
626e1f7
     }
626e1f7
     process6_fd(f);
626e1f7
     if (ferror(f))
906023f
@@ -588,11 +595,14 @@ void parsesnmp6(int flag_raw, int flag_t
626e1f7
     f = fopen("/proc/net/snmp", "r");
626e1f7
     if (!f) {
626e1f7
         perror(_("cannot open /proc/net/snmp"));
626e1f7
-        return;
626e1f7
+        return(1);
626e1f7
     }
626e1f7
     process_fd(f, 0, "Tcp");
626e1f7
-    if (ferror(f))
626e1f7
+    if (ferror(f)) {
626e1f7
         perror("/proc/net/snmp");
626e1f7
+        return(1);
626e1f7
+    }
626e1f7
 
626e1f7
     fclose(f);
626e1f7
+    return(0);
626e1f7
 }