Use more the EXTRACT_8BITS() macro to fetch a one-byte value (17/n)

[tcpdump] / print-atalk.c

diff --git a/print-atalk.c b/print-atalk.c
index 2a67499079d081a3bd247e7dbcc49503ea17e47a..cf93b7e859427700b9cde90c828b24a7e85eeaec 100644 (file)
--- a/print-atalk.c
+++ b/print-atalk.c
@@ -77,7 +77,14 @@ u_int
 ltalk_if_print(netdissect_options *ndo,
                const struct pcap_pkthdr *h, const u_char *p)
 {
 ltalk_if_print(netdissect_options *ndo,
                const struct pcap_pkthdr *h, const u_char *p)
 {

-       return (llap_print(ndo, p, h->caplen));
+       u_int hdrlen;
+
+       hdrlen = llap_print(ndo, p, h->len);
+       if (hdrlen == 0) {
+               /* Cut short by the snapshot length. */
+               return (h->caplen);
+       }
+       return (hdrlen);

 }
 
 /*
 }
 
 /*


@@ -97,6 +104,10 @@ llap_print(netdissect_options *ndo,
                ND_PRINT((ndo, " [|llap %u]", length));
                return (length);
        }
                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);
        lp = (const struct LAP *)bp;
        bp += sizeof(*lp);
        length -= sizeof(*lp);


@@ -108,6 +119,10 @@ llap_print(netdissect_options *ndo,
                        ND_PRINT((ndo, " [|sddp %u]", length));
                        return (length);
                }
                        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)));
                sdp = (const struct atShortDDP *)bp;
                ND_PRINT((ndo, "%s.%s",
                    ataddr_string(ndo, 0, lp->src), ddpskt_string(ndo, sdp->srcSkt)));


@@ -124,12 +139,16 @@ llap_print(netdissect_options *ndo,
                        ND_PRINT((ndo, " [|ddp %u]", length));
                        return (length);
                }
                        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;
                dp = (const struct atDDP *)bp;

-               snet = EXTRACT_16BITS(&dp->srcNet);
+               snet = EXTRACT_BE_16BITS(&dp->srcNet);

                ND_PRINT((ndo, "%s.%s", ataddr_string(ndo, snet, dp->srcNode),
                    ddpskt_string(ndo, dp->srcSkt)));
                ND_PRINT((ndo, " > %s.%s:",
                ND_PRINT((ndo, "%s.%s", ataddr_string(ndo, snet, dp->srcNode),
                    ddpskt_string(ndo, dp->srcSkt)));
                ND_PRINT((ndo, " > %s.%s:",

-                   ataddr_string(ndo, EXTRACT_16BITS(&dp->dstNet), dp->dstNode),
+                   ataddr_string(ndo, EXTRACT_BE_16BITS(&dp->dstNet), dp->dstNode),

                    ddpskt_string(ndo, dp->dstSkt)));
                bp += ddpSize;
                length -= ddpSize;
                    ddpskt_string(ndo, dp->dstSkt)));
                bp += ddpSize;
                length -= ddpSize;


@@ -170,12 +189,16 @@ atalk_print(netdissect_options *ndo,
                ND_PRINT((ndo, " [|ddp %u]", length));
                return;
        }
                ND_PRINT((ndo, " [|ddp %u]", length));
                return;
        }

+       if (!ND_TTEST2(*bp, ddpSize)) {
+               ND_PRINT((ndo, " [|ddp]"));
+               return;
+       }

        dp = (const struct atDDP *)bp;
        dp = (const struct atDDP *)bp;

-       snet = EXTRACT_16BITS(&dp->srcNet);
+       snet = EXTRACT_BE_16BITS(&dp->srcNet);

        ND_PRINT((ndo, "%s.%s", ataddr_string(ndo, snet, dp->srcNode),
               ddpskt_string(ndo, dp->srcSkt)));
        ND_PRINT((ndo, " > %s.%s: ",
        ND_PRINT((ndo, "%s.%s", ataddr_string(ndo, snet, dp->srcNode),
               ddpskt_string(ndo, dp->srcSkt)));
        ND_PRINT((ndo, " > %s.%s: ",

-              ataddr_string(ndo, EXTRACT_16BITS(&dp->dstNet), dp->dstNode),
+              ataddr_string(ndo, EXTRACT_BE_16BITS(&dp->dstNet), dp->dstNode),

               ddpskt_string(ndo, dp->dstSkt)));
        bp += ddpSize;
        length -= ddpSize;
               ddpskt_string(ndo, dp->dstSkt)));
        bp += ddpSize;
        length -= ddpSize;


@@ -193,10 +216,19 @@ aarp_print(netdissect_options *ndo,
 
        ND_PRINT((ndo, "aarp "));
        ap = (const struct aarp *)bp;
 
        ND_PRINT((ndo, "aarp "));
        ap = (const struct aarp *)bp;

-       if (EXTRACT_16BITS(&ap->htype) == 1 &&
-           EXTRACT_16BITS(&ap->ptype) == ETHERTYPE_ATALK &&
+       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_BE_16BITS(&ap->htype) == 1 &&
+           EXTRACT_BE_16BITS(&ap->ptype) == ETHERTYPE_ATALK &&

            ap->halen == 6 && ap->palen == 4 )
            ap->halen == 6 && ap->palen == 4 )

-               switch (EXTRACT_16BITS(&ap->op)) {
+               switch (EXTRACT_BE_16BITS(&ap->op)) {

 
                case 1:                         /* request */
                        ND_PRINT((ndo, "who-has %s tell %s", AT(pdaddr), AT(psaddr)));
 
                case 1:                         /* request */
                        ND_PRINT((ndo, "who-has %s tell %s", AT(pdaddr), AT(psaddr)));


@@ -211,8 +243,8 @@ aarp_print(netdissect_options *ndo,
                        return;
                }
        ND_PRINT((ndo, "len %u op %u htype %u ptype %#x halen %u palen %u",
                        return;
                }
        ND_PRINT((ndo, "len %u op %u htype %u ptype %#x halen %u palen %u",

-           length, EXTRACT_16BITS(&ap->op), EXTRACT_16BITS(&ap->htype),
-           EXTRACT_16BITS(&ap->ptype), ap->halen, ap->palen));
+           length, EXTRACT_BE_16BITS(&ap->op), EXTRACT_BE_16BITS(&ap->htype),
+           EXTRACT_BE_16BITS(&ap->ptype), ap->halen, ap->palen));

 }
 
 /*
 }
 
 /*


@@ -248,7 +280,6 @@ static void
 atp_print(netdissect_options *ndo,
           register const struct atATP *ap, u_int length)
 {
 atp_print(netdissect_options *ndo,
           register const struct atATP *ap, u_int length)
 {

-       char c;

        uint32_t data;
 
        if ((const u_char *)(ap + 1) > ndo->ndo_snapend) {
        uint32_t data;
 
        if ((const u_char *)(ap + 1) > ndo->ndo_snapend) {


@@ -266,7 +297,7 @@ atp_print(netdissect_options *ndo,
        case atpReqCode:
                ND_PRINT((ndo, " atp-req%s %d",
                             ap->control & atpXO? " " : "*",
        case atpReqCode:
                ND_PRINT((ndo, " atp-req%s %d",
                             ap->control & atpXO? " " : "*",

-                            EXTRACT_16BITS(&ap->transID)));
+                            EXTRACT_BE_16BITS(&ap->transID)));

 
                atp_bitmap_print(ndo, ap->bitmap);
 
 
                atp_bitmap_print(ndo, ap->bitmap);
 


@@ -289,7 +320,7 @@ atp_print(netdissect_options *ndo,
        case atpRspCode:
                ND_PRINT((ndo, " atp-resp%s%d:%d (%u)",
                             ap->control & atpEOM? "*" : " ",
        case atpRspCode:
                ND_PRINT((ndo, " atp-resp%s%d:%d (%u)",
                             ap->control & atpEOM? "*" : " ",

-                            EXTRACT_16BITS(&ap->transID), ap->bitmap, length));
+                            EXTRACT_BE_16BITS(&ap->transID), ap->bitmap, length));

                switch (ap->control & (atpXO|atpSTS)) {
                case atpXO:
                        ND_PRINT((ndo, " [XO]"));
                switch (ap->control & (atpXO|atpSTS)) {
                case atpXO:
                        ND_PRINT((ndo, " [XO]"));


@@ -304,7 +335,7 @@ atp_print(netdissect_options *ndo,
                break;
 
        case atpRelCode:
                break;
 
        case atpRelCode:

-               ND_PRINT((ndo, " atp-rel  %d", EXTRACT_16BITS(&ap->transID)));
+               ND_PRINT((ndo, " atp-rel  %d", EXTRACT_BE_16BITS(&ap->transID)));

 
                atp_bitmap_print(ndo, ap->bitmap);
 
 
                atp_bitmap_print(ndo, ap->bitmap);
 


@@ -314,7 +345,7 @@ atp_print(netdissect_options *ndo,
 
                /* there shouldn't be any control flags */
                if (ap->control & (atpXO|atpEOM|atpSTS)) {
 
                /* there shouldn't be any control flags */
                if (ap->control & (atpXO|atpEOM|atpSTS)) {

-                       c = '[';
+                       char c = '[';

                        if (ap->control & atpXO) {
                                ND_PRINT((ndo, "%cXO", c));
                                c = ',';
                        if (ap->control & atpXO) {
                                ND_PRINT((ndo, "%cXO", c));
                                c = ',';


@@ -325,7 +356,6 @@ atp_print(netdissect_options *ndo,
                        }
                        if (ap->control & atpSTS) {
                                ND_PRINT((ndo, "%cSTS", c));
                        }
                        if (ap->control & atpSTS) {
                                ND_PRINT((ndo, "%cSTS", c));

-                               c = ',';

                        }
                        ND_PRINT((ndo, "]"));
                }
                        }
                        ND_PRINT((ndo, "]"));
                }


@@ -333,10 +363,10 @@ atp_print(netdissect_options *ndo,
 
        default:
                ND_PRINT((ndo, " atp-0x%x  %d (%u)", ap->control,
 
        default:
                ND_PRINT((ndo, " atp-0x%x  %d (%u)", ap->control,

-                            EXTRACT_16BITS(&ap->transID), length));
+                            EXTRACT_BE_16BITS(&ap->transID), length));

                break;
        }
                break;
        }

