Do the dump file Capsicum stuff in a common routine.

[tcpdump] / print-cip.c

diff --git a/print-cip.c b/print-cip.c
index 8ac2f04ef40784cba8a222b2bcad16c45b3949d0..91abe08d306ae6db93bdabca79688782926da6eb 100644 (file)
--- a/print-cip.c
+++ b/print-cip.c
@@ -20,6 +20,7 @@
  *
  */
 
+#define NETDISSECT_REWORKED
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -75,7 +76,7 @@ cip_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char
                /*
                 * LLC header is present.  Try to print it & higher layers.
                 */
-               if (llc_print(p, length, caplen, NULL, NULL,
+               if (llc_print(ndo, p, length, caplen, NULL, NULL,
                    &extracted_ethertype) == 0) {
                        /* ether_type not known, print raw packet */
                        if (!ndo->ndo_eflag)
@@ -85,7 +86,7 @@ cip_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char
                               etherproto_string(htons(extracted_ethertype))));
                        }
                        if (!ndo->ndo_suppress_default_print)
-                               ndo->ndo_default_print(ndo, p, caplen);
+                               ND_DEFAULTPRINT(p, caplen);
                }
        } else {
                /*