Do the dump file Capsicum stuff in a common routine.

[tcpdump] / print-ipfc.c

diff --git a/print-ipfc.c b/print-ipfc.c
index d03b590ef07dc6bb4a2e8ac2bd1b57898b379dd6..295ac0fdab3d4e568171bc533babf9e792a743f6 100644 (file)
--- a/print-ipfc.c
+++ b/print-ipfc.c
@@ -19,6 +19,7 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
+#define NETDISSECT_REWORKED
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -67,8 +68,8 @@ ipfc_hdr_print(netdissect_options *ndo,
 {
        const char *srcname, *dstname;
 
-       srcname = etheraddr_string(ipfcsrc);
-       dstname = etheraddr_string(ipfcdst);
+       srcname = etheraddr_string(ndo, ipfcsrc);
+       dstname = etheraddr_string(ndo, ipfcdst);
 
        /*
         * XXX - show the upper 16 bits?  Do so only if "vflag" is set?
@@ -101,7 +102,7 @@ ipfc_print(netdissect_options *ndo, const u_char *p, u_int length, u_int caplen)
        caplen -= IPFC_HDRLEN;
 
        /* Try to print the LLC-layer header & higher layers */
-       if (llc_print(p, length, caplen, ESRC(&ehdr), EDST(&ehdr),
+       if (llc_print(ndo, p, length, caplen, ESRC(&ehdr), EDST(&ehdr),
            &extracted_ethertype) == 0) {
                /*
                 * Some kinds of LLC packet we cannot
@@ -115,7 +116,7 @@ ipfc_print(netdissect_options *ndo, const u_char *p, u_int length, u_int caplen)
                etherproto_string(htons(extracted_ethertype))));
                }
                if (!ndo->ndo_suppress_default_print)
-                       ndo->ndo_default_print(ndo, p, caplen);
+                       ND_DEFAULTPRINT(p, caplen);
        }
 }