[src/trunk]: src/sys/netinet put the histograms last and make them autosize (...

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/5c72f844b881
branches:  trunk
changeset: 772213:5c72f844b881
user:      christos <christos%NetBSD.org@localhost>
date:      Sat Dec 24 19:54:41 2011 +0000

description:
put the histograms last and make them autosize (breaks compat with netstat).

diffstat:

 sys/netinet/icmp_var.h |  33 +++++++++++++--------------------
 1 files changed, 13 insertions(+), 20 deletions(-)

diffs (47 lines):

diff -r e978fe870982 -r 5c72f844b881 sys/netinet/icmp_var.h
--- a/sys/netinet/icmp_var.h    Sat Dec 24 19:54:13 2011 +0000
+++ b/sys/netinet/icmp_var.h    Sat Dec 24 19:54:41 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: icmp_var.h,v 1.28 2009/12/07 18:47:24 christos Exp $   */
+/*     $NetBSD: icmp_var.h,v 1.29 2011/12/24 19:54:41 christos Exp $   */
 
 /*
  * Copyright (c) 1982, 1986, 1993
@@ -46,25 +46,18 @@
 #define        ICMP_STAT_ERROR         0       /* # of calls to icmp_error */
 #define        ICMP_STAT_OLDSHORT      1       /* no error (old ip too short) */
 #define        ICMP_STAT_OLDICMP       2       /* no error (old was icmp) */
-#define        ICMP_STAT_OUTHIST       3       /* # of output messages */
-               /* space for ICMP_MAXTYPE + 1 (19) counters */
-#define        ICMP_STAT_BADCODE       22      /* icmp_code out of range */
-#define        ICMP_STAT_TOOSHORT      23      /* packet < ICMP_MINLEN */
-#define        ICMP_STAT_CHECKSUM      24      /* bad checksum */
-#define        ICMP_STAT_BADLEN        25      /* calculated bound mismatch */
-#define        ICMP_STAT_REFLECT       26      /* number of responses */
-#define        ICMP_STAT_INHIST        27      /* # of input messages */
-               /* space for ICMP_MAXTYPE + 1 (19) counters */
-#define        ICMP_STAT_PMTUCHG       46      /* path MTU changes */
-
-#define        ICMP_STAT_BMCASTECHO    47      /* b/mcast echo requests dropped */
-#define        ICMP_STAT_BMCASTTSTAMP  48      /* b/mcast tstamp requests dropped */
-
-#define        ICMP_NSTATS             49
-
-#if ICMP_MAXTYPE != 18
-#error ICMP_MAXTYPE too large for ICMP statistics
-#endif
+#define        ICMP_STAT_BADCODE       3       /* icmp_code out of range */
+#define        ICMP_STAT_TOOSHORT      4       /* packet < ICMP_MINLEN */
+#define        ICMP_STAT_CHECKSUM      5       /* bad checksum */
+#define        ICMP_STAT_BADLEN        6       /* calculated bound mismatch */
+#define        ICMP_STAT_REFLECT       7       /* number of responses */
+#define        ICMP_STAT_PMTUCHG       8       /* path MTU changes */
+#define        ICMP_STAT_BMCASTECHO    9       /* b/mcast echo requests dropped */
+#define        ICMP_STAT_BMCASTTSTAMP  10      /* b/mcast tstamp requests dropped */
+#define        ICMP_STAT_LAST          16      /* Allow for 5 spare ones */
+#define        ICMP_STAT_OUTHIST       ICMP_STAT_LAST
+#define        ICMP_STAT_INHIST        (ICMP_STAT_LAST + ICMP_MAXTYPE)
+#define        ICMP_NSTATS             (ICMP_STAT_LAST + 2 * ICMP_MAXTYPE)
 
 /*
  * Names for ICMP sysctl objects