Merge branch 'master' of github.com:the-tcpdump-group/tcpdump

[tcpdump] / print-null.c

diff --git a/print-null.c b/print-null.c
index a8be6c8ba7c05fcdc4ef45410e4eb17e8ccae657..b6fdf9f80a0dc3c4b9d2312e06d7d3aeaadd9cd3 100644 (file)
--- a/print-null.c
+++ b/print-null.c
@@ -19,7 +19,6 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#define NETDISSECT_REWORKED
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -83,7 +82,7 @@ null_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char
                return (NULL_HDRLEN);
        }
 
-       memcpy((char *)&family, (char *)p, sizeof(family));
+       memcpy((char *)&family, (const char *)p, sizeof(family));
 
        /*
         * This isn't necessarily in our host byte order; if this is
@@ -109,20 +108,18 @@ null_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char
                ip_print(ndo, p, length);
                break;
 
-#ifdef INET6
        case BSD_AFNUM_INET6_BSD:
        case BSD_AFNUM_INET6_FREEBSD:
        case BSD_AFNUM_INET6_DARWIN:
                ip6_print(ndo, p, length);
                break;
-#endif
 
        case BSD_AFNUM_ISO:
                isoclns_print(ndo, p, length, caplen);
                break;
 
        case BSD_AFNUM_APPLETALK:
-               atalk_print(p, length);
+               atalk_print(ndo, p, length);
                break;
 
        case BSD_AFNUM_IPX: