Yow. This is net-tools completely reindented.

Some other cleanups:
- lib/net-string.c removed because it was not used and had a copyright notice
that conflicted with the GPL.
- Minor cleanups.
- Fix an potential buffer overflow in ax25.
- Switch to CVS $Id$ for versioning consistently

1 files changed, 230 insertions, 215 deletions

diff --git a/statistics.c b/statistics.c
index bc21be4..a5876af 100644
--- a/statistics.c
+++ b/statistics.c
@@ -1,11 +1,12 @@
 /* Copyright '97 by Andi Kleen. Subject to the GPL. */
+/* $Id: statistics.c,v 1.9 1998/11/15 20:08:30 freitag Exp $ */ 
 /* 19980630 - i18n - Arnaldo Carvalho de Melo <acme@conectiva.com.br> */
 /* 19981113 - i18n fixes - Arnaldo Carvalho de Melo <acme@conectiva.com.br> */
 
 /* 
    XXX: rewrite to 2 pass to support /proc/net/netstat too
-   	    support -t -u 
- */		
+   support -t -u 
+ */
 #include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -18,31 +19,36 @@
 #ifdef WARN
 #define UFWARN(x) x
 #else
-#define UFWARN(x) 
+#define UFWARN(x)
 #endif
 
-int print_static; 
+int print_static;
+
+enum State {
+    number = 0, i_forward, i_inp_icmp, i_outp_icmp, i_rto_alg
+};
 
-enum State { number = 0, i_forward, i_inp_icmp, i_outp_icmp, i_rto_alg };
 #define normal number
 
 struct entry {
-	char *title;
-	char *out; 
-	enum State type;
-}; 
+    char *title;
+    char *out;
+    enum State type;
+};
 
 static enum State state;
-static int indent[] = { 4, 4, 8, 8, 4 };       /* for each state */
+static int indent[] =
+{4, 4, 8, 8, 4};		/* for each state */
 
-#define I_STATIC (1<<16) /* static configuration option. */
+#define I_STATIC (1<<16)	/* static configuration option. */
 #define I_TITLE  (1<<17)
 
