Clean up ISAKMP dissection, use nd_ types and EXTRACT_ macros.

[tcpdump] / print-pim.c

diff --git a/print-pim.c b/print-pim.c
index 1674537e8fb2f07f2696d38be119133caf00a540..fa6a345a8d7b3325a8bd8612fcc4a3ebd102148c 100644 (file)
--- a/print-pim.c
+++ b/print-pim.c
@@ -137,17 +137,17 @@ struct pim {
        u_short pim_cksum;      /* IP style check sum */
 };
 
        u_short pim_cksum;      /* IP style check sum */
 };
 

-static void pimv2_print(netdissect_options *, register const u_char *bp, register u_int len, const u_char *);
+static void pimv2_print(netdissect_options *, const u_char *bp, u_int len, const u_char *);

 
 static void
 pimv1_join_prune_print(netdissect_options *ndo,
 
 static void
 pimv1_join_prune_print(netdissect_options *ndo,

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

 {
        int ngroups, njoin, nprune;
        int njp;
 
        /* If it's a single group and a single source, use 1-line output. */
 {
        int ngroups, njoin, nprune;
        int njp;
 
        /* If it's a single group and a single source, use 1-line output. */

-       if (ND_TTEST2(bp[0], 30) && bp[11] == 1 &&
+       if (ND_TTEST_LEN(bp, 30) && EXTRACT_U_1(bp + 11) == 1 &&

            ((njoin = EXTRACT_BE_U_2(bp + 20)) + EXTRACT_BE_U_2(bp + 22)) == 1) {
                int hold;
 
            ((njoin = EXTRACT_BE_U_2(bp + 20)) + EXTRACT_BE_U_2(bp + 22)) == 1) {
                int hold;
 


@@ -158,20 +158,20 @@ pimv1_join_prune_print(netdissect_options *ndo,
                        unsigned_relts_print(ndo, hold);
                }
                ND_PRINT((ndo, "%s (%s/%d, %s", njoin ? "Join" : "Prune",
                        unsigned_relts_print(ndo, hold);
                }
                ND_PRINT((ndo, "%s (%s/%d, %s", njoin ? "Join" : "Prune",

-               ipaddr_string(ndo, &bp[26]), bp[25] & 0x3f,
-               ipaddr_string(ndo, &bp[12])));
+               ipaddr_string(ndo, bp + 26), EXTRACT_U_1(bp + 25) & 0x3f,
+               ipaddr_string(ndo, bp + 12)));

                if (EXTRACT_BE_U_4(bp + 16) != 0xffffffff)
                if (EXTRACT_BE_U_4(bp + 16) != 0xffffffff)

-                       ND_PRINT((ndo, "/%s", ipaddr_string(ndo, &bp[16])));
+                       ND_PRINT((ndo, "/%s", ipaddr_string(ndo, bp + 16)));

                ND_PRINT((ndo, ") %s%s %s",
                ND_PRINT((ndo, ") %s%s %s",

-                   (bp[24] & 0x01) ? "Sparse" : "Dense",
-                   (bp[25] & 0x80) ? " WC" : "",
-                   (bp[25] & 0x40) ? "RP" : "SPT"));
+                   (EXTRACT_U_1(bp + 24) & 0x01) ? "Sparse" : "Dense",
+                   (EXTRACT_U_1(bp + 25) & 0x80) ? " WC" : "",
+                   (EXTRACT_U_1(bp + 25) & 0x40) ? "RP" : "SPT"));

                return;
        }
 
        if (len < sizeof(struct in_addr))
                goto trunc;
                return;
        }
 
        if (len < sizeof(struct in_addr))
                goto trunc;

-       ND_TCHECK2(bp[0], sizeof(struct in_addr));
+       ND_TCHECK_LEN(bp, sizeof(struct in_addr));

        if (ndo->ndo_vflag > 1)
                ND_PRINT((ndo, "\n"));
        ND_PRINT((ndo, " Upstream Nbr: %s", ipaddr_string(ndo, bp)));
        if (ndo->ndo_vflag > 1)
                ND_PRINT((ndo, "\n"));
        ND_PRINT((ndo, " Upstream Nbr: %s", ipaddr_string(ndo, bp)));


@@ -179,7 +179,7 @@ pimv1_join_prune_print(netdissect_options *ndo,
        len -= 4;
        if (len < 4)
                goto trunc;
        len -= 4;
        if (len < 4)
                goto trunc;

-       ND_TCHECK2(bp[2], 2);
+       ND_TCHECK_2(bp + 2);

        if (ndo->ndo_vflag > 1)
                ND_PRINT((ndo, "\n"));
        ND_PRINT((ndo, " Hold time: "));
        if (ndo->ndo_vflag > 1)
                ND_PRINT((ndo, "\n"));
        ND_PRINT((ndo, " Hold time: "));


@@ -191,8 +191,8 @@ pimv1_join_prune_print(netdissect_options *ndo,
 
        if (len < 4)
                goto trunc;
 
        if (len < 4)
                goto trunc;

-       ND_TCHECK2(bp[0], 4);
-       ngroups = bp[3];
+       ND_TCHECK_4(bp);
+       ngroups = EXTRACT_U_1(bp + 3);

        bp += 4;
        len -= 4;
        while (ngroups--) {
        bp += 4;
        len -= 4;
        while (ngroups--) {


@@ -202,20 +202,20 @@ pimv1_join_prune_print(netdissect_options *ndo,
                 */
                if (len < 4)
                        goto trunc;
                 */
                if (len < 4)
                        goto trunc;

-               ND_TCHECK2(bp[0], sizeof(struct in_addr));
+               ND_TCHECK_LEN(bp, sizeof(struct in_addr));

                ND_PRINT((ndo, "\n\tGroup: %s", ipaddr_string(ndo, bp)));
                bp += 4;
                len -= 4;
                if (len < 4)
                        goto trunc;
                ND_PRINT((ndo, "\n\tGroup: %s", ipaddr_string(ndo, bp)));
                bp += 4;
                len -= 4;
                if (len < 4)
                        goto trunc;

-               ND_TCHECK2(bp[0], sizeof(struct in_addr));
+               ND_TCHECK_LEN(bp, sizeof(struct in_addr));

                if (EXTRACT_BE_U_4(bp) != 0xffffffff)
                if (EXTRACT_BE_U_4(bp) != 0xffffffff)

-                       ND_PRINT((ndo, "/%s", ipaddr_string(ndo, &bp[0])));
+                       ND_PRINT((ndo, "/%s", ipaddr_string(ndo, bp)));

                bp += 4;
                len -= 4;
                if (len < 4)
                        goto trunc;
                bp += 4;
                len -= 4;
                if (len < 4)
                        goto trunc;

-               ND_TCHECK2(bp[0], 4);
+               ND_TCHECK_4(bp);

                njoin = EXTRACT_BE_U_2(bp);
                nprune = EXTRACT_BE_U_2(bp + 2);
                ND_PRINT((ndo, " joined: %d pruned: %d", njoin, nprune));
                njoin = EXTRACT_BE_U_2(bp);
                nprune = EXTRACT_BE_U_2(bp + 2);
                ND_PRINT((ndo, " joined: %d pruned: %d", njoin, nprune));


@@ -230,13 +230,13 @@ pimv1_join_prune_print(netdissect_options *ndo,
                                type = "Prune";
                        if (len < 6)
                                goto trunc;
                                type = "Prune";
                        if (len < 6)
                                goto trunc;

-                       ND_TCHECK2(bp[0], 6);
+                       ND_TCHECK_6(bp);

                        ND_PRINT((ndo, "\n\t%s %s%s%s%s/%d", type,
                        ND_PRINT((ndo, "\n\t%s %s%s%s%s/%d", type,

-                           (bp[0] & 0x01) ? "Sparse " : "Dense ",
-                           (bp[1] & 0x80) ? "WC " : "",
-                           (bp[1] & 0x40) ? "RP " : "SPT ",
-                           ipaddr_string(ndo, &bp[2]),
-                           bp[1] & 0x3f));
+                           (EXTRACT_U_1(bp) & 0x01) ? "Sparse " : "Dense ",
+                           (EXTRACT_U_1(bp + 1) & 0x80) ? "WC " : "",
+                           (EXTRACT_U_1(bp + 1) & 0x40) ? "RP " : "SPT ",
+                           ipaddr_string(ndo, bp + 2),
+                           EXTRACT_U_1(bp + 1) & 0x3f));

                        bp += 6;
                        len -= 6;
                }
                        bp += 6;
                        len -= 6;
                }


@@ -249,18 +249,18 @@ trunc:
 
 void
 pimv1_print(netdissect_options *ndo,
 
 void
 pimv1_print(netdissect_options *ndo,

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

 {
 {

-       register u_char type;
+       u_char type;

 
 

-       ND_TCHECK(bp[1]);
-       type = bp[1];
+       ND_TCHECK_1(bp + 1);
+       type = EXTRACT_U_1(bp + 1);

 
        ND_PRINT((ndo, " %s", tok2str(pimv1_type_str, "[type %u]", type)));
        switch (type) {
        case PIMV1_TYPE_QUERY:
 
        ND_PRINT((ndo, " %s", tok2str(pimv1_type_str, "[type %u]", type)));
        switch (type) {
        case PIMV1_TYPE_QUERY:

-               if (ND_TTEST(bp[8])) {
-                       switch (bp[8] >> 4) {
+               if (ND_TTEST_1(bp + 8)) {
+                       switch (EXTRACT_U_1(bp + 8) >> 4) {

                        case 0:
                                ND_PRINT((ndo, " Dense-mode"));
                                break;
                        case 0:
                                ND_PRINT((ndo, " Dense-mode"));
                                break;


@@ -271,12 +271,12 @@ pimv1_print(netdissect_options *ndo,
                                ND_PRINT((ndo, " Sparse-Dense-mode"));
                                break;
                        default:
                                ND_PRINT((ndo, " Sparse-Dense-mode"));
                                break;
                        default:

-                               ND_PRINT((ndo, " mode-%d", bp[8] >> 4));
+                               ND_PRINT((ndo, " mode-%d", EXTRACT_U_1(bp + 8) >> 4));

                                break;
                        }
                }
                if (ndo->ndo_vflag) {
                                break;
                        }
                }
                if (ndo->ndo_vflag) {

-                       ND_TCHECK2(bp[10],2);
+                       ND_TCHECK_2(bp + 10);

                        ND_PRINT((ndo, " (Hold-time "));
                        unsigned_relts_print(ndo, EXTRACT_BE_U_2(bp + 10));
                        ND_PRINT((ndo, ")"));
                        ND_PRINT((ndo, " (Hold-time "));
                        unsigned_relts_print(ndo, EXTRACT_BE_U_2(bp + 10));
                        ND_PRINT((ndo, ")"));


@@ -284,36 +284,36 @@ pimv1_print(netdissect_options *ndo,
                break;
 
        case PIMV1_TYPE_REGISTER:
                break;
 
        case PIMV1_TYPE_REGISTER:

-               ND_TCHECK2(bp[8], 20);                  /* ip header */
-               ND_PRINT((ndo, " for %s > %s", ipaddr_string(ndo, &bp[20]),
-                   ipaddr_string(ndo, &bp[24])));
+               ND_TCHECK_LEN(bp + 8, 20);                      /* ip header */
+               ND_PRINT((ndo, " for %s > %s", ipaddr_string(ndo, bp + 20),
+                         ipaddr_string(ndo, bp + 24)));

                break;
        case PIMV1_TYPE_REGISTER_STOP:
                break;
        case PIMV1_TYPE_REGISTER_STOP:

-               ND_TCHECK2(bp[12], sizeof(struct in_addr));
-               ND_PRINT((ndo, " for %s > %s", ipaddr_string(ndo, &bp[8]),
-                   ipaddr_string(ndo, &bp[12])));
+               ND_TCHECK_LEN(bp + 12, sizeof(struct in_addr));
+               ND_PRINT((ndo, " for %s > %s", ipaddr_string(ndo, bp + 8),
+                         ipaddr_string(ndo, bp + 12)));

                break;
        case PIMV1_TYPE_RP_REACHABILITY:
                if (ndo->ndo_vflag) {
                break;
        case PIMV1_TYPE_RP_REACHABILITY:
                if (ndo->ndo_vflag) {

-                       ND_TCHECK2(bp[22], 2);
-                       ND_PRINT((ndo, " group %s", ipaddr_string(ndo, &bp[8])));
+                       ND_TCHECK_2(bp + 22);
+                       ND_PRINT((ndo, " group %s", ipaddr_string(ndo, bp + 8)));

                        if (EXTRACT_BE_U_4(bp + 12) != 0xffffffff)
                        if (EXTRACT_BE_U_4(bp + 12) != 0xffffffff)

-                               ND_PRINT((ndo, "/%s", ipaddr_string(ndo, &bp[12])));
-                       ND_PRINT((ndo, " RP %s hold ", ipaddr_string(ndo, &bp[16])));
+                               ND_PRINT((ndo, "/%s", ipaddr_string(ndo, bp + 12)));
+                       ND_PRINT((ndo, " RP %s hold ", ipaddr_string(ndo, bp + 16)));

                        unsigned_relts_print(ndo, EXTRACT_BE_U_2(bp + 22));
                }
                break;
        case PIMV1_TYPE_ASSERT:
                        unsigned_relts_print(ndo, EXTRACT_BE_U_2(bp + 22));
                }
                break;
        case PIMV1_TYPE_ASSERT:

-               ND_TCHECK2(bp[16], sizeof(struct in_addr));
-               ND_PRINT((ndo, " for %s > %s", ipaddr_string(ndo, &bp[16]),
-                   ipaddr_string(ndo, &bp[8])));
+               ND_TCHECK_LEN(bp + 16, sizeof(struct in_addr));
+               ND_PRINT((ndo, " for %s > %s", ipaddr_string(ndo, bp + 16),
+                         ipaddr_string(ndo, bp + 8)));

                if (EXTRACT_BE_U_4(bp + 12) != 0xffffffff)
                if (EXTRACT_BE_U_4(bp + 12) != 0xffffffff)

-                       ND_PRINT((ndo, "/%s", ipaddr_string(ndo, &bp[12])));
-               ND_TCHECK2(bp[24], 4);
+                       ND_PRINT((ndo, "/%s", ipaddr_string(ndo, bp + 12)));
+               ND_TCHECK_4(bp + 24);

                ND_PRINT((ndo, " %s pref %d metric %d",
                ND_PRINT((ndo, " %s pref %d metric %d",

-                   (bp[20] & 0x80) ? "RP-tree" : "SPT",
-               EXTRACT_BE_U_4(bp + 20) & 0x7fffffff,
-               EXTRACT_BE_U_4(bp + 24)));
+                   (EXTRACT_U_1(bp + 20) & 0x80) ? "RP-tree" : "SPT",
+                   EXTRACT_BE_U_4(bp + 20) & 0x7fffffff,
+                   EXTRACT_BE_U_4(bp + 24)));

                break;
        case PIMV1_TYPE_JOIN_PRUNE:
        case PIMV1_TYPE_GRAFT:
                break;
        case PIMV1_TYPE_JOIN_PRUNE:
        case PIMV1_TYPE_GRAFT:


@@ -321,13 +321,13 @@ pimv1_print(netdissect_options *ndo,
                if (ndo->ndo_vflag) {
                        if (len < 8)
                                goto trunc;
                if (ndo->ndo_vflag) {
                        if (len < 8)
                                goto trunc;

-                       pimv1_join_prune_print(ndo, &bp[8], len - 8);
+                       pimv1_join_prune_print(ndo, bp + 8, len - 8);

                }
                break;
        }
                }
                break;
        }

-       ND_TCHECK(bp[4]);
-       if ((bp[4] >> 4) != 1)
-               ND_PRINT((ndo, " [v%d]", bp[4] >> 4));
+       ND_TCHECK_1(bp + 4);
+       if ((EXTRACT_U_1(bp + 4) >> 4) != 1)
+               ND_PRINT((ndo, " [v%d]", EXTRACT_U_1(bp + 4) >> 4));

        return;
 
 trunc:
        return;
 
 trunc:


@@ -343,7 +343,7 @@ trunc:
  */
 void
 cisco_autorp_print(netdissect_options *ndo,
  */
 void
 cisco_autorp_print(netdissect_options *ndo,

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

 {
        int type;
        int numrps;
 {
        int type;
        int numrps;


@@ -351,9 +351,9 @@ cisco_autorp_print(netdissect_options *ndo,
 
        if (len < 8)
                goto trunc;
 
        if (len < 8)
                goto trunc;

-       ND_TCHECK(bp[0]);
+       ND_TCHECK_1(bp);

        ND_PRINT((ndo, " auto-rp "));
        ND_PRINT((ndo, " auto-rp "));

-       type = bp[0];
+       type = EXTRACT_U_1(bp);

        switch (type) {
        case 0x11:
                ND_PRINT((ndo, "candidate-advert"));
        switch (type) {
        case 0x11:
                ND_PRINT((ndo, "candidate-advert"));


@@ -366,10 +366,10 @@ cisco_autorp_print(netdissect_options *ndo,
                break;
        }
 
                break;
        }
 

-       ND_TCHECK(bp[1]);
-       numrps = bp[1];
+       ND_TCHECK_1(bp + 1);
+       numrps = EXTRACT_U_1(bp + 1);

 
 

-       ND_TCHECK2(bp[2], 2);
+       ND_TCHECK_2(bp + 2);

        ND_PRINT((ndo, " Hold "));
        hold = EXTRACT_BE_U_2(bp + 2);
        if (hold)
        ND_PRINT((ndo, " Hold "));
        hold = EXTRACT_BE_U_2(bp + 2);
        if (hold)


@@ -400,14 +400,14 @@ cisco_autorp_print(netdissect_options *ndo,
 
                if (len < 4)
                        goto trunc;
 
                if (len < 4)
                        goto trunc;

-               ND_TCHECK2(bp[0], 4);
+               ND_TCHECK_4(bp);

                ND_PRINT((ndo, " RP %s", ipaddr_string(ndo, bp)));
                bp += 4;
                len -= 4;
                if (len < 1)
                        goto trunc;
                ND_PRINT((ndo, " RP %s", ipaddr_string(ndo, bp)));
                bp += 4;
                len -= 4;
                if (len < 1)
                        goto trunc;

-               ND_TCHECK(bp[0]);
-               switch (bp[0] & 0x3) {
+               ND_TCHECK_1(bp);
+               switch (EXTRACT_U_1(bp) & 0x3) {

                case 0: ND_PRINT((ndo, " PIMv?"));
                        break;
                case 1: ND_PRINT((ndo, " PIMv1"));
                case 0: ND_PRINT((ndo, " PIMv?"));
                        break;
                case 1: ND_PRINT((ndo, " PIMv1"));


@@ -417,28 +417,28 @@ cisco_autorp_print(netdissect_options *ndo,
                case 3: ND_PRINT((ndo, " PIMv1+2"));
                        break;
                }
                case 3: ND_PRINT((ndo, " PIMv1+2"));
                        break;
                }

-               if (bp[0] & 0xfc)
-                       ND_PRINT((ndo, " [rsvd=0x%02x]", bp[0] & 0xfc));
+               if (EXTRACT_U_1(bp) & 0xfc)
+                       ND_PRINT((ndo, " [rsvd=0x%02x]", EXTRACT_U_1(bp) & 0xfc));

                bp += 1;
                len -= 1;
                if (len < 1)
                        goto trunc;
                bp += 1;
                len -= 1;
                if (len < 1)
                        goto trunc;

-               ND_TCHECK(bp[0]);
-               nentries = bp[0];
+               ND_TCHECK_1(bp);
+               nentries = EXTRACT_U_1(bp);

                bp += 1;
                len -= 1;
                s = ' ';
                for (; nentries; nentries--) {
                        if (len < 6)
                                goto trunc;
                bp += 1;
                len -= 1;
                s = ' ';
                for (; nentries; nentries--) {
                        if (len < 6)
                                goto trunc;

-                       ND_TCHECK2(bp[0], 6);
-                       ND_PRINT((ndo, "%c%s%s/%d", s, bp[0] & 1 ? "!" : "",
-                                 ipaddr_string(ndo, &bp[2]), bp[1]));
-                       if (bp[0] & 0x02) {
+                       ND_TCHECK_6(bp);
+                       ND_PRINT((ndo, "%c%s%s/%d", s, EXTRACT_U_1(bp) & 1 ? "!" : "",
+                                 ipaddr_string(ndo, bp + 2), EXTRACT_U_1(bp + 1)));
+                       if (EXTRACT_U_1(bp) & 0x02) {

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

-                       if (bp[0] & 0xfc) {
-                               ND_PRINT((ndo, "[rsvd=0x%02x]", bp[0] & 0xfc));
+                       if (EXTRACT_U_1(bp) & 0xfc) {
+                               ND_PRINT((ndo, "[rsvd=0x%02x]", EXTRACT_U_1(bp) & 0xfc));

                        }
                        s = ',';
                        bp += 6; len -= 6;
                        }
                        s = ',';
                        bp += 6; len -= 6;


@@ -453,9 +453,9 @@ trunc:
 
 void
 pim_print(netdissect_options *ndo,
 
 void
 pim_print(netdissect_options *ndo,

-          register const u_char *bp, register u_int len, const u_char *bp2)
+          const u_char *bp, u_int len, const u_char *bp2)

 {
 {

-       register const struct pim *pim = (const struct pim *)bp;
+       const struct pim *pim = (const struct pim *)bp;

 
 #ifdef notyet                  /* currently we see only version and type */
        ND_TCHECK(pim->pim_rsv);
 
 #ifdef notyet                  /* currently we see only version and type */
        ND_TCHECK(pim->pim_rsv);


@@ -566,8 +566,8 @@ pimv2_addr_print(netdissect_options *ndo,
        if (addr_len == 0) {
                if (len < 2)
                        goto trunc;
        if (addr_len == 0) {
                if (len < 2)
                        goto trunc;

-               ND_TCHECK(bp[1]);
-               switch (bp[0]) {
+               ND_TCHECK_1(bp + 1);
+               switch (EXTRACT_U_1(bp)) {

                case 1:
                        af = AF_INET;
                        addr_len = (u_int)sizeof(struct in_addr);
                case 1:
                        af = AF_INET;
                        addr_len = (u_int)sizeof(struct in_addr);


@@ -579,7 +579,7 @@ pimv2_addr_print(netdissect_options *ndo,
                default:
                        return -1;
                }
                default:
                        return -1;
                }

-               if (bp[1] != 0)
+               if (EXTRACT_U_1(bp + 1) != 0)

                        return -1;
                hdrlen = 2;
        } else {
                        return -1;
                hdrlen = 2;
        } else {


@@ -603,7 +603,7 @@ pimv2_addr_print(netdissect_options *ndo,
        case pimv2_unicast:
                if (len < addr_len)
                        goto trunc;
        case pimv2_unicast:
                if (len < addr_len)
                        goto trunc;

-               ND_TCHECK2(bp[0], addr_len);
+               ND_TCHECK_LEN(bp, addr_len);

                if (af == AF_INET) {
                        if (!silent)
                                ND_PRINT((ndo, "%s", ipaddr_string(ndo, bp)));
                if (af == AF_INET) {
                        if (!silent)
                                ND_PRINT((ndo, "%s", ipaddr_string(ndo, bp)));


@@ -617,31 +617,31 @@ pimv2_addr_print(netdissect_options *ndo,
        case pimv2_source:
                if (len < addr_len + 2)
                        goto trunc;
        case pimv2_source:
                if (len < addr_len + 2)
                        goto trunc;

-               ND_TCHECK2(bp[0], addr_len + 2);
+               ND_TCHECK_LEN(bp, addr_len + 2);

                if (af == AF_INET) {
                        if (!silent) {
                                ND_PRINT((ndo, "%s", ipaddr_string(ndo, bp + 2)));
                if (af == AF_INET) {
                        if (!silent) {
                                ND_PRINT((ndo, "%s", ipaddr_string(ndo, bp + 2)));

-                               if (bp[1] != 32)
-                                       ND_PRINT((ndo, "/%u", bp[1]));
+                               if (EXTRACT_U_1(bp + 1) != 32)
+                                       ND_PRINT((ndo, "/%u", EXTRACT_U_1(bp + 1)));

                        }
                }
                else if (af == AF_INET6) {
                        if (!silent) {
                                ND_PRINT((ndo, "%s", ip6addr_string(ndo, bp + 2)));
                        }
                }
                else if (af == AF_INET6) {
                        if (!silent) {
                                ND_PRINT((ndo, "%s", ip6addr_string(ndo, bp + 2)));

-                               if (bp[1] != 128)
-                                       ND_PRINT((ndo, "/%u", bp[1]));
+                               if (EXTRACT_U_1(bp + 1) != 128)
+                                       ND_PRINT((ndo, "/%u", EXTRACT_U_1(bp + 1)));

                        }
                }
                        }
                }

-               if (bp[0] && !silent) {
+               if (EXTRACT_U_1(bp) && !silent) {

                        if (at == pimv2_group) {
                        if (at == pimv2_group) {

-                               ND_PRINT((ndo, "(0x%02x)", bp[0]));
+                               ND_PRINT((ndo, "(0x%02x)", EXTRACT_U_1(bp)));

                        } else {
                                ND_PRINT((ndo, "(%s%s%s",
                        } else {
                                ND_PRINT((ndo, "(%s%s%s",

-                                       bp[0] & 0x04 ? "S" : "",
-                                       bp[0] & 0x02 ? "W" : "",
-                                       bp[0] & 0x01 ? "R" : ""));
-                               if (bp[0] & 0xf8) {
-                                       ND_PRINT((ndo, "+0x%02x", bp[0] & 0xf8));
+                                       EXTRACT_U_1(bp) & 0x04 ? "S" : "",
+                                       EXTRACT_U_1(bp) & 0x02 ? "W" : "",
+                                       EXTRACT_U_1(bp) & 0x01 ? "R" : ""));
+                               if (EXTRACT_U_1(bp) & 0xf8) {
+                                       ND_PRINT((ndo, "+0x%02x", EXTRACT_U_1(bp) & 0xf8));

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


@@ -667,7 +667,7 @@ pimv2_check_checksum(netdissect_options *ndo, const u_char *bp,
        const struct ip *ip;
        u_int cksum;
 
        const struct ip *ip;
        u_int cksum;
 

-       if (!ND_TTEST2(bp[0], len)) {
+       if (!ND_TTEST_LEN(bp, len)) {

                /* We don't have all the data. */
                return (UNVERIFIED);
        }
                /* We don't have all the data. */
                return (UNVERIFIED);
        }


@@ -692,9 +692,9 @@ pimv2_check_checksum(netdissect_options *ndo, const u_char *bp,
 
 static void
 pimv2_print(netdissect_options *ndo,
 
 static void
 pimv2_print(netdissect_options *ndo,

-            register const u_char *bp, register u_int len, const u_char *bp2)
+            const u_char *bp, u_int len, const u_char *bp2)

 {
 {

-       register const struct pim *pim = (const struct pim *)bp;
+       const struct pim *pim = (const struct pim *)bp;

        int advance;
        enum checksum_status cksum_status;
        int pimv2_addr_len;
        int advance;
        enum checksum_status cksum_status;
        int pimv2_addr_len;


@@ -759,7 +759,7 @@ pimv2_print(netdissect_options *ndo,
                while (len > 0) {
                        if (len < 4)
                                goto trunc;
                while (len > 0) {
                        if (len < 4)
                                goto trunc;

-                       ND_TCHECK2(bp[0], 4);
+                       ND_TCHECK_4(bp);

                        otype = EXTRACT_BE_U_2(bp);
                        olen = EXTRACT_BE_U_2(bp + 2);
                        ND_PRINT((ndo, "\n\t  %s Option (%u), length %u, Value: ",
                        otype = EXTRACT_BE_U_2(bp);
                        olen = EXTRACT_BE_U_2(bp + 2);
                        ND_PRINT((ndo, "\n\t  %s Option (%u), length %u, Value: ",


@@ -771,7 +771,7 @@ pimv2_print(netdissect_options *ndo,
 
                        if (len < olen)
                                goto trunc;
 
                        if (len < olen)
                                goto trunc;

-                       ND_TCHECK2(bp[0], olen);
+                       ND_TCHECK_LEN(bp, olen);

                        switch (otype) {
                        case PIMV2_HELLO_OPTION_HOLDTIME:
                                if (olen != 2) {
                        switch (otype) {
                        case PIMV2_HELLO_OPTION_HOLDTIME:
                                if (olen != 2) {


@@ -824,10 +824,11 @@ pimv2_print(netdissect_options *ndo,
                                if (olen != 4) {
                                        ND_PRINT((ndo, "ERROR: Option Length != 4 Bytes (%u)", olen));
                                } else {
                                if (olen != 4) {
                                        ND_PRINT((ndo, "ERROR: Option Length != 4 Bytes (%u)", olen));
                                } else {

-                                       ND_PRINT((ndo, "v%d", *bp));
-                                       if (*(bp+1) != 0) {
+                                       ND_PRINT((ndo, "v%d", EXTRACT_U_1(bp)));
+                                       if (EXTRACT_U_1(bp + 1) != 0) {

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

-                                               unsigned_relts_print(ndo, *(bp+1));
+                                               unsigned_relts_print(ndo,
+                                                                    EXTRACT_U_1(bp + 1));

                                        }
                                        if (EXTRACT_BE_U_2(bp + 2) != 0) {
                                                ND_PRINT((ndo, " ?0x%04x?", EXTRACT_BE_U_2(bp + 2)));
                                        }
                                        if (EXTRACT_BE_U_2(bp + 2) != 0) {
                                                ND_PRINT((ndo, " ?0x%04x?", EXTRACT_BE_U_2(bp + 2)));


@@ -873,7 +874,7 @@ pimv2_print(netdissect_options *ndo,
 
                if (len < 4)
                        goto trunc;
 
                if (len < 4)
                        goto trunc;

-               ND_TCHECK2(*bp, PIMV2_REGISTER_FLAG_LEN);
+               ND_TCHECK_LEN(bp, PIMV2_REGISTER_FLAG_LEN);

 
                ND_PRINT((ndo, ", Flags [ %s ]\n\t",
                          tok2str(pimv2_register_flag_values,
 
                ND_PRINT((ndo, ", Flags [ %s ]\n\t",
                          tok2str(pimv2_register_flag_values,


@@ -975,8 +976,8 @@ pimv2_print(netdissect_options *ndo,
                }
                if (len < 4)
                        goto trunc;
                }
                if (len < 4)
                        goto trunc;

-               ND_TCHECK2(*bp, 4);
-               ngroup = bp[1];
+               ND_TCHECK_4(bp);
+               ngroup = EXTRACT_U_1(bp + 1);

                holdtime = EXTRACT_BE_U_2(bp + 2);
                ND_PRINT((ndo, "\n\t  %u group(s)", ngroup));
                if (PIM_TYPE(pim->pim_typever) != 7) {  /*not for Graft-ACK*/
                holdtime = EXTRACT_BE_U_2(bp + 2);
                ND_PRINT((ndo, "\n\t  %u group(s)", ngroup));
                if (PIM_TYPE(pim->pim_typever) != 7) {  /*not for Graft-ACK*/


@@ -994,7 +995,7 @@ pimv2_print(netdissect_options *ndo,
                        bp += advance; len -= advance;
                        if (len < 4)
                                goto trunc;
                        bp += advance; len -= advance;
                        if (len < 4)
                                goto trunc;

-                       ND_TCHECK2(*bp, 4);
+                       ND_TCHECK_4(bp);

                        njoin = EXTRACT_BE_U_2(bp);
                        nprune = EXTRACT_BE_U_2(bp + 2);
                        ND_PRINT((ndo, ", joined sources: %u, pruned sources: %u", njoin, nprune));
                        njoin = EXTRACT_BE_U_2(bp);
                        nprune = EXTRACT_BE_U_2(bp + 2);
                        ND_PRINT((ndo, ", joined sources: %u, pruned sources: %u", njoin, nprune));


@@ -1028,12 +1029,12 @@ pimv2_print(netdissect_options *ndo,
                len -= 2;
                if (len < 1)
                        goto trunc;
                len -= 2;
                if (len < 1)
                        goto trunc;

-               ND_TCHECK(bp[0]);
-               ND_PRINT((ndo, " hashmlen=%d", bp[0]));
+               ND_TCHECK_1(bp);
+               ND_PRINT((ndo, " hashmlen=%d", EXTRACT_U_1(bp)));

                if (len < 2)
                        goto trunc;
                if (len < 2)
                        goto trunc;

-               ND_TCHECK(bp[2]);
-               ND_PRINT((ndo, " BSRprio=%d", bp[1]));
+               ND_TCHECK_1(bp + 2);
+               ND_PRINT((ndo, " BSRprio=%d", EXTRACT_U_1(bp + 1)));

                bp += 2;
                len -= 2;
 
                bp += 2;
                len -= 2;
 


@@ -1055,12 +1056,12 @@ pimv2_print(netdissect_options *ndo,
                        /* RP-Count, Frag RP-Cnt, and rsvd */
                        if (len < 1)
                                goto trunc;
                        /* RP-Count, Frag RP-Cnt, and rsvd */
                        if (len < 1)
                                goto trunc;

-                       ND_TCHECK(bp[0]);
-                       ND_PRINT((ndo, " RPcnt=%d", bp[0]));
+                       ND_TCHECK_1(bp);
+                       ND_PRINT((ndo, " RPcnt=%d", EXTRACT_U_1(bp)));

                        if (len < 2)
                                goto trunc;
                        if (len < 2)
                                goto trunc;

-                       ND_TCHECK(bp[1]);
-                       ND_PRINT((ndo, " FRPcnt=%d", frpcnt = bp[1]));
+                       ND_TCHECK_1(bp + 1);
+                       ND_PRINT((ndo, " FRPcnt=%d", frpcnt = EXTRACT_U_1(bp + 1)));

                        if (len < 4)
                                goto trunc;
                        bp += 4;
                        if (len < 4)
                                goto trunc;
                        bp += 4;


@@ -1085,8 +1086,8 @@ pimv2_print(netdissect_options *ndo,
                                                     EXTRACT_BE_U_2(bp));
                                if (len < 3)
                                        goto trunc;
                                                     EXTRACT_BE_U_2(bp));
                                if (len < 3)
                                        goto trunc;

-                               ND_TCHECK(bp[2]);
-                               ND_PRINT((ndo, ",prio=%d", bp[2]));
+                               ND_TCHECK_1(bp + 2);
+                               ND_PRINT((ndo, ",prio=%d", EXTRACT_U_1(bp + 2)));

                                if (len < 4)
                                        goto trunc;
                                bp += 4;
                                if (len < 4)
                                        goto trunc;
                                bp += 4;


@@ -1107,8 +1108,8 @@ pimv2_print(netdissect_options *ndo,
                bp += advance; len -= advance;
                if (len < 8)
                        goto trunc;
                bp += advance; len -= advance;
                if (len < 8)
                        goto trunc;

-               ND_TCHECK2(*bp, 8);
-               if (bp[0] & 0x80)
+               ND_TCHECK_8(bp);
+               if (EXTRACT_U_1(bp) & 0x80)

                        ND_PRINT((ndo, " RPT"));
                ND_PRINT((ndo, " pref=%u", EXTRACT_BE_U_4(bp) & 0x7fffffff));
                ND_PRINT((ndo, " metric=%u", EXTRACT_BE_U_4(bp + 4)));
                        ND_PRINT((ndo, " RPT"));
                ND_PRINT((ndo, " pref=%u", EXTRACT_BE_U_4(bp) & 0x7fffffff));
                ND_PRINT((ndo, " metric=%u", EXTRACT_BE_U_4(bp + 4)));


@@ -1121,13 +1122,13 @@ pimv2_print(netdissect_options *ndo,
                /* Prefix-Cnt, Priority, and Holdtime */
                if (len < 1)
                        goto trunc;
                /* Prefix-Cnt, Priority, and Holdtime */
                if (len < 1)
                        goto trunc;

-               ND_TCHECK(bp[0]);
-               ND_PRINT((ndo, " prefix-cnt=%d", bp[0]));
-               pfxcnt = bp[0];
+               ND_TCHECK_1(bp);
+               ND_PRINT((ndo, " prefix-cnt=%d", EXTRACT_U_1(bp)));
+               pfxcnt = EXTRACT_U_1(bp);

                if (len < 2)
                        goto trunc;
                if (len < 2)
                        goto trunc;

-               ND_TCHECK(bp[1]);
-               ND_PRINT((ndo, " prio=%d", bp[1]));
+               ND_TCHECK_1(bp + 1);
+               ND_PRINT((ndo, " prio=%d", EXTRACT_U_1(bp + 1)));

                if (len < 4)
                        goto trunc;
                ND_TCHECK_2(bp + 2);
                if (len < 4)
                        goto trunc;
                ND_TCHECK_2(bp + 2);