Do the dump file Capsicum stuff in a common routine.

[tcpdump] / print-domain.c

diff --git a/print-domain.c b/print-domain.c
index ee556d6c58c7c56b0d1d06f05be79bad5c65d7a4..8805007acf3f43c998967db7b077cba049aab796 100644 (file)
--- a/print-domain.c
+++ b/print-domain.c
@@ -205,7 +205,7 @@ ns_nprint(netdissect_options *ndo,
                                        return(NULL);
                                }
                        } else {
-                               if (fn_printn(cp, l, ndo->ndo_snapend))
+                               if (fn_printn(ndo, cp, l, ndo->ndo_snapend))
                                        return(NULL);
                        }
 
@@ -236,7 +236,7 @@ ns_cprint(netdissect_options *ndo,
        if (!ND_TTEST2(*cp, 1))
                return (NULL);
        i = *cp++;
-       if (fn_printn(cp, i, ndo->ndo_snapend))
+       if (fn_printn(ndo, cp, i, ndo->ndo_snapend))
                return (NULL);
        return (cp + i);
 }
@@ -395,7 +395,7 @@ ns_rprint(netdissect_options *ndo,
        } else if (ndo->ndo_vflag > 2) {
                /* print ttl */
                ND_PRINT((ndo, " ["));
-               relts_print(EXTRACT_32BITS(cp));
+               relts_print(ndo, EXTRACT_32BITS(cp));
                ND_PRINT((ndo, "]"));
                cp += 4;
        } else {
@@ -535,7 +535,7 @@ ns_rprint(netdissect_options *ndo,
        case T_UNSPECA:         /* One long string */
                if (!ND_TTEST2(*cp, len))
                        return(NULL);
-               if (fn_printn(cp, len, ndo->ndo_snapend))
+               if (fn_printn(ndo, cp, len, ndo->ndo_snapend))
                        return(NULL);
                break;
 
@@ -581,7 +581,7 @@ ns_print(netdissect_options *ndo,
        register const HEADER *np;
        register int qdcount, ancount, nscount, arcount;
        register const u_char *cp;
-       u_int16_t b2;
+       uint16_t b2;
 
        np = (const HEADER *)bp;
        ND_TCHECK(*np);