-       data = EXTRACT_32BITS(&ap->userData);
+       data = EXTRACT_BE_32BITS(&ap->userData);

        if (data != 0)
                ND_PRINT((ndo, " 0x%x", data));
 }
        if (data != 0)
                ND_PRINT((ndo, " 0x%x", data));
 }


@@ -345,7 +375,6 @@ static void
 atp_bitmap_print(netdissect_options *ndo,
                  register u_char bm)
 {
 atp_bitmap_print(netdissect_options *ndo,
                  register u_char bm)
 {

-       register char c;

        register int i;
 
        /*
        register int i;
 
        /*


@@ -354,7 +383,7 @@ atp_bitmap_print(netdissect_options *ndo,
         * (gcc is smart enough to eliminate it, at least on the Sparc).
         */
        if ((bm + 1) & (bm & 0xff)) {
         * (gcc is smart enough to eliminate it, at least on the Sparc).
         */
        if ((bm + 1) & (bm & 0xff)) {

-               c = '<';
+               register char c = '<';

                for (i = 0; bm; ++i) {
                        if (bm & 1) {
                                ND_PRINT((ndo, "%c%d", c, i));
                for (i = 0; bm; ++i) {
                        if (bm & 1) {
                                ND_PRINT((ndo, "%c%d", c, i));


@@ -419,11 +448,11 @@ nbp_print(netdissect_options *ndo,
                        ND_PRINT((ndo, " [ntup=%d]", np->control & 0xf));
                if (tp->enumerator)
                        ND_PRINT((ndo, " [enum=%d]", tp->enumerator));
                        ND_PRINT((ndo, " [ntup=%d]", np->control & 0xf));
                if (tp->enumerator)
                        ND_PRINT((ndo, " [enum=%d]", tp->enumerator));

-               if (EXTRACT_16BITS(&tp->net) != snet ||
+               if (EXTRACT_BE_16BITS(&tp->net) != snet ||

                    tp->node != snode || tp->skt != skt)
                        ND_PRINT((ndo, " [addr=%s.%d]",
                    tp->node != snode || tp->skt != skt)
                        ND_PRINT((ndo, " [addr=%s.%d]",

-                           ataddr_string(ndo, EXTRACT_16BITS(&tp->net),
-                           tp->node), tp->skt));
+                           ataddr_string(ndo, EXTRACT_BE_16BITS(&tp->net),
+                                         tp->node), tp->skt));

                break;
 
        case nbpLkUpReply:
                break;
 
        case nbpLkUpReply:


@@ -490,9 +519,9 @@ nbp_tuple_print(netdissect_options *ndo,
                ND_PRINT((ndo, " %d", tp->skt));
 
        /* if the address doesn't match the src address, it's an anomaly */
                ND_PRINT((ndo, " %d", tp->skt));
 
        /* if the address doesn't match the src address, it's an anomaly */

-       if (EXTRACT_16BITS(&tp->net) != snet || tp->node != snode)
+       if (EXTRACT_BE_16BITS(&tp->net) != snet || tp->node != snode)

                ND_PRINT((ndo, " [addr=%s]",
                ND_PRINT((ndo, " [addr=%s]",

-                   ataddr_string(ndo, EXTRACT_16BITS(&tp->net), tp->node)));
+                   ataddr_string(ndo, EXTRACT_BE_16BITS(&tp->net), tp->node)));

 
        return (tpn);
 }
 
        return (tpn);
 }