Add EXTRACT_ calls.

[tcpdump] / print-ip6opts.c

diff --git a/print-ip6opts.c b/print-ip6opts.c
index a90ce65b480f108b6703753169bbb24bd5e6eba8..00cad3912b413dc2dffb5d9e1583475bb682b4f9 100644 (file)
--- a/print-ip6opts.c
+++ b/print-ip6opts.c
@@ -27,19 +27,20 @@
  * SUCH DAMAGE.
  */
 
+/* \summary: IPv6 header option printer */
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
-#ifdef INET6
 #include <netdissect-stdinc.h>
 
-#include "ip6.h"
-
 #include "netdissect.h"
 #include "addrtoname.h"
 #include "extract.h"
 
+#include "ip6.h"
+
 static void
 ip6_sopt_print(netdissect_options *ndo, const u_char *bp, int len)
 {
@@ -47,18 +48,18 @@ ip6_sopt_print(netdissect_options *ndo, const u_char *bp, int len)
     int optlen;
 
     for (i = 0; i < len; i += optlen) {
-       if (bp[i] == IP6OPT_PAD1)
+       if (EXTRACT_U_1(bp + i) == IP6OPT_PAD1)
            optlen = 1;
        else {
            if (i + 1 < len)
-               optlen = bp[i + 1] + 2;
+               optlen = EXTRACT_U_1(bp + i + 1) + 2;
            else
                goto trunc;
        }
        if (i + optlen > len)
            goto trunc;
 
-       switch (bp[i]) {
+       switch (EXTRACT_U_1(bp + i)) {
        case IP6OPT_PAD1:
             ND_PRINT((ndo, ", pad1"));
            break;
@@ -71,10 +72,10 @@ ip6_sopt_print(netdissect_options *ndo, const u_char *bp, int len)
            break;
        default:
            if (len - i < IP6OPT_MINLEN) {
-               ND_PRINT((ndo, ", sopt_type %d: trunc)", bp[i]));
+               ND_PRINT((ndo, ", sopt_type %d: trunc)", EXTRACT_U_1(bp + i)));
                goto trunc;
            }
-           ND_PRINT((ndo, ", sopt_type 0x%02x: len=%d", bp[i], bp[i + 1]));
+           ND_PRINT((ndo, ", sopt_type 0x%02x: len=%d", EXTRACT_U_1(bp + i), EXTRACT_U_1(bp + i + 1)));
            break;
        }
     }
@@ -93,18 +94,18 @@ ip6_opt_print(netdissect_options *ndo, const u_char *bp, int len)
     if (len == 0)
         return;
     for (i = 0; i < len; i += optlen) {
-       if (bp[i] == IP6OPT_PAD1)
+       if (EXTRACT_U_1(bp + i) == IP6OPT_PAD1)
            optlen = 1;
        else {
            if (i + 1 < len)
-               optlen = bp[i + 1] + 2;
+               optlen = EXTRACT_U_1(bp + i + 1) + 2;
            else
                goto trunc;
        }
        if (i + optlen > len)
            goto trunc;
 
-       switch (bp[i]) {
+       switch (EXTRACT_U_1(bp + i)) {
        case IP6OPT_PAD1:
             ND_PRINT((ndo, "(pad1)"));
            break;
@@ -120,45 +121,45 @@ ip6_opt_print(netdissect_options *ndo, const u_char *bp, int len)
                ND_PRINT((ndo, "(rtalert: trunc)"));
                goto trunc;
            }
-           if (bp[i + 1] != IP6OPT_RTALERT_LEN - 2) {
-               ND_PRINT((ndo, "(rtalert: invalid len %d)", bp[i + 1]));
+           if (EXTRACT_U_1(bp + i + 1) != IP6OPT_RTALERT_LEN - 2) {
+               ND_PRINT((ndo, "(rtalert: invalid len %d)", EXTRACT_U_1(bp + i + 1)));
                goto trunc;
            }
-           ND_PRINT((ndo, "(rtalert: 0x%04x) ", EXTRACT_16BITS(&bp[i + 2])));
+           ND_PRINT((ndo, "(rtalert: 0x%04x) ", EXTRACT_BE_U_2(bp + i + 2)));
            break;
        case IP6OPT_JUMBO:
            if (len - i < IP6OPT_JUMBO_LEN) {
                ND_PRINT((ndo, "(jumbo: trunc)"));
                goto trunc;
            }
-           if (bp[i + 1] != IP6OPT_JUMBO_LEN - 2) {
-               ND_PRINT((ndo, "(jumbo: invalid len %d)", bp[i + 1]));
+           if (EXTRACT_U_1(bp + i + 1) != IP6OPT_JUMBO_LEN - 2) {
+               ND_PRINT((ndo, "(jumbo: invalid len %d)", EXTRACT_U_1(bp + i + 1)));
                goto trunc;
            }
-           ND_PRINT((ndo, "(jumbo: %u) ", EXTRACT_32BITS(&bp[i + 2])));
+           ND_PRINT((ndo, "(jumbo: %u) ", EXTRACT_BE_U_4(bp + i + 2)));
            break;
         case IP6OPT_HOME_ADDRESS:
            if (len - i < IP6OPT_HOMEADDR_MINLEN) {
                ND_PRINT((ndo, "(homeaddr: trunc)"));
                goto trunc;
            }
-           if (bp[i + 1] < IP6OPT_HOMEADDR_MINLEN - 2) {
-               ND_PRINT((ndo, "(homeaddr: invalid len %d)", bp[i + 1]));
+           if (EXTRACT_U_1(bp + i + 1) < IP6OPT_HOMEADDR_MINLEN - 2) {
+               ND_PRINT((ndo, "(homeaddr: invalid len %d)", EXTRACT_U_1(bp + i + 1)));
                goto trunc;
            }
-           ND_PRINT((ndo, "(homeaddr: %s", ip6addr_string(ndo, &bp[i + 2])));
-            if (bp[i + 1] > IP6OPT_HOMEADDR_MINLEN - 2) {
-               ip6_sopt_print(ndo, &bp[i + IP6OPT_HOMEADDR_MINLEN],
-                   (optlen - IP6OPT_HOMEADDR_MINLEN));
+           ND_PRINT((ndo, "(homeaddr: %s", ip6addr_string(ndo, bp + i + 2)));
+            if (EXTRACT_U_1(bp + i + 1) > IP6OPT_HOMEADDR_MINLEN - 2) {
+               ip6_sopt_print(ndo, bp + i + IP6OPT_HOMEADDR_MINLEN,
+                               (optlen - IP6OPT_HOMEADDR_MINLEN));
            }
             ND_PRINT((ndo, ")"));
            break;
        default:
            if (len - i < IP6OPT_MINLEN) {
-               ND_PRINT((ndo, "(type %d: trunc)", bp[i]));
+               ND_PRINT((ndo, "(type %d: trunc)", EXTRACT_U_1(bp + i)));
                goto trunc;
            }
-           ND_PRINT((ndo, "(opt_type 0x%02x: len=%d)", bp[i], bp[i + 1]));
+           ND_PRINT((ndo, "(opt_type 0x%02x: len=%d)", EXTRACT_U_1(bp + i), EXTRACT_U_1(bp + i + 1)));
            break;
        }
     }
@@ -170,14 +171,14 @@ trunc:
 }
 
 int
-hbhopt_print(netdissect_options *ndo, register const u_char *bp)
+hbhopt_print(netdissect_options *ndo, const u_char *bp)
 {
     const struct ip6_hbh *dp = (const struct ip6_hbh *)bp;
-    int hbhlen = 0;
+    u_int hbhlen = 0;
 
     ND_TCHECK(dp->ip6h_len);
-    hbhlen = (int)((dp->ip6h_len + 1) << 3);
-    ND_TCHECK2(*dp, hbhlen);
+    hbhlen = (EXTRACT_U_1(dp->ip6h_len) + 1) << 3;
+    ND_TCHECK_LEN(dp, hbhlen);
     ND_PRINT((ndo, "HBH "));
     if (ndo->ndo_vflag)
        ip6_opt_print(ndo, (const u_char *)dp + sizeof(*dp), hbhlen - sizeof(*dp));
@@ -190,14 +191,14 @@ hbhopt_print(netdissect_options *ndo, register const u_char *bp)
 }
 
 int
-dstopt_print(netdissect_options *ndo, register const u_char *bp)
+dstopt_print(netdissect_options *ndo, const u_char *bp)
 {
     const struct ip6_dest *dp = (const struct ip6_dest *)bp;
-    int dstoptlen = 0;
+    u_int dstoptlen = 0;
 
     ND_TCHECK(dp->ip6d_len);
-    dstoptlen = (int)((dp->ip6d_len + 1) << 3);
-    ND_TCHECK2(*dp, dstoptlen);
+    dstoptlen = (EXTRACT_U_1(dp->ip6d_len) + 1) << 3;
+    ND_TCHECK_LEN(dp, dstoptlen);
     ND_PRINT((ndo, "DSTOPT "));
     if (ndo->ndo_vflag) {
        ip6_opt_print(ndo, (const u_char *)dp + sizeof(*dp),
@@ -210,4 +211,3 @@ dstopt_print(netdissect_options *ndo, register const u_char *bp)
     ND_PRINT((ndo, "[|DSTOPT]"));
     return(-1);
 }
-#endif /* INET6 */