Add comments about the IGRP/EIGRP protocol number and #define mess.

The current IANA protocol number assignments page lists 9 as "any
private interior gateway (used by Cisco for their IGRP)" and 88 as
"EIGRP" from Cisco.

Recent FreeBSD and DragonFly BSD <netinet/in.h> headers define
IP_PROTO_IGRP as 9 and IP_PROTO_IGRP as 88.  We define IP_PROTO_PIGP
("private interior gateway protocol") as 9 and IP_PROTO_EIGRP as 88;
those names* better match what the current protocol number assignments
say.

diff --git a/ipproto.h b/ipproto.h
index f6939db7fe90c21542ce9c2bc6d5185176ecd7fb..a5cc0fbf4da1758a9243d10b5151851821b2bcf6 100644 (file)
--- a/ipproto.h
+++ b/ipproto.h
@@ -59,6 +59,17 @@ extern const char *netdb_protoname (const uint8_t);
 #ifndef IPPROTO_EGP
 #define        IPPROTO_EGP             8               /* exterior gateway protocol */
 #endif
+/*
+ * XXX - the current IANA protocol number assignments page lists 9 as
+ * "any private interior gateway (used by Cisco for their IGRP)" and
+ * 88 as "EIGRP" from Cisco.
+ *
+ * Recent FreeBSD and DragonFly BSD <netinet/in.h> headers define
+ * IP_PROTO_IGRP as 9 and IP_PROTO_IGRP as 88.  We define IP_PROTO_PIGP
+ * ("private interior gateway protocol") as 9 and IP_PROTO_EIGRP as 88;
+ * those names* better match what the current protocol number
+ * assignments say.
+ */
 #ifndef IPPROTO_PIGP
 #define IPPROTO_PIGP           9
 #endif

diff --git a/print-ip-demux.c b/print-ip-demux.c
index 50693569819ebb2fa7e810b6ae379b47df3b5870..639310e914b1f0a8662a2c384aa27e23982d7f30 100644 (file)
--- a/print-ip-demux.c
+++ b/print-ip-demux.c
@@ -127,11 +127,11 @@ again:
                 * (used by Cisco for their IGRP)" and 88 as
                 * "EIGRP" from Cisco.
                 *
-                * Recent BSD <netinet/in.h> headers define
-                * IP_PROTO_PIGP as 9 and IP_PROTO_IGRP as 88.
-                * We define IP_PROTO_PIGP as 9 and
-                * IP_PROTO_EIGRP as 88; those names better
-                * match was the current protocol number
+                * Recent FreeBSD and DragonFly BSD <netinet/in.h> headers
+                * define IP_PROTO_IGRP as 9 and IP_PROTO_IGRP as 88.
+                * We define IP_PROTO_PIGP ("private interior gateway
+                * protocol") as 9 and IP_PROTO_EIGRP as 88; those names
+                * better match what the current protocol number
                 * assignments say.
                 */
                igrp_print(ndo, bp, length);