Merge pull request #435 from wolfgangkarall/sigusr1-man

[tcpdump] / print-null.c

diff --git a/print-null.c b/print-null.c
index 16330b9431dd82e0f7b173b4cffbc2da3770b69c..166f777dee2b24b660950fbd201b7ef171308c4f 100644 (file)
--- a/print-null.c
+++ b/print-null.c
@@ -19,6 +19,7 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
+#define NETDISSECT_REWORKED
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -108,20 +109,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(p, length, caplen);
+               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:
@@ -133,7 +132,7 @@ null_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char
                if (!ndo->ndo_eflag)
                        null_hdr_print(ndo, family, length + NULL_HDRLEN);
                if (!ndo->ndo_suppress_default_print)
-                       ndo->ndo_default_print(ndo, p, caplen);
+                       ND_DEFAULTPRINT(p, caplen);
        }
 
        return (NULL_HDRLEN);