-char *titles[] = { /* for each state */
-	NULL, NULL, 
-	N_("ICMP input histogram:"),
-	N_("ICMP output histogram:"),
-	NULL
+char *titles[] =
+{				/* for each state */
+    NULL, NULL,
+    N_("ICMP input histogram:"),
+    N_("ICMP output histogram:"),
+    NULL
 };
 
 /* XXX check against the snmp mib rfc.
@@ -50,237 +56,246 @@ char *titles[] = { /* for each state */
  /*
     Don't mark the first field as translatable! It's a snmp MIB standard.
 
-     - acme
- */
-struct entry Iptab[] = {
-	{ "Forwarding", N_("Forwarding is %s"), i_forward|I_STATIC },
-	{ "DefaultTTL", N_("Default TTL is %d"), number|I_STATIC },
-	{ "InReceives", N_("%d total packets received"), number },
-	{ "InHdrErrors", N_("%d with invalid headers"), number },
-	{ "InAddrErrors", N_("%d with invalid addresses"), number },
-	{ "ForwDatagrams", N_("%d forwarded"), number },
-	{ "InUnknownProtos", N_("%d with unknown protocol"), number },
-	{ "InDiscards", N_("%d incoming packets discarded"), number },
-	{ "InDelivers", N_("%d incoming packets delivered"), number },
-	{ "OutRequests", N_("%d requests sent out"), number }, /*?*/
-	{ "OutDiscards", N_("%d outgoing packets dropped"), number }, 
-	{ "OutNoRoutes", N_("%d dropped because of missing route"), number },
-	{ "ReasmTimeout", N_("%d fragments dropped after timeout"), number },
-	{ "ReasmReqds", N_("%d reassemblies required"), number }, /* ? */
-	{ "ReasmOKs", N_("%d packets reassembled ok"), number }, 
-	{ "ReasmFails", N_("%d packet reassembles failed"), number }, 
-	{ "FragOKs", N_("%d fragments received ok"), number },
-	{ "FragFails", N_("%d fragments failed"), number },
-	{ "FragCreates", N_("%d fragments created"), number }
+    - acme
+  */
+struct entry Iptab[] =
+{
+    {"Forwarding", N_("Forwarding is %s"), i_forward | I_STATIC},
+    {"DefaultTTL", N_("Default TTL is %d"), number | I_STATIC},
+    {"InReceives", N_("%d total packets received"), number},
+    {"InHdrErrors", N_("%d with invalid headers"), number},
+    {"InAddrErrors", N_("%d with invalid addresses"), number},
+    {"ForwDatagrams", N_("%d forwarded"), number},
+    {"InUnknownProtos", N_("%d with unknown protocol"), number},
+    {"InDiscards", N_("%d incoming packets discarded"), number},
+    {"InDelivers", N_("%d incoming packets delivered"), number},
+    {"OutRequests", N_("%d requests sent out"), number},	/*? */
+    {"OutDiscards", N_("%d outgoing packets dropped"), number},
+    {"OutNoRoutes", N_("%d dropped because of missing route"), number},
+    {"ReasmTimeout", N_("%d fragments dropped after timeout"), number},
+    {"ReasmReqds", N_("%d reassemblies required"), number},	/* ? */
+    {"ReasmOKs", N_("%d packets reassembled ok"), number},
+    {"ReasmFails", N_("%d packet reassembles failed"), number},
+    {"FragOKs", N_("%d fragments received ok"), number},
+    {"FragFails", N_("%d fragments failed"), number},
+    {"FragCreates", N_("%d fragments created"), number}
 };
 
-struct entry Icmptab[] = {
-	{ "InMsgs", N_("%d ICMP messages received"), number },
-	{ "InErrors", N_("%d input ICMP message failed."), number },
-	{ "InDestUnreachs", N_("destination unreachable: %d"), i_inp_icmp|I_TITLE },
-	{ "InTimeExcds", N_("timeout in transit: %d"), i_inp_icmp|I_TITLE },
-	{ "InParmProbs", N_("wrong parameters: %d"), i_inp_icmp|I_TITLE },  /*?*/
-	{ "InSrcQuenchs", N_("source quenchs: %d"), i_inp_icmp|I_TITLE },
-	{ "InRedirects", N_("redirects: %d"), i_inp_icmp|I_TITLE },
-	{ "InEchos", N_("echo requests: %d"), i_inp_icmp|I_TITLE },
-	{ "InEchoReps", N_("echo replies: %d"), i_inp_icmp|I_TITLE },
-	{ "InTimestamps", N_("timestamp request: %d"), i_inp_icmp|I_TITLE },
-	{ "InTimestampReps", N_("timestamp reply: %d"), i_inp_icmp|I_TITLE },
-	{ "InAddrMasks", N_("address mask request: %d"), i_inp_icmp|I_TITLE }, /*?*/
-	{ "InAddrMaskReps", N_("address mask replies"), i_inp_icmp|I_TITLE }, /*?*/
-	{ "OutMsgs", N_("%d ICMP messages sent"), number },
-	{ "OutErrors", N_("%d ICMP messages failed"), number },
-	{ "OutDestUnreachs", N_("destination unreachable: %d"), i_outp_icmp|I_TITLE },
-	{ "OutTimeExcds", N_("time exceeded: %d"), i_outp_icmp|I_TITLE },
-	{ "OutParmProbs", N_("wrong parameters: %d"), i_outp_icmp|I_TITLE }, /*?*/
-	{ "OutSrcQuenchs", N_("source quench: %d"), i_outp_icmp|I_TITLE },
-	{ "OutRedirects", N_("redirect: %d"), i_outp_icmp|I_TITLE },
-	{ "OutEchos", N_("echo request: %d"), i_outp_icmp|I_TITLE },
-	{ "OutEchoReps", N_("echo replies: %d"), i_outp_icmp|I_TITLE },
-	{ "OutTimestamps", N_("timestamp requests: %d"), i_outp_icmp|I_TITLE },
-	{ "OutTimestampReps", N_("timestamp replies: %d"), i_outp_icmp|I_TITLE },
-	{ "OutAddrMasks", N_("address mask requests: %d"), i_outp_icmp|I_TITLE },
-	{ "OutAddrMaskReps", N_("address mask replies: %d"), i_outp_icmp|I_TITLE },
+struct entry Icmptab[] =
+{
+    {"InMsgs", N_("%d ICMP messages received"), number},
+    {"InErrors", N_("%d input ICMP message failed."), number},
+    {"InDestUnreachs", N_("destination unreachable: %d"), i_inp_icmp | I_TITLE},
+    {"InTimeExcds", N_("timeout in transit: %d"), i_inp_icmp | I_TITLE},
+    {"InParmProbs", N_("wrong parameters: %d"), i_inp_icmp | I_TITLE},	/*? */
+    {"InSrcQuenchs", N_("source quenchs: %d"), i_inp_icmp | I_TITLE},
+    {"InRedirects", N_("redirects: %d"), i_inp_icmp | I_TITLE},
+    {"InEchos", N_("echo requests: %d"), i_inp_icmp | I_TITLE},
+    {"InEchoReps", N_("echo replies: %d"), i_inp_icmp | I_TITLE},
+    {"InTimestamps", N_("timestamp request: %d"), i_inp_icmp | I_TITLE},
+    {"InTimestampReps", N_("timestamp reply: %d"), i_inp_icmp | I_TITLE},
+    {"InAddrMasks", N_("address mask request: %d"), i_inp_icmp | I_TITLE},	/*? */
+    {"InAddrMaskReps", N_("address mask replies"), i_inp_icmp | I_TITLE},	/*? */
+    {"OutMsgs", N_("%d ICMP messages sent"), number},
+    {"OutErrors", N_("%d ICMP messages failed"), number},
+    {"OutDestUnreachs", N_("destination unreachable: %d"), i_outp_icmp | I_TITLE},
+    {"OutTimeExcds", N_("time exceeded: %d"), i_outp_icmp | I_TITLE},
+    {"OutParmProbs", N_("wrong parameters: %d"), i_outp_icmp | I_TITLE},	/*? */
+    {"OutSrcQuenchs", N_("source quench: %d"), i_outp_icmp | I_TITLE},
+    {"OutRedirects", N_("redirect: %d"), i_outp_icmp | I_TITLE},
+    {"OutEchos", N_("echo request: %d"), i_outp_icmp | I_TITLE},
+    {"OutEchoReps", N_("echo replies: %d"), i_outp_icmp | I_TITLE},
+  {"OutTimestamps", N_("timestamp requests: %d"), i_outp_icmp | I_TITLE},
+{"OutTimestampReps", N_("timestamp replies: %d"), i_outp_icmp | I_TITLE},
+{"OutAddrMasks", N_("address mask requests: %d"), i_outp_icmp | I_TITLE},
+    {"OutAddrMaskReps", N_("address mask replies: %d"), i_outp_icmp | I_TITLE},
 };
 
-struct entry Tcptab[] = {
-	{ "RtoAlgorithm", N_("RTO algorithm is %s"), i_rto_alg|I_STATIC },
-	{ "RtoMin", "", number },
-	{ "RtoMax", "", number },
-	{ "MaxConn", "", number },
-	{ "ActiveOpens", N_("%d active opens"), number },
-	{ "PassiveOpens", N_("%d passive opens"), number },
-	{ "AttemptFails", N_("%d failed connection attempts"), number },
-	{ "EstabResets", N_("%d connection resets received"), number },
-	{ "CurrEstab", N_("%d connections established"), number },
-	{ "InSegs", N_("%d segments received"), number },
-	{ "OutSegs", N_("%d segments send out"), number },
-	{ "RetransSegs", N_("%d segments retransmited"), number },
-	{ "InErrs", N_("%d bad segments received."), number },
-	{ "OutRsts", N_("%d resets sent"), number },
+struct entry Tcptab[] =
+{
+    {"RtoAlgorithm", N_("RTO algorithm is %s"), i_rto_alg | I_STATIC},
+    {"RtoMin", "", number},
+    {"RtoMax", "", number},
+    {"MaxConn", "", number},
+    {"ActiveOpens", N_("%d active opens"), number},
+    {"PassiveOpens", N_("%d passive opens"), number},
+    {"AttemptFails", N_("%d failed connection attempts"), number},
+    {"EstabResets", N_("%d connection resets received"), number},
+    {"CurrEstab", N_("%d connections established"), number},
+    {"InSegs", N_("%d segments received"), number},
+    {"OutSegs", N_("%d segments send out"), number},
+    {"RetransSegs", N_("%d segments retransmited"), number},
+    {"InErrs", N_("%d bad segments received."), number},
+    {"OutRsts", N_("%d resets sent"), number},
 };
 
-struct entry Udptab[] = {
-	{ "InDatagrams", N_("%d packets received"), number },
-	{ "NoPorts", N_("%d packets to unknown port received."), number },
-	{ "InErrors", N_("%d packet receive errors"), number },
-	{ "OutDatagrams", N_("%d packets send"), number },
+struct entry Udptab[] =
+{
+    {"InDatagrams", N_("%d packets received"), number},
+    {"NoPorts", N_("%d packets to unknown port received."), number},
+    {"InErrors", N_("%d packet receive errors"), number},
+    {"OutDatagrams", N_("%d packets send"), number},
 };
 
 struct tabtab {
-	char *title; 
-	struct entry *tab; 
-	size_t size; 
-}; 
-
-struct tabtab snmptabs[] = { 
-	{ "Ip", Iptab, sizeof(Iptab) },
-	{ "Icmp", Icmptab, sizeof(Icmptab) },
-	{ "Tcp", Tcptab, sizeof(Tcptab) },
-	{ "Udp", Udptab, sizeof(Udptab) },
-	{ NULL }
-}; 
+    char *title;
+    struct entry *tab;
+    size_t size;
+};
+
+struct tabtab snmptabs[] =
+{
+    {"Ip", Iptab, sizeof(Iptab)},
+    {"Icmp", Icmptab, sizeof(Icmptab)},
+    {"Tcp", Tcptab, sizeof(Tcptab)},
+    {"Udp", Udptab, sizeof(Udptab)},
+    {NULL}
+};
 
 static char *skiptok(char *s)
 {
-	while (!isspace(*s) && *s != '\0')
-		s++; 
-	return s;
+    while (!isspace(*s) && *s != '\0')
+	s++;
+    return s;
 }
 
 
-/* XXX IGMP */ 
+/* XXX IGMP */
 
 int cmpentries(const void *a, const void *b)
 {
-	return strcmp( ((struct entry*)a)->title, ((struct entry*)b)->title);
+    return strcmp(((struct entry *) a)->title, ((struct entry *) b)->title);
 }
 
-void printval(struct tabtab *tab, char *title, int val) 
+void printval(struct tabtab *tab, char *title, int val)
 {
-	struct entry *ent, key; 
-	int type; 
-	char buf[512];
-
-	key.title = title; 
-	ent = bsearch(&key, tab->tab, tab->size/sizeof(struct entry),
-				  sizeof(struct entry), cmpentries); 
-	if (!ent)  { /* try our best */ 
-		printf("%*s%s: %d\n", indent[state], "", title, val);
-		return;
-	}
-	type = ent->type; 
-	if (type & I_STATIC) {
-		type &= ~I_STATIC; 
-		if (!print_static) 
-			return; 
-	}
-	if (*ent->out == '\0') 
-		return; 
-
-	if (type & I_TITLE) {
-		type &= ~I_TITLE;
-		if (state != type)
-			printf("%*s%s\n", indent[state], "", _(titles[type]));
-	}
-
-	buf[0] = '\0';
-	switch (type) {
-	case number:
-		snprintf(buf, sizeof(buf), _(ent->out), val);
-		break; 
-	case i_forward:
-		type = normal;
-		snprintf(buf, sizeof(buf), _(ent->out), val == 2 ? _("enabled") : _("disabled"));
-		break; 
-	case i_outp_icmp:
-	case i_inp_icmp: 
-		if (val > 0)
-			snprintf(buf, sizeof(buf), _(ent->out), val); 
-		break; 
-	case i_rto_alg: /* XXXX */
-		break; 
-	default:
-		abort(); 
-	}
-	if (buf[0]) 
-		printf("%*s%s\n",indent[type],"", buf);
-	
-	state = type;
+    struct entry *ent, key;
+    int type;
+    char buf[512];
+
+    key.title = title;
+    ent = bsearch(&key, tab->tab, tab->size / sizeof(struct entry),
+		  sizeof(struct entry), cmpentries);
+    if (!ent) {			/* try our best */
+	printf("%*s%s: %d\n", indent[state], "", title, val);
+	return;
+    }
+    type = ent->type;
+    if (type & I_STATIC) {
+	type &= ~I_STATIC;
+	if (!print_static)
+	    return;
+    }
+    if (*ent->out == '\0')
+	return;
+
+    if (type & I_TITLE) {
+	type &= ~I_TITLE;
+	if (state != type)
+	    printf("%*s%s\n", indent[state], "", _(titles[type]));
+    }
+    buf[0] = '\0';
+    switch (type) {
+    case number:
+	snprintf(buf, sizeof(buf), _(ent->out), val);
+	break;
+    case i_forward:
+	type = normal;
+	snprintf(buf, sizeof(buf), _(ent->out), val == 2 ? _("enabled") : _("disabled"));
+	break;
+    case i_outp_icmp:
+    case i_inp_icmp:
+	if (val > 0)
+	    snprintf(buf, sizeof(buf), _(ent->out), val);
+	break;
+    case i_rto_alg:		/* XXXX */
+	break;
+    default:
+	abort();
+    }
+    if (buf[0])
+	printf("%*s%s\n", indent[type], "", buf);
+
+    state = type;
 }
 
-struct tabtab *newtable(struct tabtab *tabs, char *title) 
+struct tabtab *newtable(struct tabtab *tabs, char *title)
 {
-	struct tabtab *t; 
-
-	for (t = tabs; t->title; t++) 
-		if (!strcmp(title, t->title)) {
-			printf("%s:\n", _(title)); 
-			state = normal; 
-			return t; 
-		}
-	return NULL; 
+    struct tabtab *t;
+
+    for (t = tabs; t->title; t++)
+	if (!strcmp(title, t->title)) {
+	    printf("%s:\n", _(title));
+	    state = normal;
+	    return t;
+	}
+    return NULL;
 }
 
 void parsesnmp()
 {
-	FILE *f; 
-	char buf1[512], buf2[512]; 
-	char *sp, *np, *p; 
-
-	f = fopen("/proc/net/snmp", "r"); 
-	if (!f) {
-		perror(_("cannot open /proc/net/snmp"));
-		return;
+    FILE *f;
+    char buf1[512], buf2[512];
+    char *sp, *np, *p;
+
+    f = fopen("/proc/net/snmp", "r");
+    if (!f) {
+	perror(_("cannot open /proc/net/snmp"));
+	return;
+    }
+    while (fgets(buf1, sizeof buf1, f)) {
+	int endflag;
+	struct tabtab *tab;
+
+	if (!fgets(buf2, sizeof buf2, f))
+	    break;
+	sp = strchr(buf1, ':');
+	np = strchr(buf2, ':');
+	if (!np || !sp)
+	    goto formaterr;
+	*sp = '\0';
+	tab = newtable(snmptabs, buf1);
+	if (tab == NULL) {
+	    UFWARN((printf(_("unknown title %s\n"), buf1)));
+	    continue;
 	}
-	while (fgets(buf1,sizeof buf1,f)) {
-		int endflag; 
-		struct tabtab *tab; 
-
-		if (!fgets(buf2,sizeof buf2,f)) break; 
-		sp = strchr(buf1, ':');
-		np = strchr(buf2, ':'); 
-		if (!np || !sp) 
-			goto formaterr; 
-		*sp = '\0'; 
-		tab = newtable(snmptabs, buf1); 
-		if (tab == NULL)  {
-			UFWARN((printf(_("unknown title %s\n"), buf1)));
-			continue; 
-		}
-		np++; sp++; 
-		
-		endflag = 0; 
-		while (!endflag) {
-			while(isspace(*sp)) sp++; 
-			while(isspace(*np)) np++; 
-			/*if (*np == '\0') goto formaterr;*/ 
-
-			p = skiptok(sp); 
-			if (*p == '\0') endflag=1; 
-			*p = '\0'; 
-
-			if (*sp != '\0') /* XXX */ 
-				printval(tab, sp, strtoul(np,&np,10)); 
-			sp = p+1; 
-		}
+	np++;
+	sp++;
+
+	endflag = 0;
+	while (!endflag) {
+	    while (isspace(*sp))
+		sp++;
+	    while (isspace(*np))
+		np++;
+	    /*if (*np == '\0') goto formaterr; */
+
+	    p = skiptok(sp);
+	    if (*p == '\0')
+		endflag = 1;
+	    *p = '\0';
+
+	    if (*sp != '\0')	/* XXX */
+		printval(tab, sp, strtoul(np, &np, 10));
+	    sp = p + 1;
 	}
-	if (ferror(f)) 
-		perror("/proc/net/snmp"); 
-	fclose(f); 
-	return; 
-
-formaterr: 
-	perror(_("error parsing /proc/net/snmp")); 
-	return; 
+    }
+    if (ferror(f))
+	perror("/proc/net/snmp");
+    fclose(f);
+    return;
+
+  formaterr:
+    perror(_("error parsing /proc/net/snmp"));
+    return;
 }
 
 void inittab()
 {
-	struct tabtab *t;
- 
-	/* we sort at runtime because I'm lazy ;) */ 
-	for (t = snmptabs; t->title; t++)  
-		qsort(t->tab, t->size/sizeof(struct entry), 
-			  sizeof(struct entry), cmpentries); 
+    struct tabtab *t;
+
+    /* we sort at runtime because I'm lazy ;) */
+    for (t = snmptabs; t->title; t++)
+	qsort(t->tab, t->size / sizeof(struct entry),
+	      sizeof(struct entry), cmpentries);
 }