Use nd_ types, add EXTRACT_ calls, use %u for unsigned values.

[tcpdump] / print-atalk.c

diff --git a/print-atalk.c b/print-atalk.c
index 6940d39353940e89b8c44e2ea07bdf5de1bdbf76..6ba77d3e5c9533b9ad3ab732bb24049ff0fae013 100644 (file)
--- a/print-atalk.c
+++ b/print-atalk.c
@@ -17,23 +17,23 @@
  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.

- *
- * Format and print AppleTalk packets.

  */
 
  */
 

+/* \summary: AppleTalk printer */
+

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 

-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>

 
 #include <stdio.h>
 #include <string.h>
 
 
 #include <stdio.h>
 #include <string.h>
 

-#include "interface.h"
+#include "netdissect.h"

 #include "addrtoname.h"
 #include "ethertype.h"
 #include "addrtoname.h"
 #include "ethertype.h"

-#include "extract.h"                   /* must come after interface.h */
+#include "extract.h"

 #include "appletalk.h"
 
 static const char tstr[] = "[|atalk]";
 #include "appletalk.h"
 
 static const char tstr[] = "[|atalk]";


@@ -49,9 +49,9 @@ static const struct tok type2str[] = {
 };
 
 struct aarp {
 };
 
 struct aarp {

-       uint16_t        htype, ptype;
-       uint8_t         halen, palen;
-       uint16_t        op;
+       nd_uint16_t     htype, ptype;
+       nd_uint8_t      halen, palen;
+       nd_uint16_t     op;

        uint8_t         hsaddr[6];
        uint8_t         psaddr[4];
        uint8_t         hdaddr[6];
        uint8_t         hsaddr[6];
        uint8_t         psaddr[4];
        uint8_t         hdaddr[6];


@@ -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);

 }
 
 /*
 }
 
 /*


@@ -85,11 +92,11 @@ ltalk_if_print(netdissect_options *ndo,
  */
 u_int
 llap_print(netdissect_options *ndo,
  */
 u_int
 llap_print(netdissect_options *ndo,

-           register const u_char *bp, u_int length)
+           const u_char *bp, u_int length)

 {
 {

-       register const struct LAP *lp;
-       register const struct atDDP *dp;
-       register const struct atShortDDP *sdp;
+       const struct LAP *lp;
+       const struct atDDP *dp;
+       const struct atShortDDP *sdp;

        u_short snet;
        u_int hdrlen;
 
        u_short snet;
        u_int hdrlen;
 


@@ -97,26 +104,34 @@ llap_print(netdissect_options *ndo,
                ND_PRINT((ndo, " [|llap %u]", length));
                return (length);
        }
                ND_PRINT((ndo, " [|llap %u]", length));
                return (length);
        }

+       if (!ND_TTEST_LEN(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);
        hdrlen = sizeof(*lp);
        lp = (const struct LAP *)bp;
        bp += sizeof(*lp);
        length -= sizeof(*lp);
        hdrlen = sizeof(*lp);

-       switch (lp->type) {
+       switch (EXTRACT_U_1(lp->type)) {

 
        case lapShortDDP:
                if (length < ddpSSize) {
                        ND_PRINT((ndo, " [|sddp %u]", length));
                        return (length);
                }
 
        case lapShortDDP:
                if (length < ddpSSize) {
                        ND_PRINT((ndo, " [|sddp %u]", length));
                        return (length);
                }

+               if (!ND_TTEST_LEN(bp, ddpSSize)) {
+                       ND_PRINT((ndo, " [|sddp]"));
+                       return (0);     /* cut short by the snapshot length */
+               }

                sdp = (const struct atShortDDP *)bp;
                ND_PRINT((ndo, "%s.%s",
                sdp = (const struct atShortDDP *)bp;
                ND_PRINT((ndo, "%s.%s",

-                   ataddr_string(ndo, 0, lp->src), ddpskt_string(ndo, sdp->srcSkt)));
+                   ataddr_string(ndo, 0, EXTRACT_U_1(lp->src)), ddpskt_string(ndo, EXTRACT_U_1(sdp->srcSkt))));

                ND_PRINT((ndo, " > %s.%s:",
                ND_PRINT((ndo, " > %s.%s:",

-                   ataddr_string(ndo, 0, lp->dst), ddpskt_string(ndo, sdp->dstSkt)));
+                   ataddr_string(ndo, 0, EXTRACT_U_1(lp->dst)), ddpskt_string(ndo, EXTRACT_U_1(sdp->dstSkt))));

                bp += ddpSSize;
                length -= ddpSSize;
                hdrlen += ddpSSize;
                bp += ddpSSize;
                length -= ddpSSize;
                hdrlen += ddpSSize;

-               ddp_print(ndo, bp, length, sdp->type, 0, lp->src, sdp->srcSkt);
+               ddp_print(ndo, bp, length, EXTRACT_U_1(sdp->type), 0, EXTRACT_U_1(lp->src), EXTRACT_U_1(sdp->srcSkt));

                break;
 
        case lapDDP:
                break;
 
        case lapDDP:


@@ -124,17 +139,21 @@ llap_print(netdissect_options *ndo,
                        ND_PRINT((ndo, " [|ddp %u]", length));
                        return (length);
                }
                        ND_PRINT((ndo, " [|ddp %u]", length));
                        return (length);
                }

+               if (!ND_TTEST_LEN(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);
-               ND_PRINT((ndo, "%s.%s", ataddr_string(ndo, snet, dp->srcNode),
-                   ddpskt_string(ndo, dp->srcSkt)));
+               snet = EXTRACT_BE_U_2(dp->srcNet);
+               ND_PRINT((ndo, "%s.%s", ataddr_string(ndo, snet, EXTRACT_U_1(dp->srcNode)),
+                   ddpskt_string(ndo, EXTRACT_U_1(dp->srcSkt))));

                ND_PRINT((ndo, " > %s.%s:",
                ND_PRINT((ndo, " > %s.%s:",

-                   ataddr_string(ndo, EXTRACT_16BITS(&dp->dstNet), dp->dstNode),
-                   ddpskt_string(ndo, dp->dstSkt)));
+                   ataddr_string(ndo, EXTRACT_BE_U_2(dp->dstNet), EXTRACT_U_1(dp->dstNode)),
+                   ddpskt_string(ndo, EXTRACT_U_1(dp->dstSkt))));

                bp += ddpSize;
                length -= ddpSize;
                hdrlen += ddpSize;
                bp += ddpSize;
                length -= ddpSize;
                hdrlen += ddpSize;

-               ddp_print(ndo, bp, length, dp->type, snet, dp->srcNode, dp->srcSkt);
+               ddp_print(ndo, bp, length, EXTRACT_U_1(dp->type), snet, EXTRACT_U_1(dp->srcNode), EXTRACT_U_1(dp->srcSkt));

                break;
 
 #ifdef notdef
                break;
 
 #ifdef notdef


@@ -144,8 +163,8 @@ llap_print(netdissect_options *ndo,
 #endif
 
        default:
 #endif
 
        default:

-               ND_PRINT((ndo, "%d > %d at-lap#%d %u",
-                   lp->src, lp->dst, lp->type, length));
+               ND_PRINT((ndo, "%u > %u at-lap#%u %u",
+                   EXTRACT_U_1(lp->src), EXTRACT_U_1(lp->dst), EXTRACT_U_1(lp->type), length));

                break;
        }
        return (hdrlen);
                break;
        }
        return (hdrlen);


@@ -158,9 +177,9 @@ llap_print(netdissect_options *ndo,
  */
 void
 atalk_print(netdissect_options *ndo,
  */
 void
 atalk_print(netdissect_options *ndo,

-            register const u_char *bp, u_int length)
+            const u_char *bp, u_int length)

 {
 {

-       register const struct atDDP *dp;
+       const struct atDDP *dp;

        u_short snet;
 
         if(!ndo->ndo_eflag)
        u_short snet;
 
         if(!ndo->ndo_eflag)


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

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

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

-       snet = EXTRACT_16BITS(&dp->srcNet);
-       ND_PRINT((ndo, "%s.%s", ataddr_string(ndo, snet, dp->srcNode),
-              ddpskt_string(ndo, dp->srcSkt)));
+       snet = EXTRACT_BE_U_2(dp->srcNet);
+       ND_PRINT((ndo, "%s.%s", ataddr_string(ndo, snet, EXTRACT_U_1(dp->srcNode)),
+              ddpskt_string(ndo, EXTRACT_U_1(dp->srcSkt))));

        ND_PRINT((ndo, " > %s.%s: ",
        ND_PRINT((ndo, " > %s.%s: ",

-              ataddr_string(ndo, EXTRACT_16BITS(&dp->dstNet), dp->dstNode),
-              ddpskt_string(ndo, dp->dstSkt)));
+              ataddr_string(ndo, EXTRACT_BE_U_2(dp->dstNet), EXTRACT_U_1(dp->dstNode)),
+              ddpskt_string(ndo, EXTRACT_U_1(dp->dstSkt))));

        bp += ddpSize;
        length -= ddpSize;
        bp += ddpSize;
        length -= ddpSize;

-       ddp_print(ndo, bp, length, dp->type, snet, dp->srcNode, dp->srcSkt);
+       ddp_print(ndo, bp, length, EXTRACT_U_1(dp->type), snet, EXTRACT_U_1(dp->srcNode), EXTRACT_U_1(dp->srcSkt));

 }
 
 /* XXX should probably pass in the snap header and do checks like arp_print() */
 void
 aarp_print(netdissect_options *ndo,
 }
 
 /* XXX should probably pass in the snap header and do checks like arp_print() */
 void
 aarp_print(netdissect_options *ndo,

-           register const u_char *bp, u_int length)
+           const u_char *bp, u_int length)

 {
 {

-       register const struct aarp *ap;
+       const struct aarp *ap;

 
 #define AT(member) ataddr_string(ndo, (ap->member[1]<<8)|ap->member[2],ap->member[3])
 
        ND_PRINT((ndo, "aarp "));
        ap = (const struct aarp *)bp;
 
 #define AT(member) ataddr_string(ndo, (ap->member[1]<<8)|ap->member[2],ap->member[3])
 
        ND_PRINT((ndo, "aarp "));
        ap = (const struct aarp *)bp;

-       if (EXTRACT_16BITS(&ap->htype) == 1 &&
-           EXTRACT_16BITS(&ap->ptype) == ETHERTYPE_ATALK &&
-           ap->halen == 6 && ap->palen == 4 )
-               switch (EXTRACT_16BITS(&ap->op)) {
+       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_U_2(ap->htype) == 1 &&
+           EXTRACT_BE_U_2(ap->ptype) == ETHERTYPE_ATALK &&
+           EXTRACT_U_1(ap->halen) == 6 && EXTRACT_U_1(ap->palen) == 4 )
+               switch (EXTRACT_BE_U_2(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_U_2(ap->op), EXTRACT_BE_U_2(ap->htype),
+           EXTRACT_BE_U_2(ap->ptype), EXTRACT_U_1(ap->halen), EXTRACT_U_1(ap->palen)));

 }
 
 /*
 }
 
 /*


@@ -220,8 +252,8 @@ aarp_print(netdissect_options *ndo,
  */
 static void
 ddp_print(netdissect_options *ndo,
  */
 static void
 ddp_print(netdissect_options *ndo,

-          register const u_char *bp, register u_int length, register int t,
-          register u_short snet, register u_char snode, u_char skt)
+          const u_char *bp, u_int length, int t,
+          u_short snet, u_char snode, u_char skt)

 {
 
        switch (t) {
 {
 
        switch (t) {


@@ -246,9 +278,9 @@ ddp_print(netdissect_options *ndo,
 
 static void
 atp_print(netdissect_options *ndo,
 
 static void
 atp_print(netdissect_options *ndo,

-          register const struct atATP *ap, u_int length)
+          const struct atATP *ap, u_int length)

 {
 {

-       char c;
+       uint8_t control;

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


@@ -261,19 +293,20 @@ atp_print(netdissect_options *ndo,
                return;
        }
        length -= sizeof(*ap);
                return;
        }
        length -= sizeof(*ap);

-       switch (ap->control & 0xc0) {
+       control = EXTRACT_U_1(ap->control);
+       switch (control & 0xc0) {

 
        case atpReqCode:
 
        case atpReqCode:

-               ND_PRINT((ndo, " atp-req%s %d",
-                            ap->control & atpXO? " " : "*",
-                            EXTRACT_16BITS(&ap->transID)));
+               ND_PRINT((ndo, " atp-req%s %u",
+                            control & atpXO? " " : "*",
+                            EXTRACT_BE_U_2(ap->transID)));

 
 

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

 
                if (length != 0)
                        ND_PRINT((ndo, " [len=%u]", length));
 
 
                if (length != 0)
                        ND_PRINT((ndo, " [len=%u]", length));
 

-               switch (ap->control & (atpEOM|atpSTS)) {
+               switch (control & (atpEOM|atpSTS)) {

                case atpEOM:
                        ND_PRINT((ndo, " [EOM]"));
                        break;
                case atpEOM:
                        ND_PRINT((ndo, " [EOM]"));
                        break;


@@ -287,10 +320,10 @@ atp_print(netdissect_options *ndo,
                break;
 
        case atpRspCode:
                break;
 
        case atpRspCode:

-               ND_PRINT((ndo, " atp-resp%s%d:%d (%u)",
-                            ap->control & atpEOM? "*" : " ",
-                            EXTRACT_16BITS(&ap->transID), ap->bitmap, length));
-               switch (ap->control & (atpXO|atpSTS)) {
+               ND_PRINT((ndo, " atp-resp%s%d:%u (%u)",
+                            control & atpEOM? "*" : " ",
+                            EXTRACT_BE_U_2(ap->transID), EXTRACT_U_1(ap->bitmap), length));
+               switch (control & (atpXO|atpSTS)) {

                case atpXO:
                        ND_PRINT((ndo, " [XO]"));
                        break;
                case atpXO:
                        ND_PRINT((ndo, " [XO]"));
                        break;


@@ -304,49 +337,47 @@ 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  %u", EXTRACT_BE_U_2(ap->transID)));

 
 

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

 
                /* length should be zero */
                if (length)
                        ND_PRINT((ndo, " [len=%u]", length));
 
                /* there shouldn't be any control flags */
 
                /* length should be zero */
                if (length)
                        ND_PRINT((ndo, " [len=%u]", length));
 
                /* there shouldn't be any control flags */

-               if (ap->control & (atpXO|atpEOM|atpSTS)) {
-                       c = '[';
-                       if (ap->control & atpXO) {
+               if (control & (atpXO|atpEOM|atpSTS)) {
+                       char c = '[';
+                       if (control & atpXO) {

                                ND_PRINT((ndo, "%cXO", c));
                                c = ',';
                        }
                                ND_PRINT((ndo, "%cXO", c));
                                c = ',';
                        }

-                       if (ap->control & atpEOM) {
+                       if (control & atpEOM) {

                                ND_PRINT((ndo, "%cEOM", c));
                                c = ',';
                        }
                                ND_PRINT((ndo, "%cEOM", c));
                                c = ',';
                        }

-                       if (ap->control & atpSTS) {
+                       if (control & atpSTS) {

                                ND_PRINT((ndo, "%cSTS", c));
                                ND_PRINT((ndo, "%cSTS", c));

-                               c = ',';

                        }
                        ND_PRINT((ndo, "]"));
                }
                break;
 
        default:
                        }
                        ND_PRINT((ndo, "]"));
                }
                break;
 
        default:

-               ND_PRINT((ndo, " atp-0x%x  %d (%u)", ap->control,
-                            EXTRACT_16BITS(&ap->transID), length));
+               ND_PRINT((ndo, " atp-0x%x  %d (%u)", control,
+                            EXTRACT_BE_U_2(ap->transID), length));

                break;
        }
                break;
        }

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

        if (data != 0)
                ND_PRINT((ndo, " 0x%x", data));
 }
 
 static void
 atp_bitmap_print(netdissect_options *ndo,
        if (data != 0)
                ND_PRINT((ndo, " 0x%x", data));
 }
 
 static void
 atp_bitmap_print(netdissect_options *ndo,

-                 register u_char bm)
+                 u_char bm)

 {
 {

-       register char c;
-       register int i;
+       int i;

 
        /*
         * The '& 0xff' below is needed for compilers that want to sign
 
        /*
         * The '& 0xff' below is needed for compilers that want to sign


@@ -354,7 +385,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 = '<';
+               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));


@@ -375,11 +406,12 @@ atp_bitmap_print(netdissect_options *ndo,
 
 static void
 nbp_print(netdissect_options *ndo,
 
 static void
 nbp_print(netdissect_options *ndo,

-          register const struct atNBP *np, u_int length, register u_short snet,
-          register u_char snode, register u_char skt)
+          const struct atNBP *np, u_int length, u_short snet,
+          u_char snode, u_char skt)

 {
 {

-       register const struct atNBPtuple *tp =
+       const struct atNBPtuple *tp =

                (const struct atNBPtuple *)((const u_char *)np + nbpHeaderSize);
                (const struct atNBPtuple *)((const u_char *)np + nbpHeaderSize);

+       uint8_t control;

        int i;
        const u_char *ep;
 
        int i;
        const u_char *ep;
 


@@ -400,11 +432,12 @@ nbp_print(netdissect_options *ndo,
                ND_PRINT((ndo, "%s", tstr));
                return;
        }
                ND_PRINT((ndo, "%s", tstr));
                return;
        }

-       switch (i = np->control & 0xf0) {
+       control = EXTRACT_U_1(np->control);
+       switch (i = (control & 0xf0)) {

 
        case nbpBrRq:
        case nbpLkUp:
 
        case nbpBrRq:
        case nbpLkUp:

-               ND_PRINT((ndo, i == nbpLkUp? " nbp-lkup %d:":" nbp-brRq %d:", np->id));
+               ND_PRINT((ndo, i == nbpLkUp? " nbp-lkup %u:":" nbp-brRq %u:", EXTRACT_U_1(np->id)));

                if ((const u_char *)(tp + 1) > ep) {
                        ND_PRINT((ndo, "%s", tstr));
                        return;
                if ((const u_char *)(tp + 1) > ep) {
                        ND_PRINT((ndo, "%s", tstr));
                        return;


@@ -415,27 +448,29 @@ nbp_print(netdissect_options *ndo,
                 * be one tuple, the address must match the source
                 * address and the enumerator should be zero.
                 */
                 * be one tuple, the address must match the source
                 * address and the enumerator should be zero.
                 */

-               if ((np->control & 0xf) != 1)
-                       ND_PRINT((ndo, " [ntup=%d]", np->control & 0xf));
-               if (tp->enumerator)
-                       ND_PRINT((ndo, " [enum=%d]", tp->enumerator));
-               if (EXTRACT_16BITS(&tp->net) != snet ||
-                   tp->node != snode || tp->skt != skt)
+               if ((control & 0xf) != 1)
+                       ND_PRINT((ndo, " [ntup=%u]", control & 0xf));
+               if (EXTRACT_U_1(tp->enumerator))
+                       ND_PRINT((ndo, " [enum=%u]", EXTRACT_U_1(tp->enumerator)));
+               if (EXTRACT_BE_U_2(tp->net) != snet ||
+                   EXTRACT_U_1(tp->node) != snode ||
+                   EXTRACT_U_1(tp->skt) != skt)

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

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

                break;
 
        case nbpLkUpReply:
                break;
 
        case nbpLkUpReply:

-               ND_PRINT((ndo, " nbp-reply %d:", np->id));
+               ND_PRINT((ndo, " nbp-reply %u:", EXTRACT_U_1(np->id)));

 
                /* print each of the tuples in the reply */
 
                /* print each of the tuples in the reply */

-               for (i = np->control & 0xf; --i >= 0 && tp; )
+               for (i = control & 0xf; --i >= 0 && tp; )

                        tp = nbp_tuple_print(ndo, tp, ep, snet, snode, skt);
                break;
 
        default:
                        tp = nbp_tuple_print(ndo, tp, ep, snet, snode, skt);
                break;
 
        default:

-               ND_PRINT((ndo, " nbp-0x%x  %d (%u)", np->control, np->id, length));
+               ND_PRINT((ndo, " nbp-0x%x  %u (%u)", control, EXTRACT_U_1(np->id), length));

                break;
        }
 }
                break;
        }
 }


@@ -443,37 +478,40 @@ nbp_print(netdissect_options *ndo,
 /* print a counted string */
 static const char *
 print_cstring(netdissect_options *ndo,
 /* print a counted string */
 static const char *
 print_cstring(netdissect_options *ndo,

-              register const char *cp, register const u_char *ep)
+              const char *cp, const u_char *ep)

 {
 {

-       register u_int length;
+       u_int length;

 
        if (cp >= (const char *)ep) {
                ND_PRINT((ndo, "%s", tstr));
                return (0);
        }
 
        if (cp >= (const char *)ep) {
                ND_PRINT((ndo, "%s", tstr));
                return (0);
        }

-       length = *cp++;
+       length = EXTRACT_U_1(cp);
+       cp++;

 
        /* Spec says string can be at most 32 bytes long */
        if (length > 32) {
                ND_PRINT((ndo, "[len=%u]", length));
                return (0);
        }
 
        /* Spec says string can be at most 32 bytes long */
        if (length > 32) {
                ND_PRINT((ndo, "[len=%u]", length));
                return (0);
        }

-       while ((int)--length >= 0) {
+       while (length != 0) {

                if (cp >= (const char *)ep) {
                        ND_PRINT((ndo, "%s", tstr));
                        return (0);
                }
                if (cp >= (const char *)ep) {
                        ND_PRINT((ndo, "%s", tstr));
                        return (0);
                }

-               ND_PRINT((ndo, "%c", *cp++));
+               ND_PRINT((ndo, "%c", EXTRACT_U_1(cp)));
+               cp++;
+               length--;

        }
        return (cp);
 }
 
 static const struct atNBPtuple *
 nbp_tuple_print(netdissect_options *ndo,
        }
        return (cp);
 }
 
 static const struct atNBPtuple *
 nbp_tuple_print(netdissect_options *ndo,

-                register const struct atNBPtuple *tp, register const u_char *ep,
-                register u_short snet, register u_char snode, register u_char skt)
+                const struct atNBPtuple *tp, const u_char *ep,
+                u_short snet, u_char snode, u_char skt)

 {
 {

-       register const struct atNBPtuple *tpn;
+       const struct atNBPtuple *tpn;

 
        if ((const u_char *)(tp + 1) > ep) {
                ND_PRINT((ndo, "%s", tstr));
 
        if ((const u_char *)(tp + 1) > ep) {
                ND_PRINT((ndo, "%s", tstr));


@@ -482,26 +520,27 @@ nbp_tuple_print(netdissect_options *ndo,
        tpn = nbp_name_print(ndo, tp, ep);
 
        /* if the enumerator isn't 1, print it */
        tpn = nbp_name_print(ndo, tp, ep);
 
        /* if the enumerator isn't 1, print it */

-       if (tp->enumerator != 1)
-               ND_PRINT((ndo, "(%d)", tp->enumerator));
+       if (EXTRACT_U_1(tp->enumerator) != 1)
+               ND_PRINT((ndo, "(%u)", EXTRACT_U_1(tp->enumerator)));

 
        /* if the socket doesn't match the src socket, print it */
 
        /* if the socket doesn't match the src socket, print it */

-       if (tp->skt != skt)
-               ND_PRINT((ndo, " %d", tp->skt));
+       if (EXTRACT_U_1(tp->skt) != skt)
+               ND_PRINT((ndo, " %u", EXTRACT_U_1(tp->skt)));

 
        /* if the address doesn't match the src address, it's an anomaly */
 
        /* 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_U_2(tp->net) != snet ||
+           EXTRACT_U_1(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_U_2(tp->net), EXTRACT_U_1(tp->node))));

 
        return (tpn);
 }
 
 static const struct atNBPtuple *
 nbp_name_print(netdissect_options *ndo,
 
        return (tpn);
 }
 
 static const struct atNBPtuple *
 nbp_name_print(netdissect_options *ndo,

-               const struct atNBPtuple *tp, register const u_char *ep)
+               const struct atNBPtuple *tp, const u_char *ep)

 {
 {

-       register const char *cp = (const char *)tp + nbpTupleSize;
+       const char *cp = (const char *)tp + nbpTupleSize;

 
        ND_PRINT((ndo, " "));
 
 
        ND_PRINT((ndo, " "));
 


@@ -535,8 +574,8 @@ static const char *
 ataddr_string(netdissect_options *ndo,
               u_short atnet, u_char athost)
 {
 ataddr_string(netdissect_options *ndo,
               u_short atnet, u_char athost)
 {

-       register struct hnamemem *tp, *tp2;
-       register int i = (atnet << 8) | athost;
+       struct hnamemem *tp, *tp2;
+       int i = (atnet << 8) | athost;

        char nambuf[256+1];
        static int first = 1;
        FILE *fp;
        char nambuf[256+1];
        static int first = 1;
        FILE *fp;


@@ -566,7 +605,7 @@ ataddr_string(netdissect_options *ndo,
                             tp->nxt; tp = tp->nxt)
                                ;
                        tp->addr = i2;
                             tp->nxt; tp = tp->nxt)
                                ;
                        tp->addr = i2;

-                       tp->nxt = newhnamemem();
+                       tp->nxt = newhnamemem(ndo);

                        tp->name = strdup(nambuf);
                        if (tp->name == NULL)
                                (*ndo->ndo_error)(ndo,
                        tp->name = strdup(nambuf);
                        if (tp->name == NULL)
                                (*ndo->ndo_error)(ndo,


@@ -584,7 +623,7 @@ ataddr_string(netdissect_options *ndo,
        for (tp2 = &hnametable[i & (HASHNAMESIZE-1)]; tp2->nxt; tp2 = tp2->nxt)
                if (tp2->addr == i) {
                        tp->addr = (atnet << 8) | athost;
        for (tp2 = &hnametable[i & (HASHNAMESIZE-1)]; tp2->nxt; tp2 = tp2->nxt)
                if (tp2->addr == i) {
                        tp->addr = (atnet << 8) | athost;

-                       tp->nxt = newhnamemem();
+                       tp->nxt = newhnamemem(ndo);

                        (void)snprintf(nambuf, sizeof(nambuf), "%s.%d",
                            tp2->name, athost);
                        tp->name = strdup(nambuf);
                        (void)snprintf(nambuf, sizeof(nambuf), "%s.%d",
                            tp2->name, athost);
                        tp->name = strdup(nambuf);


@@ -595,7 +634,7 @@ ataddr_string(netdissect_options *ndo,
                }
 
        tp->addr = (atnet << 8) | athost;
                }
 
        tp->addr = (atnet << 8) | athost;

-       tp->nxt = newhnamemem();
+       tp->nxt = newhnamemem(ndo);

        if (athost != 255)
                (void)snprintf(nambuf, sizeof(nambuf), "%d.%d", atnet, athost);
        else
        if (athost != 255)
                (void)snprintf(nambuf, sizeof(nambuf), "%d.%d", atnet, athost);
        else


@@ -617,7 +656,7 @@ static const struct tok skt2str[] = {
 
 static const char *
 ddpskt_string(netdissect_options *ndo,
 
 static const char *
 ddpskt_string(netdissect_options *ndo,

-              register int skt)
+              int skt)

 {
        static char buf[8];
 
 {
        static char buf[8];