Force -t on in TESTonce.

[tcpdump] / print-atalk.c

diff --git a/print-atalk.c b/print-atalk.c
index 59de3a670a3de30ce1ee6b6159f4f8d3ad4941d8..9d7d69d3d790189f01ca5d430980b98d021d2ac4 100644 (file)
--- a/print-atalk.c
+++ b/print-atalk.c
@@ -79,7 +79,7 @@ ltalk_if_print(netdissect_options *ndo,
 {
        u_int hdrlen;
 
-       hdrlen = llap_print(ndo, p, h->caplen);
+       hdrlen = llap_print(ndo, p, h->len);
        if (hdrlen == 0) {
                /* Cut short by the snapshot length. */
                return (h->caplen);
@@ -100,14 +100,14 @@ llap_print(netdissect_options *ndo,
        u_short snet;
        u_int hdrlen;
 
-       if (!ND_TTEST2(*bp, sizeof(*lp))) {
-               ND_PRINT((ndo, " [|llap]"));
-               return (0);     /* cut short by the snapshot length */
-       }
        if (length < sizeof(*lp)) {
                ND_PRINT((ndo, " [|llap %u]", length));
                return (length);
        }
+       if (!ND_TTEST2(*bp, sizeof(*lp))) {
+               ND_PRINT((ndo, " [|llap]"));
+               return (0);     /* cut short by the snapshot length */
+       }
        lp = (const struct LAP *)bp;
        bp += sizeof(*lp);
        length -= sizeof(*lp);
@@ -115,14 +115,14 @@ llap_print(netdissect_options *ndo,
        switch (lp->type) {
 
        case lapShortDDP:
-               if (!ND_TTEST2(*bp, ddpSSize)) {
-                       ND_PRINT((ndo, " [|sddp]"));
-                       return (0);     /* cut short by the snapshot length */
-               }
                if (length < ddpSSize) {
                        ND_PRINT((ndo, " [|sddp %u]", length));
                        return (length);
                }
+               if (!ND_TTEST2(*bp, ddpSSize)) {
+                       ND_PRINT((ndo, " [|sddp]"));
+                       return (0);     /* cut short by the snapshot length */
+               }
                sdp = (const struct atShortDDP *)bp;
                ND_PRINT((ndo, "%s.%s",
                    ataddr_string(ndo, 0, lp->src), ddpskt_string(ndo, sdp->srcSkt)));
@@ -135,14 +135,14 @@ llap_print(netdissect_options *ndo,
                break;
 
        case lapDDP:
-               if (!ND_TTEST2(*bp, ddpSize)) {
-                       ND_PRINT((ndo, " [|ddp]"));
-                       return (0);     /* cut short by the snapshot length */
-               }
                if (length < ddpSize) {
                        ND_PRINT((ndo, " [|ddp %u]", length));
                        return (length);
                }
+               if (!ND_TTEST2(*bp, ddpSize)) {
+                       ND_PRINT((ndo, " [|ddp]"));
+                       return (0);     /* cut short by the snapshot length */
+               }
                dp = (const struct atDDP *)bp;
                snet = EXTRACT_16BITS(&dp->srcNet);
                ND_PRINT((ndo, "%s.%s", ataddr_string(ndo, snet, dp->srcNode),
@@ -185,14 +185,14 @@ atalk_print(netdissect_options *ndo,
         if(!ndo->ndo_eflag)
             ND_PRINT((ndo, "AT "));
 
-       if (!ND_TTEST2(*bp, ddpSize)) {
-               ND_PRINT((ndo, " [|ddp]"));
-               return;
-       }
        if (length < ddpSize) {
                ND_PRINT((ndo, " [|ddp %u]", length));
                return;
        }
+       if (!ND_TTEST2(*bp, ddpSize)) {
+               ND_PRINT((ndo, " [|ddp]"));
+               return;
+       }
        dp = (const struct atDDP *)bp;
        snet = EXTRACT_16BITS(&dp->srcNet);
        ND_PRINT((ndo, "%s.%s", ataddr_string(ndo, snet, dp->srcNode),
@@ -216,6 +216,15 @@ aarp_print(netdissect_options *ndo,
 
        ND_PRINT((ndo, "aarp "));
        ap = (const struct aarp *)bp;
+       if (!ND_TTEST(*ap)) {
+               /* Just bail if we don't have the whole chunk. */
+               ND_PRINT((ndo, " [|aarp]"));
+               return;
+       }
+       if (length < sizeof(*ap)) {
+               ND_PRINT((ndo, " [|aarp %u]", length));
+               return;
+       }
        if (EXTRACT_16BITS(&ap->htype) == 1 &&
            EXTRACT_16BITS(&ap->ptype) == ETHERTYPE_ATALK &&
            ap->halen == 6 && ap->palen == 4 )