Remove EXTRACT_LE_8BITS() macro, use EXTRACT_8BITS() macro

[tcpdump] / print-dhcp6.c

diff --git a/print-dhcp6.c b/print-dhcp6.c
index aed1f1b9443f733085160c7194c7df2b24be8569..cc2787a96b3ec5974e77f46411f5977addd9a159 100644 (file)
--- a/print-dhcp6.c
+++ b/print-dhcp6.c
@@ -105,8 +105,8 @@ static const struct tok dh6_msgtype_str[] = {
 /* DHCP6 base packet format */
 struct dhcp6 {
        union {
-               uint8_t m;
-               uint32_t x;
+               nd_uint8_t m;
+               nd_uint32_t x;
        } dh6_msgtypexid;
        /* options follow */
 };
@@ -116,10 +116,10 @@ struct dhcp6 {
 
 /* DHCPv6 relay messages */
 struct dhcp6_relay {
-       uint8_t dh6relay_msgtype;
-       uint8_t dh6relay_hcnt;
-       uint8_t dh6relay_linkaddr[16];  /* XXX: badly aligned */
-       uint8_t dh6relay_peeraddr[16];
+       nd_uint8_t dh6relay_msgtype;
+       nd_uint8_t dh6relay_hcnt;
+       nd_uint8_t dh6relay_linkaddr[16];       /* XXX: badly aligned */
+       nd_uint8_t dh6relay_peeraddr[16];
        /* options follow */
 };
 
@@ -194,6 +194,7 @@ struct dhcp6_relay {
 #  define DH6OPT_NTP_SUBOPTION_MC_ADDR 2
 #  define DH6OPT_NTP_SUBOPTION_SRV_FQDN 3
 #define DH6OPT_AFTR_NAME 64
+#define DH6OPT_MUDURL 112
 
 static const struct tok dh6opt_str[] = {
        { DH6OPT_CLIENTID,           "client-ID"            },
@@ -244,6 +245,7 @@ static const struct tok dh6opt_str[] = {
        { DH6OPT_LQ_CLIENT_LINK,     "LQ-client-link"       },
        { DH6OPT_NTP_SERVER,         "NTP-server"           },
        { DH6OPT_AFTR_NAME,          "AFTR-Name"            },
+       { DH6OPT_MUDURL,             "MUD-URL"              },
        { 0, NULL }
 };
 
@@ -263,8 +265,8 @@ static const struct tok dh6opt_stcode_str[] = {
 };
 
 struct dhcp6opt {
-       uint16_t dh6opt_type;
-       uint16_t dh6opt_len;
+       nd_uint16_t dh6opt_type;
+       nd_uint16_t dh6opt_len;
        /* type-dependent data follows */
 };
 
@@ -297,11 +299,12 @@ dhcp6opt_print(netdissect_options *ndo,
                        goto trunc;
                dh6o = (const struct dhcp6opt *)cp;
                ND_TCHECK(*dh6o);
-               optlen = EXTRACT_16BITS(&dh6o->dh6opt_len);
+               optlen = EXTRACT_BE_16BITS(&dh6o->dh6opt_len);
                if (ep < cp + sizeof(*dh6o) + optlen)
                        goto trunc;
-               opttype = EXTRACT_16BITS(&dh6o->dh6opt_type);
+               opttype = EXTRACT_BE_16BITS(&dh6o->dh6opt_type);
                ND_PRINT((ndo, " (%s", tok2str(dh6opt_str, "opt_%u", opttype)));
+               ND_TCHECK2(*(cp + sizeof(*dh6o)), optlen);
                switch (opttype) {
                case DH6OPT_CLIENTID:
                case DH6OPT_SERVERID:
@@ -311,12 +314,12 @@ dhcp6opt_print(netdissect_options *ndo,
                                break;
                        }
                        tp = (const u_char *)(dh6o + 1);
-                       switch (EXTRACT_16BITS(tp)) {
+                       switch (EXTRACT_BE_16BITS(tp)) {
                        case 1:
                                if (optlen >= 2 + 6) {
                                        ND_PRINT((ndo, " hwaddr/time type %u time %u ",
-                                           EXTRACT_16BITS(&tp[2]),
-                                           EXTRACT_32BITS(&tp[4])));
+                                           EXTRACT_BE_16BITS(&tp[2]),
+                                           EXTRACT_BE_32BITS(&tp[4])));
                                        for (i = 8; i < optlen; i++)
                                                ND_PRINT((ndo, "%02x", tp[i]));
                                        /*(*/
@@ -341,7 +344,7 @@ dhcp6opt_print(netdissect_options *ndo,
                        case 3:
                                if (optlen >= 2 + 2) {
                                        ND_PRINT((ndo, " hwaddr type %u ",
-                                           EXTRACT_16BITS(&tp[2])));
+                                           EXTRACT_BE_16BITS(&tp[2])));
                                        for (i = 4; i < optlen; i++)
                                                ND_PRINT((ndo, "%02x", tp[i]));
                                        /*(*/
@@ -352,7 +355,7 @@ dhcp6opt_print(netdissect_options *ndo,
                                }
                                break;
                        default:
-                               ND_PRINT((ndo, " type %d)", EXTRACT_16BITS(tp)));
+                               ND_PRINT((ndo, " type %d)", EXTRACT_BE_16BITS(tp)));
                                break;
                        }
                        break;
@@ -365,8 +368,8 @@ dhcp6opt_print(netdissect_options *ndo,
                        tp = (const u_char *)(dh6o + 1);
                        ND_PRINT((ndo, " %s", ip6addr_string(ndo, &tp[0])));
                        ND_PRINT((ndo, " pltime:%u vltime:%u",
-                           EXTRACT_32BITS(&tp[16]),
-                           EXTRACT_32BITS(&tp[20])));
+                           EXTRACT_BE_32BITS(&tp[16]),
+                           EXTRACT_BE_32BITS(&tp[20])));
                        if (optlen > 24) {
                                /* there are sub-options */
                                dhcp6opt_print(ndo, tp + 24, tp + optlen);
@@ -382,7 +385,7 @@ dhcp6opt_print(netdissect_options *ndo,
                        tp = (const u_char *)(dh6o + 1);
                        for (i = 0; i < optlen; i += 2) {
                                ND_PRINT((ndo, " %s",
-                                   tok2str(dh6opt_str, "opt_%u", EXTRACT_16BITS(&tp[i]))));
+                                   tok2str(dh6opt_str, "opt_%u", EXTRACT_BE_16BITS(&tp[i]))));
                        }
                        ND_PRINT((ndo, ")"));
                        break;
@@ -400,7 +403,7 @@ dhcp6opt_print(netdissect_options *ndo,
                                break;
                        }
                        tp = (const u_char *)(dh6o + 1);
-                       ND_PRINT((ndo, " %d)", EXTRACT_16BITS(tp)));
+                       ND_PRINT((ndo, " %d)", EXTRACT_BE_16BITS(tp)));
                        break;
                case DH6OPT_RELAY_MSG:
                        ND_PRINT((ndo, " ("));
@@ -448,7 +451,7 @@ dhcp6opt_print(netdissect_options *ndo,
                        tp++;
                        ND_PRINT((ndo, ", RD:"));
                        for (i = 0; i < 4; i++, tp += 2)
-                               ND_PRINT((ndo, " %04x", EXTRACT_16BITS(tp)));
+                               ND_PRINT((ndo, " %04x", EXTRACT_BE_16BITS(tp)));
 
                        /* protocol dependent part */
                        authinfolen = optlen - 11;
@@ -466,11 +469,11 @@ dhcp6opt_print(netdissect_options *ndo,
                                }
                                for (i = 0; i < authrealmlen; i++, tp++)
                                        ND_PRINT((ndo, "%02x", *tp));
-                               ND_PRINT((ndo, ", key ID: %08x", EXTRACT_32BITS(tp)));
+                               ND_PRINT((ndo, ", key ID: %08x", EXTRACT_BE_32BITS(tp)));
                                tp += 4;
                                ND_PRINT((ndo, ", HMAC-MD5:"));
                                for (i = 0; i < 4; i++, tp+= 4)
-                                       ND_PRINT((ndo, " %08x", EXTRACT_32BITS(tp)));
+                                       ND_PRINT((ndo, " %08x", EXTRACT_BE_32BITS(tp)));
                                break;
                        case DH6OPT_AUTHPROTO_RECONFIG:
                                if (authinfolen != 17) {
@@ -490,7 +493,7 @@ dhcp6opt_print(netdissect_options *ndo,
                                }
                                ND_PRINT((ndo, " value:"));
                                for (i = 0; i < 4; i++, tp+= 4)
-                                       ND_PRINT((ndo, " %08x", EXTRACT_32BITS(tp)));
+                                       ND_PRINT((ndo, " %08x", EXTRACT_BE_32BITS(tp)));
                                break;
                        default:
                                ND_PRINT((ndo, " ??"));
@@ -515,6 +518,10 @@ dhcp6opt_print(netdissect_options *ndo,
                        ND_PRINT((ndo, "...)"));
                        break;
                case DH6OPT_RECONF_MSG:
+                       if (optlen != 1) {
+                               ND_PRINT((ndo, " ?)"));
+                               break;
+                       }
                        tp = (const u_char *)(dh6o + 1);
                        switch (*tp) {
                        case DH6_RENEW:
@@ -564,7 +571,7 @@ dhcp6opt_print(netdissect_options *ndo,
                                break;
                        }
                        tp = (const u_char *)(dh6o + 1);
-                       ND_PRINT((ndo, " %s)", dhcp6stcode(EXTRACT_16BITS(&tp[0]))));
+                       ND_PRINT((ndo, " %s)", dhcp6stcode(EXTRACT_BE_16BITS(&tp[0]))));
                        break;
                case DH6OPT_IA_NA:
                case DH6OPT_IA_PD:
@@ -574,9 +581,9 @@ dhcp6opt_print(netdissect_options *ndo,
                        }
                        tp = (const u_char *)(dh6o + 1);
                        ND_PRINT((ndo, " IAID:%u T1:%u T2:%u",
-                           EXTRACT_32BITS(&tp[0]),
-                           EXTRACT_32BITS(&tp[4]),
-                           EXTRACT_32BITS(&tp[8])));
+                           EXTRACT_BE_32BITS(&tp[0]),
+                           EXTRACT_BE_32BITS(&tp[4]),
+                           EXTRACT_BE_32BITS(&tp[8])));
                        if (optlen > 12) {
                                /* there are sub-options */
                                dhcp6opt_print(ndo, tp + 12, tp + optlen);
@@ -589,7 +596,7 @@ dhcp6opt_print(netdissect_options *ndo,
                                break;
                        }
                        tp = (const u_char *)(dh6o + 1);
-                       ND_PRINT((ndo, " IAID:%u", EXTRACT_32BITS(tp)));
+                       ND_PRINT((ndo, " IAID:%u", EXTRACT_BE_32BITS(tp)));
                        if (optlen > 4) {
                                /* there are sub-options */
                                dhcp6opt_print(ndo, tp + 4, tp + optlen);
@@ -604,8 +611,8 @@ dhcp6opt_print(netdissect_options *ndo,
                        tp = (const u_char *)(dh6o + 1);
                        ND_PRINT((ndo, " %s/%d", ip6addr_string(ndo, &tp[9]), tp[8]));
                        ND_PRINT((ndo, " pltime:%u vltime:%u",
-                           EXTRACT_32BITS(&tp[0]),
-                           EXTRACT_32BITS(&tp[4])));
+                           EXTRACT_BE_32BITS(&tp[0]),
+                           EXTRACT_BE_32BITS(&tp[4])));
                        if (optlen > 25) {
                                /* there are sub-options */
                                dhcp6opt_print(ndo, tp + 25, tp + optlen);
@@ -619,7 +626,7 @@ dhcp6opt_print(netdissect_options *ndo,
                                break;
                        }
                        tp = (const u_char *)(dh6o + 1);
-                       ND_PRINT((ndo, " %d)", EXTRACT_32BITS(tp)));
+                       ND_PRINT((ndo, " %d)", EXTRACT_BE_32BITS(tp)));
                        break;
                case DH6OPT_REMOTE_ID:
                        if (optlen < 4) {
@@ -627,7 +634,7 @@ dhcp6opt_print(netdissect_options *ndo,
                                break;
                        }
                        tp = (const u_char *)(dh6o + 1);
-                       ND_PRINT((ndo, " %d ", EXTRACT_32BITS(tp)));
+                       ND_PRINT((ndo, " %d ", EXTRACT_BE_32BITS(tp)));
                        /*
                         * Print hex dump first 10 characters.
                         */
@@ -688,9 +695,9 @@ dhcp6opt_print(netdissect_options *ndo,
                        }
                        tp = (const u_char *)(dh6o + 1);
                        while (tp < cp + sizeof(*dh6o) + optlen - 4) {
-                               subopt_code = EXTRACT_16BITS(tp);
+                               subopt_code = EXTRACT_BE_16BITS(tp);
                                tp += 2;
-                               subopt_len = EXTRACT_16BITS(tp);
+                               subopt_len = EXTRACT_BE_16BITS(tp);
                                tp += 2;
                                if (tp + subopt_len > cp + sizeof(*dh6o) + optlen)
                                        goto trunc;
@@ -729,7 +736,7 @@ dhcp6opt_print(netdissect_options *ndo,
                        while (remain_len && *tp) {
                                label_len =  *tp++;
                                if (label_len < remain_len - 1) {
-                                       ND_PRINT((ndo, "%.*s", label_len, tp));
+                                       (void)fn_printn(ndo, tp, label_len, NULL);
                                        tp += label_len;
                                        remain_len -= (label_len + 1);
                                        if(*tp) ND_PRINT((ndo, "."));
@@ -740,6 +747,19 @@ dhcp6opt_print(netdissect_options *ndo,
                        }
                        ND_PRINT((ndo, ")"));
                        break;
+               case DH6OPT_NEW_POSIX_TIMEZONE: /* all three of these options */
+               case DH6OPT_NEW_TZDB_TIMEZONE:  /* are encoded similarly */
+               case DH6OPT_MUDURL:             /* although GMT might not work */
+                       if (optlen < 5) {
+                               ND_PRINT((ndo, " ?)"));
+                               break;
+                       }
+                       tp = (const u_char *)(dh6o + 1);
+                       ND_PRINT((ndo, "="));
+                       (void)fn_printn(ndo, tp, (u_int)optlen, NULL);
+                       ND_PRINT((ndo, ")"));
+                       break;
+
                default:
                        ND_PRINT((ndo, ")"));
                        break;
@@ -787,7 +807,7 @@ dhcp6_print(netdissect_options *ndo,
        ND_PRINT((ndo, " %s (", name)); /*)*/
        if (dh6->dh6_msgtype != DH6_RELAY_FORW &&
            dh6->dh6_msgtype != DH6_RELAY_REPLY) {
-               ND_PRINT((ndo, "xid=%x", EXTRACT_32BITS(&dh6->dh6_xid) & DH6_XIDMASK));
+               ND_PRINT((ndo, "xid=%x", EXTRACT_BE_32BITS(&dh6->dh6_xid) & DH6_XIDMASK));
                extp = (const u_char *)(dh6 + 1);
                dhcp6opt_print(ndo, extp, ep);
        } else {                /* relay messages */