]> The Tcpdump Group git mirrors - tcpdump/commitdiff
fixup a few ND_DEFAULTPRINT() use cases
authorDenis Ovsienko <[email protected]>
Wed, 2 Apr 2014 14:36:05 +0000 (18:36 +0400)
committerDenis Ovsienko <[email protected]>
Wed, 2 Apr 2014 14:36:05 +0000 (18:36 +0400)
print-decnet.c
print-llc.c
print-sctp.c

index a555571c502cfcd91c164d650e6becfc26d33d25..e29691fb2054e9ce35c301ac8c03da83b594f277 100644 (file)
@@ -550,7 +550,7 @@ decnet_print(netdissect_options *ndo,
 
        if (mflags & RMF_FVER) {
                ND_PRINT((ndo, "future-version-decnet"));
-               default_print(ap, min(length, caplen));
+               ND_DEFAULTPRINT(ap, min(length, caplen));
                return;
        }
 
@@ -586,7 +586,7 @@ decnet_print(netdissect_options *ndo,
            break;
        default:
            ND_PRINT((ndo, "unknown message flags under mask"));
-           default_print((u_char *)ap, min(length, caplen));
+           ND_DEFAULTPRINT((u_char *)ap, min(length, caplen));
            return;
        }
 
@@ -736,7 +736,7 @@ print_decnet_ctlmsg(netdissect_options *ndo,
 
        default:
            ND_PRINT((ndo, "unknown control message"));
-           default_print((u_char *)rhp, min(length, caplen));
+           ND_DEFAULTPRINT((u_char *)rhp, min(length, caplen));
            ret = 1;
            break;
        }
index c2363d5fd0dd6acc13af3d10e9ac2a5a0f00b6d3..5619730a33779bbc67d48fb965110a2a733b37b2 100644 (file)
@@ -153,7 +153,7 @@ llc_print(netdissect_options *ndo, const u_char *p, u_int length, u_int caplen,
 
        if (caplen < 3) {
                ND_PRINT((ndo, "[|llc]"));
-               default_print((u_char *)p, caplen);
+               ND_DEFAULTPRINT((u_char *)p, caplen);
                return(0);
        }
 
@@ -179,7 +179,7 @@ llc_print(netdissect_options *ndo, const u_char *p, u_int length, u_int caplen,
                 */
                if (caplen < 4) {
                        ND_PRINT((ndo, "[|llc]"));
-                       default_print((u_char *)p, caplen);
+                       ND_DEFAULTPRINT((u_char *)p, caplen);
                        return(0);
                }
 
index b009e051fc5c289e90a7ee38174b2835d7214067..687c36f58e23d4326b43b2852e05b4749487e3de 100644 (file)
@@ -583,7 +583,7 @@ void sctp_print(netdissect_options *ndo,
                                    EXTRACT_16BITS(&chunkDescPtr->chunkLength)));
                                return;
                        }
-                       default_print(payloadPtr,
+                       ND_DEFAULTPRINT(payloadPtr,
                              EXTRACT_16BITS(&chunkDescPtr->chunkLength) -
                              (sizeof(struct sctpDataPart)+
                              sizeof(struct sctpChunkDesc)));