Use more the EXTRACT_U_1() macro to fetch a one-byte value (23/n)

Reminder: EXTRACT_8BITS is now EXTRACT_U_1.

In tok2str() calls (step 4).

diff --git a/print-atm.c b/print-atm.c
index 03c77d45f95bb82d97edbeffa0b9a60dfb0b9145..e2218c4283529d4fe9024362b4f9e825c057da5c 100644 (file)
--- a/print-atm.c
+++ b/print-atm.c
@@ -358,7 +358,7 @@ sig_print(netdissect_options *ndo,
                ND_PRINT((ndo, "Q.2931"));
                ND_TCHECK(p[MSG_TYPE_POS]);
                ND_PRINT((ndo, ":%s ",
-                   tok2str(msgtype2str, "msgtype#%d", p[MSG_TYPE_POS])));
+                   tok2str(msgtype2str, "msgtype#%d", EXTRACT_U_1(p + MSG_TYPE_POS))));
 
                /*
                 * The call reference comes before the message type,

diff --git a/print-bgp.c b/print-bgp.c
index 0f56b003b3ead565650a6669ebb1ae94de40a0f5..13a93a1ffe43ce5dec8d9d4cc9ec25a6184ae735 100644 (file)
--- a/print-bgp.c
+++ b/print-bgp.c
@@ -1398,7 +1398,7 @@ bgp_attr_print(netdissect_options *ndo,
                        ND_TCHECK(*tptr);
                        ND_PRINT((ndo, "%s", tok2str(bgp_origin_values,
                                                "Unknown Origin Typecode",
-                                               tptr[0])));
+                                               EXTRACT_U_1(tptr))));
                }
                break;
 
@@ -1429,7 +1429,7 @@ bgp_attr_print(netdissect_options *ndo,
                while (tptr < pptr + len) {
                        ND_TCHECK(tptr[0]);
                         ND_PRINT((ndo, "%s", tok2str(bgp_as_path_segment_open_values,
-                                               "?", tptr[0])));
+                                               "?", EXTRACT_U_1(tptr))));
                        ND_TCHECK(tptr[1]);
                         for (i = 0; i < tptr[1] * as_size; i += as_size) {
                             ND_TCHECK2(tptr[2 + i], as_size);
@@ -1441,7 +1441,7 @@ bgp_attr_print(netdissect_options *ndo,
                         }
                        ND_TCHECK(tptr[0]);
                         ND_PRINT((ndo, "%s", tok2str(bgp_as_path_segment_close_values,
-                                               "?", tptr[0])));
+                                               "?", EXTRACT_U_1(tptr))));
                         ND_TCHECK(tptr[1]);
                         tptr += 2 + tptr[1] * as_size;
                }
@@ -2360,7 +2360,7 @@ bgp_capabilities_print(netdissect_options *ndo,
                                       EXTRACT_BE_U_2(opt + i + 2)),
                            EXTRACT_BE_U_2(opt + i + 2),
                            tok2str(bgp_safi_values, "Unknown",
-                                      opt[i+5]),
+                                      EXTRACT_U_1(opt + i + 5)),
                            opt[i+5]));
                     break;
                 case BGP_CAPCODE_RESTART:
@@ -2375,7 +2375,7 @@ bgp_capabilities_print(netdissect_options *ndo,
                                           EXTRACT_BE_U_2(opt + i + cap_offset)),
                                EXTRACT_BE_U_2(opt + i + cap_offset),
                                tok2str(bgp_safi_values,"Unknown",
-                                          opt[i+cap_offset+2]),
+                                          EXTRACT_U_1(opt + i + cap_offset + 2)),
                                opt[i+cap_offset+2],
                                ((opt[i+cap_offset+3])&0x80) ? "yes" : "no" ));
                         tcap_len-=4;
@@ -2410,9 +2410,9 @@ bgp_capabilities_print(netdissect_options *ndo,
                         ND_PRINT((ndo, "\n\t\tAFI %s (%u), SAFI %s (%u), Send/Receive: %s",
                                   tok2str(af_values,"Unknown",EXTRACT_BE_U_2(opt + i + cap_offset)),
                                   EXTRACT_BE_U_2(opt + i + cap_offset),
-                                  tok2str(bgp_safi_values,"Unknown",opt[i+cap_offset+2]),
+                                  tok2str(bgp_safi_values,"Unknown",EXTRACT_U_1(opt + i + cap_offset + 2)),
                                   opt[i+cap_offset+2],
-                                  tok2str(bgp_add_path_recvsend,"Bogus (0x%02x)",opt[i+cap_offset+3])
+                                  tok2str(bgp_add_path_recvsend,"Bogus (0x%02x)",EXTRACT_U_1(opt + i + cap_offset + 3))
                         ));
                         tcap_len-=4;
                         cap_offset+=4;

diff --git a/print-chdlc.c b/print-chdlc.c
index 1fdd37b9d728a0f65cef7aff37e13490d76c3cf5..a9af8924624b36a00cc3d6c8d2ba650e78142234 100644 (file)
--- a/print-chdlc.c
+++ b/print-chdlc.c
@@ -62,7 +62,7 @@ chdlc_print(netdissect_options *ndo, register const u_char *p, u_int length)
        proto = EXTRACT_BE_U_2(p + 2);
        if (ndo->ndo_eflag) {
                 ND_PRINT((ndo, "%s, ethertype %s (0x%04x), length %u: ",
-                       tok2str(chdlc_cast_values, "0x%02x", p[0]),
+                       tok2str(chdlc_cast_values, "0x%02x", EXTRACT_U_1(p)),
                        tok2str(ethertype_values, "Unknown", proto),
                        proto,
                        length));

diff --git a/print-icmp6.c b/print-icmp6.c
index fe32e6fb756691a4051bdca1b88255a9e304dfd4..dfda92bddff2fa2c36a3e87b469e28d513231974 100644 (file)
--- a/print-icmp6.c
+++ b/print-icmp6.c
@@ -1432,7 +1432,7 @@ mldv2_report_print(netdissect_options *ndo, const u_char *bp, u_int len)
             ND_TCHECK2(bp[group + 4], sizeof(struct in6_addr));
             ND_PRINT((ndo," [gaddr %s", ip6addr_string(ndo, &bp[group + 4])));
            ND_PRINT((ndo," %s", tok2str(mldv2report2str, " [v2-report-#%d]",
-                                         bp[group])));
+                                         EXTRACT_U_1(bp + group))));
             nsrcs = (bp[group + 2] << 8) + bp[group + 3];
            /* Check the number of sources and print them */
            if (len < group + 20 + (nsrcs * sizeof(struct in6_addr))) {

diff --git a/print-igmp.c b/print-igmp.c
index 0bc56f08d5c3e0c93b472cb8f028200777654441..2d9a580f3407dfbba6c63c7fba7bb5688680c968 100644 (file)
--- a/print-igmp.c
+++ b/print-igmp.c
@@ -172,7 +172,7 @@ print_igmpv3_report(netdissect_options *ndo,
            ND_TCHECK2(bp[group+4], 4);
             ND_PRINT((ndo, " [gaddr %s", ipaddr_string(ndo, &bp[group+4])));
            ND_PRINT((ndo, " %s", tok2str(igmpv3report2str, " [v3-report-#%d]",
-                                                               bp[group])));
+                                                               EXTRACT_U_1(bp + group))));
             nsrcs = EXTRACT_BE_U_2(bp + group + 2);
            /* Check the number of sources and print them */
            if (len < group+8+(nsrcs<<2)) {

diff --git a/print-ppp.c b/print-ppp.c
index 808fc3fde2460ce42cc1b8429aad4c03ec564e0d..9bcb2f9df8063ecb1938f0f052a93dd62f557ec3 100644 (file)
--- a/print-ppp.c
+++ b/print-ppp.c
@@ -654,7 +654,7 @@ print_lcp_config_options(netdissect_options *ndo,
                switch (EXTRACT_BE_U_2(p + 2)) {
                case PPP_CHAP:
                        ND_TCHECK(p[4]);
-                       ND_PRINT((ndo, ", %s", tok2str(authalg_values, "Unknown Auth Alg %u", p[4])));
+                       ND_PRINT((ndo, ", %s", tok2str(authalg_values, "Unknown Auth Alg %u", EXTRACT_U_1(p + 4))));
                        break;
                case PPP_PAP: /* fall through */
                case PPP_EAP:
@@ -704,7 +704,7 @@ print_lcp_config_options(netdissect_options *ndo,
                ND_PRINT((ndo, ": "));
                ND_TCHECK(p[2]);
                ND_PRINT((ndo, ": Callback Operation %s (%u)",
-                       tok2str(ppp_callback_values, "Unknown", p[2]),
+                       tok2str(ppp_callback_values, "Unknown", EXTRACT_U_1(p + 2)),
                        p[2]));
                break;
        case LCPOPT_MLMRRU: