Use nd_ types, add EXTRACT_ calls.

[tcpdump] / print-mobility.c

diff --git a/print-mobility.c b/print-mobility.c
index 8b93df17286c7c9b10582c3e9bf576385c70daf8..02b739c9ebdcaaaa34770b14dcde7886c5fe6355 100644 (file)
--- a/print-mobility.c
+++ b/print-mobility.c
@@ -46,14 +46,14 @@ static const char tstr[] = "[|MOBILITY]";
 
 /* Mobility header */
 struct ip6_mobility {
-       uint8_t ip6m_pproto;    /* following payload protocol (for PG) */
-       uint8_t ip6m_len;       /* length in units of 8 octets */
-       uint8_t ip6m_type;      /* message type */
-       uint8_t reserved;       /* reserved */
-       uint16_t ip6m_cksum;    /* sum of IPv6 pseudo-header and MH */
+       nd_uint8_t ip6m_pproto; /* following payload protocol (for PG) */
+       nd_uint8_t ip6m_len;    /* length in units of 8 octets */
+       nd_uint8_t ip6m_type;   /* message type */
+       nd_uint8_t reserved;    /* reserved */
+       nd_uint16_t ip6m_cksum; /* sum of IPv6 pseudo-header and MH */
        union {
-               uint16_t        ip6m_un_data16[1]; /* type-specific field */
-               uint8_t         ip6m_un_data8[2];  /* type-specific field */
+               nd_uint16_t     ip6m_un_data16[1]; /* type-specific field */
+               nd_uint8_t      ip6m_un_data8[2];  /* type-specific field */
        } ip6m_dataun;
 };
 
@@ -118,22 +118,22 @@ mobility_opt_print(netdissect_options *ndo,
        unsigned i, optlen;
 
        for (i = 0; i < len; i += optlen) {
-               ND_TCHECK(bp[i]);
-               if (bp[i] == IP6MOPT_PAD1)
+               ND_TCHECK_1(bp + i);
+               if (EXTRACT_U_1(bp + i) == IP6MOPT_PAD1)
                        optlen = 1;
                else {
                        if (i + 1 < len) {
-                               ND_TCHECK(bp[i + 1]);
-                               optlen = bp[i + 1] + 2;
+                               ND_TCHECK_1(bp + i + 1);
+                               optlen = EXTRACT_U_1(bp + i + 1) + 2;
                        }
                        else
                                goto trunc;
                }
                if (i + optlen > len)
                        goto trunc;
-               ND_TCHECK(bp[i + optlen]);
+               ND_TCHECK_1(bp + i + optlen);
 
-               switch (bp[i]) {
+               switch (EXTRACT_U_1(bp + i)) {
                case IP6MOPT_PAD1:
                        ND_PRINT((ndo, "(pad1)"));
                        break;
@@ -160,7 +160,7 @@ mobility_opt_print(netdissect_options *ndo,
                                goto trunc;
                        }
                        ND_TCHECK_16(bp + i + 2);
-                       ND_PRINT((ndo, "(alt-CoA: %s)", ip6addr_string(ndo, &bp[i+2])));
+                       ND_PRINT((ndo, "(alt-CoA: %s)", ip6addr_string(ndo, bp + i + 2)));
                        break;
                case IP6MOPT_NONCEID:
                        if (len - i < IP6MOPT_NONCEID_MINLEN) {
@@ -182,10 +182,10 @@ mobility_opt_print(netdissect_options *ndo,
                        break;
                default:
                        if (len - i < IP6MOPT_MINLEN) {
-                               ND_PRINT((ndo, "(sopt_type %u: trunc)", bp[i]));
+                               ND_PRINT((ndo, "(sopt_type %u: trunc)", EXTRACT_U_1(bp + i)));
                                goto trunc;
                        }
-                       ND_PRINT((ndo, "(type-0x%02x: len=%u)", bp[i], bp[i + 1]));
+                       ND_PRINT((ndo, "(type-0x%02x: len=%u)", EXTRACT_U_1(bp + i), EXTRACT_U_1(bp + i + 1)));
                        break;
                }
        }
@@ -228,12 +228,12 @@ mobility_print(netdissect_options *ndo,
                mhlen = ep - bp;
                goto trunc;
        }
-       mhlen = (mh->ip6m_len + 1) << 3;
+       mhlen = (EXTRACT_U_1(mh->ip6m_len) + 1) << 3;
 
        /* XXX ip6m_cksum */
 
-       ND_TCHECK(mh->ip6m_type);
-       type = mh->ip6m_type;
+       ND_TCHECK_1(mh->ip6m_type);
+       type = EXTRACT_U_1(mh->ip6m_type);
        if (type <= IP6M_MAX && mhlen < ip6m_hdrlen[type]) {
                ND_PRINT((ndo, "(header length %u is too small for type %u)", mhlen, type));
                goto trunc;
@@ -257,8 +257,8 @@ mobility_print(netdissect_options *ndo,
                break;
        case IP6M_HOME_TEST:
        case IP6M_CAREOF_TEST:
-               ND_TCHECK(mh->ip6m_data16[0]);
-               ND_PRINT((ndo, " nonce id=0x%x", EXTRACT_BE_U_2(&mh->ip6m_data16[0])));
+               ND_TCHECK_2(mh->ip6m_data16[0]);
+               ND_PRINT((ndo, " nonce id=0x%x", EXTRACT_BE_U_2(mh->ip6m_data16[0])));
                hlen = IP6M_MINLEN;
                if (ndo->ndo_vflag) {
                        ND_TCHECK_4(bp + hlen + 4);
@@ -278,19 +278,19 @@ mobility_print(netdissect_options *ndo,
                hlen += 8;
                break;
        case IP6M_BINDING_UPDATE:
-               ND_TCHECK(mh->ip6m_data16[0]);
-               ND_PRINT((ndo, " seq#=%u", EXTRACT_BE_U_2(&mh->ip6m_data16[0])));
+               ND_TCHECK_2(mh->ip6m_data16[0]);
+               ND_PRINT((ndo, " seq#=%u", EXTRACT_BE_U_2(mh->ip6m_data16[0])));
                hlen = IP6M_MINLEN;
                ND_TCHECK_2(bp + hlen);
-               if (bp[hlen] & 0xf0) {
+               if (EXTRACT_U_1(bp + hlen) & 0xf0) {
                        ND_PRINT((ndo, " "));
-                       if (bp[hlen] & 0x80)
+                       if (EXTRACT_U_1(bp + hlen) & 0x80)
                                ND_PRINT((ndo, "A"));
-                       if (bp[hlen] & 0x40)
+                       if (EXTRACT_U_1(bp + hlen) & 0x40)
                                ND_PRINT((ndo, "H"));
-                       if (bp[hlen] & 0x20)
+                       if (EXTRACT_U_1(bp + hlen) & 0x20)
                                ND_PRINT((ndo, "L"));
-                       if (bp[hlen] & 0x10)
+                       if (EXTRACT_U_1(bp + hlen) & 0x10)
                                ND_PRINT((ndo, "K"));
                }
                /* Reserved (4bits) */
@@ -303,10 +303,10 @@ mobility_print(netdissect_options *ndo,
                hlen += 2;
                break;
        case IP6M_BINDING_ACK:
-               ND_TCHECK(mh->ip6m_data8[0]);
-               ND_PRINT((ndo, " status=%u", mh->ip6m_data8[0]));
-               ND_TCHECK(mh->ip6m_data8[1]);
-               if (mh->ip6m_data8[1] & 0x80)
+               ND_TCHECK_1(mh->ip6m_data8[0]);
+               ND_PRINT((ndo, " status=%u", EXTRACT_U_1(mh->ip6m_data8[0])));
+               ND_TCHECK_1(mh->ip6m_data8[1]);
+               if (EXTRACT_U_1(mh->ip6m_data8[1]) & 0x80)
                        ND_PRINT((ndo, " K"));
                /* Reserved (7bits) */
                hlen = IP6M_MINLEN;
@@ -319,21 +319,21 @@ mobility_print(netdissect_options *ndo,
                hlen += 2;
                break;
        case IP6M_BINDING_ERROR:
-               ND_TCHECK(mh->ip6m_data8[0]);
-               ND_PRINT((ndo, " status=%u", mh->ip6m_data8[0]));
+               ND_TCHECK_1(mh->ip6m_data8[0]);
+               ND_PRINT((ndo, " status=%u", EXTRACT_U_1(mh->ip6m_data8[0])));
                /* Reserved */
                hlen = IP6M_MINLEN;
                ND_TCHECK_16(bp + hlen);
-               ND_PRINT((ndo, " homeaddr %s", ip6addr_string(ndo, &bp[hlen])));
+               ND_PRINT((ndo, " homeaddr %s", ip6addr_string(ndo, bp + hlen)));
                hlen += 16;
                break;
        default:
-               ND_PRINT((ndo, " len=%u", mh->ip6m_len));
+               ND_PRINT((ndo, " len=%u", EXTRACT_U_1(mh->ip6m_len)));
                return(mhlen);
                break;
        }
        if (ndo->ndo_vflag)
-               if (mobility_opt_print(ndo, &bp[hlen], mhlen - hlen))
+               if (mobility_opt_print(ndo, bp + hlen, mhlen - hlen))
                        goto trunc;
 
        return(mhlen);