]> The Tcpdump Group git mirrors - tcpdump/blobdiff - print-pim.c
projects / tcpdump / blobdiff
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Use nd_ types, add EXTRACT_ calls.
[tcpdump] / print-pim.c
diff --git a/print-pim.c b/print-pim.c
index 7d6b477aab3ac24304dd4b3d203979ce6f4d01af..4f74a7d5aea3d3eaff146e2d079cda0fbef66719 100644 (file)
--- a/print-pim.c
+++ b/print-pim.c
@@ -124,7 +124,7 @@ static const struct tok pimv2_register_flag_values[] = {
  */
 
 struct pim {
  */
 
 struct pim {
-       uint8_t pim_typever;
+       nd_uint8_t      pim_typever;
                        /* upper 4bit: PIM version number; 2 for PIMv2 */
                        /* lower 4bit: the PIM message type, currently they are:
                         * Hello, Register, Register-Stop, Join/Prune,
                        /* upper 4bit: PIM version number; 2 for PIMv2 */
                        /* lower 4bit: the PIM message type, currently they are:
                         * Hello, Register, Register-Stop, Join/Prune,
@@ -133,45 +133,45 @@ struct pim {
                         */
 #define PIM_VER(x)     (((x) & 0xf0) >> 4)
 #define PIM_TYPE(x)    ((x) & 0x0f)
                         */
 #define PIM_VER(x)     (((x) & 0xf0) >> 4)
 #define PIM_TYPE(x)    ((x) & 0x0f)
-       u_char  pim_rsv;        /* Reserved */
-       u_short pim_cksum;      /* IP style check sum */
+       nd_uint8_t      pim_rsv;        /* Reserved in v1, address length in v2 */
+       nd_uint16_t     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;
+       u_int ngroups, njoin, nprune;
+       u_int njp;
 
        /* If it's a single group and a single source, use 1-line output. */
 
        /* If it's a single group and a single source, use 1-line output. */
-       if (ND_TTEST2(bp[0], 30) && bp[11] == 1 &&
-           ((njoin = EXTRACT_BE_16BITS(bp + 20)) + EXTRACT_BE_16BITS(bp + 22)) == 1) {
-               int hold;
+       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) {
+               u_int hold;
 
                ND_PRINT((ndo, " RPF %s ", ipaddr_string(ndo, bp)));
 
                ND_PRINT((ndo, " RPF %s ", ipaddr_string(ndo, bp)));
-               hold = EXTRACT_BE_16BITS(bp + 6);
+               hold = EXTRACT_BE_U_2(bp + 6);
                if (hold != 180) {
                        ND_PRINT((ndo, "Hold "));
                        unsigned_relts_print(ndo, hold);
                }
                if (hold != 180) {
                        ND_PRINT((ndo, "Hold "));
                        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])));
-               if (EXTRACT_BE_32BITS(bp + 16) != 0xffffffff)
-                       ND_PRINT((ndo, "/%s", ipaddr_string(ndo, &bp[16])));
+               ND_PRINT((ndo, "%s (%s/%u, %s", njoin ? "Join" : "Prune",
+               ipaddr_string(ndo, bp + 26), EXTRACT_U_1(bp + 25) & 0x3f,
+               ipaddr_string(ndo, bp + 12)));
+               if (EXTRACT_BE_U_4(bp + 16) != 0xffffffff)
+                       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,11 +179,11 @@ 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: "));
-       unsigned_relts_print(ndo, EXTRACT_BE_16BITS(bp + 2));
+       unsigned_relts_print(ndo, EXTRACT_BE_U_2(bp + 2));
        if (ndo->ndo_vflag < 2)
                return;
        bp += 4;
        if (ndo->ndo_vflag < 2)
                return;
        bp += 4;
@@ -191,34 +191,34 @@ 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;
        bp += 4;
        len -= 4;
-       while (ngroups--) {
+       while (ngroups != 0) {
                /*
                 * XXX - does the address have length "addrlen" and the
                 * mask length "maddrlen"?
                 */
                if (len < 4)
                        goto trunc;
                /*
                 * XXX - does the address have length "addrlen" and the
                 * mask length "maddrlen"?
                 */
                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));
-               if (EXTRACT_BE_32BITS(bp) != 0xffffffff)
-                       ND_PRINT((ndo, "/%s", ipaddr_string(ndo, &bp[0])));
+               ND_TCHECK_LEN(bp, sizeof(struct in_addr));
+               if (EXTRACT_BE_U_4(bp) != 0xffffffff)
+                       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);
-               njoin = EXTRACT_BE_16BITS(bp);
-               nprune = EXTRACT_BE_16BITS(bp + 2);
-               ND_PRINT((ndo, " joined: %d pruned: %d", njoin, nprune));
+               ND_TCHECK_4(bp);
+               njoin = EXTRACT_BE_U_2(bp);
+               nprune = EXTRACT_BE_U_2(bp + 2);
+               ND_PRINT((ndo, " joined: %u pruned: %u", njoin, nprune));
                bp += 4;
                len -= 4;
                for (njp = 0; njp < (njoin + nprune); njp++) {
                bp += 4;
                len -= 4;
                for (njp = 0; njp < (njoin + nprune); njp++) {
@@ -230,16 +230,17 @@ 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_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));
+                       ND_TCHECK_6(bp);
+                       ND_PRINT((ndo, "\n\t%s %s%s%s%s/%u", type,
+                           (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;
                }
+               ngroups--;
        }
        return;
 trunc:
        }
        return;
 trunc:
@@ -249,18 +250,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,49 +272,49 @@ 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-%u", 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 "));
                        ND_PRINT((ndo, " (Hold-time "));
-                       unsigned_relts_print(ndo, EXTRACT_BE_16BITS(bp + 10));
+                       unsigned_relts_print(ndo, EXTRACT_BE_U_2(bp + 10));
                        ND_PRINT((ndo, ")"));
                }
                break;
 
        case PIMV1_TYPE_REGISTER:
                        ND_PRINT((ndo, ")"));
                }
                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])));
-                       if (EXTRACT_BE_32BITS(bp + 12) != 0xffffffff)
-                               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_16BITS(bp + 22));
+                       ND_TCHECK_2(bp + 22);
+                       ND_PRINT((ndo, " group %s", ipaddr_string(ndo, bp + 8)));
+                       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)));
+                       unsigned_relts_print(ndo, EXTRACT_BE_U_2(bp + 22));
                }
                break;
        case PIMV1_TYPE_ASSERT:
                }
                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])));
-               if (EXTRACT_BE_32BITS(bp + 12) != 0xffffffff)
-                       ND_PRINT((ndo, "/%s", ipaddr_string(ndo, &bp[12])));
-               ND_TCHECK2(bp[24], 4);
-               ND_PRINT((ndo, " %s pref %d metric %d",
-                   (bp[20] & 0x80) ? "RP-tree" : "SPT",
-               EXTRACT_BE_32BITS(bp + 20) & 0x7fffffff,
-               EXTRACT_BE_32BITS(bp + 24)));
+               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)
+                       ND_PRINT((ndo, "/%s", ipaddr_string(ndo, bp + 12)));
+               ND_TCHECK_4(bp + 24);
+               ND_PRINT((ndo, " %s pref %u metric %u",
+                   (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 +322,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%u]", EXTRACT_U_1(bp + 4) >> 4));
        return;
 
 trunc:
        return;
 
 trunc:
@@ -343,17 +344,17 @@ 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 hold;
+       u_int type;
+       u_int numrps;
+       u_int hold;
 
        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,14 +367,14 @@ 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 "));
        ND_PRINT((ndo, " Hold "));
-       hold = EXTRACT_BE_16BITS(bp + 2);
+       hold = EXTRACT_BE_U_2(bp + 2);
        if (hold)
        if (hold)
-               unsigned_relts_print(ndo, EXTRACT_BE_16BITS(bp + 2));
+               unsigned_relts_print(ndo, EXTRACT_BE_U_2(bp + 2));
        else
                ND_PRINT((ndo, "FOREVER"));
 
        else
                ND_PRINT((ndo, "FOREVER"));
 
@@ -394,20 +395,20 @@ cisco_autorp_print(netdissect_options *ndo,
         *             8 bits: mask 32 bits: source
         * lather, rinse, repeat.
         */
         *             8 bits: mask 32 bits: source
         * lather, rinse, repeat.
         */
-       while (numrps--) {
-               int nentries;
+       while (numrps != 0) {
+               u_int nentries;
                char s;
 
                if (len < 4)
                        goto trunc;
                char s;
 
                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,32 +418,34 @@ 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 = ' ';
                bp += 1;
                len -= 1;
                s = ' ';
-               for (; nentries; nentries--) {
+               while (nentries != 0) {
                        if (len < 6)
                                goto trunc;
                        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/%u", 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;
+                       nentries--;
                }
                }
+               numrps--;
        }
        return;
 
        }
        return;
 
@@ -453,34 +456,36 @@ 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;
+       uint8_t pim_typever;
 
 #ifdef notyet                  /* currently we see only version and type */
 
 #ifdef notyet                  /* currently we see only version and type */
-       ND_TCHECK(pim->pim_rsv);
+       ND_TCHECK_1(pim->pim_rsv);
 #endif
 
 #endif
 
-       ND_TCHECK(pim->pim_typever);
-       switch (PIM_VER(pim->pim_typever)) {
+       ND_TCHECK_1(pim->pim_typever);
+       pim_typever = EXTRACT_U_1(pim->pim_typever);
+       switch (PIM_VER(pim_typever)) {
        case 2:
                if (!ndo->ndo_vflag) {
                        ND_PRINT((ndo, "PIMv%u, %s, length %u",
        case 2:
                if (!ndo->ndo_vflag) {
                        ND_PRINT((ndo, "PIMv%u, %s, length %u",
-                                 PIM_VER(pim->pim_typever),
-                                 tok2str(pimv2_type_values,"Unknown Type",PIM_TYPE(pim->pim_typever)),
+                                 PIM_VER(pim_typever),
+                                 tok2str(pimv2_type_values,"Unknown Type",PIM_TYPE(pim_typever)),
                                  len));
                        return;
                } else {
                        ND_PRINT((ndo, "PIMv%u, length %u\n\t%s",
                                  len));
                        return;
                } else {
                        ND_PRINT((ndo, "PIMv%u, length %u\n\t%s",
-                                 PIM_VER(pim->pim_typever),
+                                 PIM_VER(pim_typever),
                                  len,
                                  len,
-                                 tok2str(pimv2_type_values,"Unknown Type",PIM_TYPE(pim->pim_typever))));
+                                 tok2str(pimv2_type_values,"Unknown Type",PIM_TYPE(pim_typever))));
                        pimv2_print(ndo, bp, len, bp2);
                }
                break;
        default:
                ND_PRINT((ndo, "PIMv%u, length %u",
                        pimv2_print(ndo, bp, len, bp2);
                }
                break;
        default:
                ND_PRINT((ndo, "PIMv%u, length %u",
-                         PIM_VER(pim->pim_typever),
+                         PIM_VER(pim_typever),
                          len));
                break;
        }
                          len));
                break;
        }
@@ -560,14 +565,14 @@ pimv2_addr_print(netdissect_options *ndo,
                  const u_char *bp, u_int len, enum pimv2_addrtype at,
                  u_int addr_len, int silent)
 {
                  const u_char *bp, u_int len, enum pimv2_addrtype at,
                  u_int addr_len, int silent)
 {
-       int af;
+       u_int af;
        int hdrlen;
 
        if (addr_len == 0) {
                if (len < 2)
                        goto trunc;
        int hdrlen;
 
        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 +584,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 +608,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 +622,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 +672,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,28 +697,30 @@ 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 advance;
        enum checksum_status cksum_status;
-       int pimv2_addr_len;
+       u_int pim_typever;
+       u_int pimv2_addr_len;
 
        if (len < 2)
                goto trunc;
 
        if (len < 2)
                goto trunc;
-       ND_TCHECK(pim->pim_rsv);
-       pimv2_addr_len = pim->pim_rsv;
+       ND_TCHECK_1(pim->pim_rsv);
+       pim_typever = EXTRACT_U_1(pim->pim_typever);
+       pimv2_addr_len = EXTRACT_U_1(pim->pim_rsv);
        if (pimv2_addr_len != 0)
                ND_PRINT((ndo, ", RFC2117-encoding"));
 
        if (len < 4)
                goto trunc;
        ND_TCHECK(pim->pim_cksum);
        if (pimv2_addr_len != 0)
                ND_PRINT((ndo, ", RFC2117-encoding"));
 
        if (len < 4)
                goto trunc;
        ND_TCHECK(pim->pim_cksum);
-       ND_PRINT((ndo, ", cksum 0x%04x ", EXTRACT_BE_16BITS(&pim->pim_cksum)));
-       if (EXTRACT_BE_16BITS(&pim->pim_cksum) == 0) {
+       ND_PRINT((ndo, ", cksum 0x%04x ", EXTRACT_BE_U_2(pim->pim_cksum)));
+       if (EXTRACT_BE_U_2(pim->pim_cksum) == 0) {
                ND_PRINT((ndo, "(unverified)"));
        } else {
                ND_PRINT((ndo, "(unverified)"));
        } else {
-               if (PIM_TYPE(pim->pim_typever) == PIMV2_TYPE_REGISTER) {
+               if (PIM_TYPE(pim_typever) == PIMV2_TYPE_REGISTER) {
                        /*
                         * The checksum only covers the packet header,
                         * not the encapsulated packet.
                        /*
                         * The checksum only covers the packet header,
                         * not the encapsulated packet.
@@ -752,16 +759,16 @@ pimv2_print(netdissect_options *ndo,
        bp += 4;
        len -= 4;
 
        bp += 4;
        len -= 4;
 
-       switch (PIM_TYPE(pim->pim_typever)) {
+       switch (PIM_TYPE(pim_typever)) {
        case PIMV2_TYPE_HELLO:
            {
                uint16_t otype, olen;
                while (len > 0) {
                        if (len < 4)
                                goto trunc;
        case PIMV2_TYPE_HELLO:
            {
                uint16_t otype, olen;
                while (len > 0) {
                        if (len < 4)
                                goto trunc;
-                       ND_TCHECK2(bp[0], 4);
-                       otype = EXTRACT_BE_16BITS(bp);
-                       olen = EXTRACT_BE_16BITS(bp + 2);
+                       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: ",
                                  tok2str(pimv2_hello_option_values, "Unknown", otype),
                                  otype,
                        ND_PRINT((ndo, "\n\t  %s Option (%u), length %u, Value: ",
                                  tok2str(pimv2_hello_option_values, "Unknown", otype),
                                  otype,
@@ -771,14 +778,14 @@ 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) {
                                        ND_PRINT((ndo, "ERROR: Option Length != 2 Bytes (%u)", olen));
                                } else {
                                        unsigned_relts_print(ndo,
                        switch (otype) {
                        case PIMV2_HELLO_OPTION_HOLDTIME:
                                if (olen != 2) {
                                        ND_PRINT((ndo, "ERROR: Option Length != 2 Bytes (%u)", olen));
                                } else {
                                        unsigned_relts_print(ndo,
-                                                            EXTRACT_BE_16BITS(bp));
+                                                            EXTRACT_BE_U_2(bp));
                                }
                                break;
 
                                }
                                break;
 
@@ -788,11 +795,11 @@ pimv2_print(netdissect_options *ndo,
                                } else {
                                        char t_bit;
                                        uint16_t lan_delay, override_interval;
                                } else {
                                        char t_bit;
                                        uint16_t lan_delay, override_interval;
-                                       lan_delay = EXTRACT_BE_16BITS(bp);
-                                       override_interval = EXTRACT_BE_16BITS(bp + 2);
+                                       lan_delay = EXTRACT_BE_U_2(bp);
+                                       override_interval = EXTRACT_BE_U_2(bp + 2);
                                        t_bit = (lan_delay & 0x8000)? 1 : 0;
                                        lan_delay &= ~0x8000;
                                        t_bit = (lan_delay & 0x8000)? 1 : 0;
                                        lan_delay &= ~0x8000;
-                                       ND_PRINT((ndo, "\n\t    T-bit=%d, LAN delay %dms, Override interval %dms",
+                                       ND_PRINT((ndo, "\n\t    T-bit=%u, LAN delay %ums, Override interval %ums",
                                        t_bit, lan_delay, override_interval));
                                }
                                break;
                                        t_bit, lan_delay, override_interval));
                                }
                                break;
@@ -804,7 +811,7 @@ pimv2_print(netdissect_options *ndo,
                                        ND_PRINT((ndo, "Bi-Directional Capability (Old)"));
                                        break;
                                case 4:
                                        ND_PRINT((ndo, "Bi-Directional Capability (Old)"));
                                        break;
                                case 4:
-                                       ND_PRINT((ndo, "%u", EXTRACT_BE_32BITS(bp)));
+                                       ND_PRINT((ndo, "%u", EXTRACT_BE_U_4(bp)));
                                        break;
                                default:
                                        ND_PRINT((ndo, "ERROR: Option Length != 4 Bytes (%u)", olen));
                                        break;
                                default:
                                        ND_PRINT((ndo, "ERROR: Option Length != 4 Bytes (%u)", olen));
@@ -816,7 +823,7 @@ 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, "0x%08x", EXTRACT_BE_32BITS(bp)));
+                                       ND_PRINT((ndo, "0x%08x", EXTRACT_BE_U_4(bp)));
                                }
                                break;
 
                                }
                                break;
 
@@ -824,13 +831,14 @@ 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%u", 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_16BITS(bp + 2) != 0) {
-                                               ND_PRINT((ndo, " ?0x%04x?", EXTRACT_BE_16BITS(bp + 2)));
+                                       if (EXTRACT_BE_U_2(bp + 2) != 0) {
+                                               ND_PRINT((ndo, " ?0x%04x?", EXTRACT_BE_U_2(bp + 2)));
                                        }
                                }
                                break;
                                        }
                                }
                                break;
@@ -873,12 +881,12 @@ 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,
                          "none",
 
                ND_PRINT((ndo, ", Flags [ %s ]\n\t",
                          tok2str(pimv2_register_flag_values,
                          "none",
-                         EXTRACT_BE_32BITS(bp))));
+                         EXTRACT_BE_U_4(bp))));
 
                bp += 4; len -= 4;
                /* encapsulated multicast packet */
 
                bp += 4; len -= 4;
                /* encapsulated multicast packet */
@@ -903,7 +911,7 @@ pimv2_print(netdissect_options *ndo,
                        break;
 
                default:
                        break;
 
                default:
-                       ND_PRINT((ndo, "IP ver %d", IP_V(ip)));
+                       ND_PRINT((ndo, "IP ver %u", IP_V(ip)));
                        break;
                }
                break;
                        break;
                }
                break;
@@ -965,9 +973,9 @@ pimv2_print(netdissect_options *ndo,
                uint16_t holdtime;
                uint16_t njoin;
                uint16_t nprune;
                uint16_t holdtime;
                uint16_t njoin;
                uint16_t nprune;
-               int i, j;
+               u_int i, j;
 
 
-               if (PIM_TYPE(pim->pim_typever) != 7) {  /*not for Graft-ACK*/
+               if (PIM_TYPE(pim_typever) != 7) {       /*not for Graft-ACK*/
                        ND_PRINT((ndo, ", upstream-neighbor: "));
                        if ((advance = pimv2_addr_print(ndo, bp, len, pimv2_unicast, pimv2_addr_len, 0)) < 0)
                                goto trunc;
                        ND_PRINT((ndo, ", upstream-neighbor: "));
                        if ((advance = pimv2_addr_print(ndo, bp, len, pimv2_unicast, pimv2_addr_len, 0)) < 0)
                                goto trunc;
@@ -975,11 +983,11 @@ pimv2_print(netdissect_options *ndo,
                }
                if (len < 4)
                        goto trunc;
                }
                if (len < 4)
                        goto trunc;
-               ND_TCHECK2(*bp, 4);
-               ngroup = bp[1];
-               holdtime = EXTRACT_BE_16BITS(bp + 2);
+               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));
                ND_PRINT((ndo, "\n\t  %u group(s)", ngroup));
-               if (PIM_TYPE(pim->pim_typever) != 7) {  /*not for Graft-ACK*/
+               if (PIM_TYPE(pim_typever) != 7) {       /*not for Graft-ACK*/
                        ND_PRINT((ndo, ", holdtime: "));
                        if (holdtime == 0xffff)
                                ND_PRINT((ndo, "infinite"));
                        ND_PRINT((ndo, ", holdtime: "));
                        if (holdtime == 0xffff)
                                ND_PRINT((ndo, "infinite"));
@@ -994,9 +1002,9 @@ 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);
-                       njoin = EXTRACT_BE_16BITS(bp);
-                       nprune = EXTRACT_BE_16BITS(bp + 2);
+                       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));
                        bp += 4; len -= 4;
                        for (j = 0; j < njoin; j++) {
                        ND_PRINT((ndo, ", joined sources: %u, pruned sources: %u", njoin, nprune));
                        bp += 4; len -= 4;
                        for (j = 0; j < njoin; j++) {
@@ -1017,23 +1025,23 @@ pimv2_print(netdissect_options *ndo,
 
        case PIMV2_TYPE_BOOTSTRAP:
        {
 
        case PIMV2_TYPE_BOOTSTRAP:
        {
-               int i, j, frpcnt;
+               u_int i, j, frpcnt;
 
                /* Fragment Tag, Hash Mask len, and BSR-priority */
                if (len < 2)
                        goto trunc;
 
                /* Fragment Tag, Hash Mask len, and BSR-priority */
                if (len < 2)
                        goto trunc;
-               ND_TCHECK_16BITS(bp);
-               ND_PRINT((ndo, " tag=%x", EXTRACT_BE_16BITS(bp)));
+               ND_TCHECK_2(bp);
+               ND_PRINT((ndo, " tag=%x", EXTRACT_BE_U_2(bp)));
                bp += 2;
                len -= 2;
                if (len < 1)
                        goto trunc;
                bp += 2;
                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=%u", 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=%u", EXTRACT_U_1(bp + 1)));
                bp += 2;
                len -= 2;
 
                bp += 2;
                len -= 2;
 
@@ -1046,7 +1054,7 @@ pimv2_print(netdissect_options *ndo,
 
                for (i = 0; len > 0; i++) {
                        /* Encoded-Group Address */
 
                for (i = 0; len > 0; i++) {
                        /* Encoded-Group Address */
-                       ND_PRINT((ndo, " (group%d: ", i));
+                       ND_PRINT((ndo, " (group%u: ", i));
                        if ((advance = pimv2_addr_print(ndo, bp, len, pimv2_group, pimv2_addr_len, 0)) < 0)
                                goto trunc;
                        bp += advance;
                        if ((advance = pimv2_addr_print(ndo, bp, len, pimv2_group, pimv2_addr_len, 0)) < 0)
                                goto trunc;
                        bp += advance;
@@ -1055,12 +1063,13 @@ 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=%u", 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);
+                       frpcnt = EXTRACT_U_1(bp + 1);
+                       ND_PRINT((ndo, " FRPcnt=%u", frpcnt));
                        if (len < 4)
                                goto trunc;
                        bp += 4;
                        if (len < 4)
                                goto trunc;
                        bp += 4;
@@ -1068,7 +1077,7 @@ pimv2_print(netdissect_options *ndo,
 
                        for (j = 0; j < frpcnt && len > 0; j++) {
                                /* each RP info */
 
                        for (j = 0; j < frpcnt && len > 0; j++) {
                                /* each RP info */
-                               ND_PRINT((ndo, " RP%d=", j));
+                               ND_PRINT((ndo, " RP%u=", j));
                                if ((advance = pimv2_addr_print(ndo, bp, len,
                                                                pimv2_unicast,
                                                                pimv2_addr_len,
                                if ((advance = pimv2_addr_print(ndo, bp, len,
                                                                pimv2_unicast,
                                                                pimv2_addr_len,
@@ -1079,14 +1088,14 @@ pimv2_print(netdissect_options *ndo,
 
                                if (len < 2)
                                        goto trunc;
 
                                if (len < 2)
                                        goto trunc;
-                               ND_TCHECK_16BITS(bp);
+                               ND_TCHECK_2(bp);
                                ND_PRINT((ndo, ",holdtime="));
                                unsigned_relts_print(ndo,
                                ND_PRINT((ndo, ",holdtime="));
                                unsigned_relts_print(ndo,
-                                                    EXTRACT_BE_16BITS(bp));
+                                                    EXTRACT_BE_U_2(bp));
                                if (len < 3)
                                        goto trunc;
                                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=%u", EXTRACT_U_1(bp + 2)));
                                if (len < 4)
                                        goto trunc;
                                bp += 4;
                                if (len < 4)
                                        goto trunc;
                                bp += 4;
@@ -1107,32 +1116,32 @@ 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, " RPT"));
-               ND_PRINT((ndo, " pref=%u", EXTRACT_BE_32BITS(bp) & 0x7fffffff));
-               ND_PRINT((ndo, " metric=%u", EXTRACT_BE_32BITS(bp + 4)));
+               ND_PRINT((ndo, " pref=%u", EXTRACT_BE_U_4(bp) & 0x7fffffff));
+               ND_PRINT((ndo, " metric=%u", EXTRACT_BE_U_4(bp + 4)));
                break;
 
        case PIMV2_TYPE_CANDIDATE_RP:
        {
                break;
 
        case PIMV2_TYPE_CANDIDATE_RP:
        {
-               int i, pfxcnt;
+               u_int i, pfxcnt;
 
                /* 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=%u", 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=%u", EXTRACT_U_1(bp + 1)));
                if (len < 4)
                        goto trunc;
                if (len < 4)
                        goto trunc;
-               ND_TCHECK_16BITS(&bp[2]);
+               ND_TCHECK_2(bp + 2);
                ND_PRINT((ndo, " holdtime="));
                ND_PRINT((ndo, " holdtime="));
-               unsigned_relts_print(ndo, EXTRACT_BE_16BITS(bp + 2));
+               unsigned_relts_print(ndo, EXTRACT_BE_U_2(bp + 2));
                bp += 4;
                len -= 4;
 
                bp += 4;
                len -= 4;
 
@@ -1145,7 +1154,7 @@ pimv2_print(netdissect_options *ndo,
 
                /* Encoded-Group Addresses */
                for (i = 0; i < pfxcnt && len > 0; i++) {
 
                /* Encoded-Group Addresses */
                for (i = 0; i < pfxcnt && len > 0; i++) {
-                       ND_PRINT((ndo, " Group%d=", i));
+                       ND_PRINT((ndo, " Group%u=", i));
                        if ((advance = pimv2_addr_print(ndo, bp, len, pimv2_group, pimv2_addr_len, 0)) < 0)
                                goto trunc;
                        bp += advance;
                        if ((advance = pimv2_addr_print(ndo, bp, len, pimv2_group, pimv2_addr_len, 0)) < 0)
                                goto trunc;
                        bp += advance;
@@ -1172,14 +1181,14 @@ pimv2_print(netdissect_options *ndo,
                len -= advance;
                if (len < 2)
                        goto trunc;
                len -= advance;
                if (len < 2)
                        goto trunc;
-               ND_TCHECK_16BITS(bp);
+               ND_TCHECK_2(bp);
                ND_PRINT((ndo, " TUNR "));
                ND_PRINT((ndo, " TUNR "));
-               unsigned_relts_print(ndo, EXTRACT_BE_16BITS(bp));
+               unsigned_relts_print(ndo, EXTRACT_BE_U_2(bp));
                break;
 
 
         default:
                break;
 
 
         default:
-               ND_PRINT((ndo, " [type %d]", PIM_TYPE(pim->pim_typever)));
+               ND_PRINT((ndo, " [type %u]", PIM_TYPE(pim_typever)));
                break;
        }
 
                break;
        }
 
[mirror] the TCPdump network dissector