Use more the EXTRACT_U_1() macro (40/n)

[tcpdump] / print-ip6.c

diff --git a/print-ip6.c b/print-ip6.c
index fc296b81a9cfe5bd3830092b74628e69ab493244..237c36d49ce6d4471d6107b3d762b5199d3eae7e 100644 (file)
--- a/print-ip6.c
+++ b/print-ip6.c
@@ -76,8 +76,8 @@ ip6_finddst(netdissect_options *ndo, struct in6_addr *dst,
                         * the header, in units of 8 octets, excluding
                         * the first 8 octets.
                         */
                         * the header, in units of 8 octets, excluding
                         * the first 8 octets.
                         */

-                       ND_TCHECK2(*cp, 2);
-                       advance = (EXTRACT_8BITS(cp + 1) + 1) << 3;
+                       ND_TCHECK_2(cp);
+                       advance = (EXTRACT_U_1(cp + 1) + 1) << 3;

                        nh = *cp;
                        break;
 
                        nh = *cp;
                        break;
 


@@ -87,7 +87,7 @@ ip6_finddst(netdissect_options *ndo, struct in6_addr *dst,
                         * marked as reserved, and the header is always
                         * the same size.
                         */
                         * marked as reserved, and the header is always
                         * the same size.
                         */

-                       ND_TCHECK2(*cp, 1);
+                       ND_TCHECK_1(cp);

                        advance = sizeof(struct ip6_frag);
                        nh = *cp;
                        break;
                        advance = sizeof(struct ip6_frag);
                        nh = *cp;
                        break;


@@ -239,14 +239,14 @@ ip6_print(netdissect_options *ndo, const u_char *bp, u_int length)
           return;
        }
 
           return;
        }
 

-       payload_len = EXTRACT_BE_16BITS(&ip6->ip6_plen);
+       payload_len = EXTRACT_BE_U_2(&ip6->ip6_plen);

        len = payload_len + sizeof(struct ip6_hdr);
        if (length < len)
                ND_PRINT((ndo, "truncated-ip6 - %u bytes missing!",
                        len - length));
 
         if (ndo->ndo_vflag) {
        len = payload_len + sizeof(struct ip6_hdr);
        if (length < len)
                ND_PRINT((ndo, "truncated-ip6 - %u bytes missing!",
                        len - length));
 
         if (ndo->ndo_vflag) {

-            flow = EXTRACT_BE_32BITS(&ip6->ip6_flow);
+            flow = EXTRACT_BE_U_4(&ip6->ip6_flow);

             ND_PRINT((ndo, "("));
 #if 0
             /* rfc1883 */
             ND_PRINT((ndo, "("));
 #if 0
             /* rfc1883 */


@@ -297,19 +297,19 @@ ip6_print(netdissect_options *ndo, const u_char *bp, u_int length)
                        advance = hbhopt_print(ndo, cp);
                        if (advance < 0)
                                return;
                        advance = hbhopt_print(ndo, cp);
                        if (advance < 0)
                                return;

-                       nh = EXTRACT_8BITS(cp);
+                       nh = EXTRACT_U_1(cp);

                        break;
                case IPPROTO_DSTOPTS:
                        advance = dstopt_print(ndo, cp);
                        if (advance < 0)
                                return;
                        break;
                case IPPROTO_DSTOPTS:
                        advance = dstopt_print(ndo, cp);
                        if (advance < 0)
                                return;

-                       nh = EXTRACT_8BITS(cp);
+                       nh = EXTRACT_U_1(cp);

                        break;
                case IPPROTO_FRAGMENT:
                        advance = frag6_print(ndo, cp, (const u_char *)ip6);
                        if (advance < 0 || ndo->ndo_snapend <= cp + advance)
                                return;
                        break;
                case IPPROTO_FRAGMENT:
                        advance = frag6_print(ndo, cp, (const u_char *)ip6);
                        if (advance < 0 || ndo->ndo_snapend <= cp + advance)
                                return;

-                       nh = EXTRACT_8BITS(cp);
+                       nh = EXTRACT_U_1(cp);

                        fragmented = 1;
                        break;
 
                        fragmented = 1;
                        break;
 


@@ -326,14 +326,14 @@ ip6_print(netdissect_options *ndo, const u_char *bp, u_int length)
                        advance = mobility_print(ndo, cp, (const u_char *)ip6);
                        if (advance < 0)
                                return;
                        advance = mobility_print(ndo, cp, (const u_char *)ip6);
                        if (advance < 0)
                                return;

-                       nh = EXTRACT_8BITS(cp);
+                       nh = EXTRACT_U_1(cp);

                        return;
                case IPPROTO_ROUTING:
                        ND_TCHECK(*cp);
                        advance = rt6_print(ndo, cp, (const u_char *)ip6);
                        if (advance < 0)
                                return;
                        return;
                case IPPROTO_ROUTING:
                        ND_TCHECK(*cp);
                        advance = rt6_print(ndo, cp, (const u_char *)ip6);
                        if (advance < 0)
                                return;

-                       nh = EXTRACT_8BITS(cp);
+                       nh = EXTRACT_U_1(cp);

                        break;
                case IPPROTO_SCTP:
                        sctp_print(ndo, cp, (const u_char *)ip6, len);
                        break;
                case IPPROTO_SCTP:
                        sctp_print(ndo, cp, (const u_char *)ip6, len);


@@ -354,7 +354,7 @@ ip6_print(netdissect_options *ndo, const u_char *bp, u_int length)
                        advance = ah_print(ndo, cp);
                        if (advance < 0)
                                return;
                        advance = ah_print(ndo, cp);
                        if (advance < 0)
                                return;

-                       nh = EXTRACT_8BITS(cp);
+                       nh = EXTRACT_U_1(cp);

                        break;
                case IPPROTO_ESP:
                    {
                        break;
                case IPPROTO_ESP:
                    {