Add program_name field in the netdissect_options structure

[tcpdump] / print-enc.c

diff --git a/print-enc.c b/print-enc.c
index 89daae1bb4a3610d3930d015d8f0b95e4829e567..7466b3584291413f2d06d8c9b896323eaba1e3c0 100644 (file)
--- a/print-enc.c
+++ b/print-enc.c
@@ -21,14 +21,13 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#define NETDISSECT_REWORKED
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #include <tcpdump-stdinc.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "extract.h"
 
 /* From $OpenBSD: if_enc.h,v 1.8 2001/06/25 05:14:00 angelos Exp $ */
@@ -98,7 +97,7 @@ enc_if_print(netdissect_options *ndo,
                goto out;
        }
 
-       hdr = (struct enchdr *)p;
+       hdr = (const struct enchdr *)p;
        flags = hdr->flags;
        if (flags == 0)
                ND_PRINT((ndo, "(unprotected): "));
@@ -117,11 +116,11 @@ enc_if_print(netdissect_options *ndo,
        case AF_INET:
                ip_print(ndo, p, length);
                break;
-#ifdef INET6
+#ifdef AF_INET6
        case AF_INET6:
                ip6_print(ndo, p, length);
                break;
-#endif /*INET6*/
+#endif
        }
 
 out: