Makefile.in: don't remove configure and config.h.in in make distclean.

[tcpdump] / ipproto.c

diff --git a/ipproto.c b/ipproto.c
index 53630ff95ed6748471f20f371124a5e19fed1f02..a3b0714a5a3431c5858e4b45e19db2b089a8e156 100644 (file)
--- a/ipproto.c
+++ b/ipproto.c
@@ -14,10 +14,10 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
-#include <netdissect-stdinc.h>
+#include "netdissect-stdinc.h"
 
 #include "netdissect.h"
 #include "ipproto.h"
@@ -50,6 +50,7 @@ const struct tok ipproto_values[] = {
     { IPPROTO_PGM, "PGM" },
     { IPPROTO_SCTP, "SCTP" },
     { IPPROTO_MOBILITY, "Mobility" },
+    { IPPROTO_ETHERNET, "Ethernet" },
     { 0, NULL }
 };
 
@@ -343,6 +344,7 @@ static const char *netdb_protocol_names[256] = {
        NULL,                /* 249 (unassigned) */
        NULL,                /* 250 (unassigned) */
        NULL,                /* 251 (unassigned) */
+       NULL,                /* 252 (unassigned) */
        "exptest-253",       /* 253 (Use for experimentation and testing,
                              *     RFC 3692)
                              */
@@ -354,7 +356,7 @@ static const char *netdb_protocol_names[256] = {
 
 /* The function enforces the array index to be 8-bit. */
 const char *
-netdb_protoname (const nd_uint8_t protoid)
+netdb_protoname (const uint8_t protoid)
 {
        return netdb_protocol_names[protoid];
 }