The third argument to linkaddr_string is one of the LINKADDR_ enums.

[tcpdump] / ipproto.h

diff --git a/ipproto.h b/ipproto.h
index 75def3d85f01b6e4a973f8a91d552072f57fbe1a..699ea61a2ebd8d7f70fc311366cd9c5015390f3a 100644 (file)
--- a/ipproto.h
+++ b/ipproto.h
@@ -36,6 +36,7 @@
  */
 
 extern const struct tok ipproto_values[];
+extern const char *netdb_protoname (const uint8_t);
 
 #ifndef IPPROTO_IP
 #define        IPPROTO_IP              0               /* dummy for IP */
@@ -109,7 +110,7 @@ extern const struct tok ipproto_values[];
  * It appears that 62 used to be used, even though that's assigned to
  * a protocol called CFTP; however, the only reference for CFTP is a
  * Network Message from BBN back in 1982, so, for now, we support 62,
- * aas well as 135, as a protocol number for mobility headers.
+ * as well as 135, as a protocol number for mobility headers.
  */
 #define IPPROTO_MOBILITY_OLD   62
 #endif
@@ -129,10 +130,7 @@ extern const struct tok ipproto_values[];
 #define IPPROTO_IPCOMP         108
 #endif
 #ifndef IPPROTO_VRRP
-#define IPPROTO_VRRP           112
-#endif
-#ifndef IPPROTO_CARP
-#define IPPROTO_CARP           112
+#define IPPROTO_VRRP           112 /* See also CARP. */
 #endif
 #ifndef IPPROTO_PGM
 #define IPPROTO_PGM             113