From: Francois-Xavier Le Bail <devel.fx.lebail@orange.fr>
Date: Sun, 19 Nov 2017 12:26:02 +0000 (+0100)
Subject: Use more the EXTRACT_8BITS() macro to fetch a one-byte value (2/n)
X-Git-Tag: tcpdump-4.99-bp~1760
X-Git-Url: https://git.tcpdump.org/tcpdump/commitdiff_plain/ea759b171c7ee1e8281fd3eaa97a092c522dbdb0

Use more the EXTRACT_8BITS() macro to fetch a one-byte value (2/n)

In tok2str() calls.
---

diff --git a/print-aoe.c b/print-aoe.c
index 68bfb958..633be0e8 100644
--- a/print-aoe.c
+++ b/print-aoe.c
@@ -266,11 +266,11 @@ aoev1_mac_print(netdissect_options *ndo,
 	cp += 1;
 	/* MCmd */
 	ND_TCHECK2(*cp, 1);
-	ND_PRINT((ndo, "\n\tMCmd: %s", tok2str(aoev1_mcmd_str, "Unknown (0x%02x)", *cp)));
+	ND_PRINT((ndo, "\n\tMCmd: %s", tok2str(aoev1_mcmd_str, "Unknown (0x%02x)", EXTRACT_8BITS(cp))));
 	cp += 1;
 	/* MError */
 	ND_TCHECK2(*cp, 1);
-	ND_PRINT((ndo, ", MError: %s", tok2str(aoev1_merror_str, "Unknown (0x%02x)", *cp)));
+	ND_PRINT((ndo, ", MError: %s", tok2str(aoev1_merror_str, "Unknown (0x%02x)", EXTRACT_8BITS(cp))));
 	cp += 1;
 	/* Dir Count */
 	ND_TCHECK2(*cp, 1);
@@ -286,7 +286,7 @@ aoev1_mac_print(netdissect_options *ndo,
 		cp += 1;
 		/* DCmd */
 		ND_TCHECK2(*cp, 1);
-		ND_PRINT((ndo, "\n\t DCmd: %s", tok2str(aoev1_dcmd_str, "Unknown (0x%02x)", *cp)));
+		ND_PRINT((ndo, "\n\t DCmd: %s", tok2str(aoev1_dcmd_str, "Unknown (0x%02x)", EXTRACT_8BITS(cp))));
 		cp += 1;
 		/* Ethernet Address */
 		ND_TCHECK2(*cp, ETHER_ADDR_LEN);
@@ -314,7 +314,7 @@ aoev1_reserve_print(netdissect_options *ndo,
 		goto invalid;
 	/* RCmd */
 	ND_TCHECK2(*cp, 1);
-	ND_PRINT((ndo, "\n\tRCmd: %s", tok2str(aoev1_rcmd_str, "Unknown (0x%02x)", *cp)));
+	ND_PRINT((ndo, "\n\tRCmd: %s", tok2str(aoev1_rcmd_str, "Unknown (0x%02x)", EXTRACT_8BITS(cp))));
 	cp += 1;
 	/* NMacs (correlated with the length) */
 	ND_TCHECK2(*cp, 1);
@@ -358,7 +358,7 @@ aoev1_print(netdissect_options *ndo,
 	/* Error */
 	ND_TCHECK2(*cp, 1);
 	if (flags & AOEV1_FLAG_E)
-		ND_PRINT((ndo, "\n\tError: %s", tok2str(aoev1_errcode_str, "Invalid (%u)", *cp)));
+		ND_PRINT((ndo, "\n\tError: %s", tok2str(aoev1_errcode_str, "Invalid (%u)", EXTRACT_8BITS(cp))));
 	cp += 1;
 	/* Major */
 	ND_TCHECK2(*cp, 2);
diff --git a/print-babel.c b/print-babel.c
index df0c5941..ad30ee00 100644
--- a/print-babel.c
+++ b/print-babel.c
@@ -298,7 +298,7 @@ subtlvs_print(netdissect_options *ndo,
             }
             sep = " ";
             while(sublen--) {
-                ND_PRINT((ndo, "%s%s", sep, tok2str(diversity_str, "%u", *cp++)));
+                ND_PRINT((ndo, "%s%s", sep, tok2str(diversity_str, "%u", EXTRACT_8BITS(cp++))));
                 sep = "-";
             }
             if(tlv_type != MESSAGE_UPDATE &&
diff --git a/print-bgp.c b/print-bgp.c
index 39d3662b..3e59df88 100644
--- a/print-bgp.c
+++ b/print-bgp.c
@@ -2111,7 +2111,7 @@ bgp_attr_print(netdissect_options *ndo,
                                ipaddr_string(ndo, tptr+2),
                                tok2str(bgp_extd_comm_ospf_rtype_values,
 					  "unknown (0x%02x)",
-					  *(tptr+6)),
+					  EXTRACT_8BITS((tptr + 6))),
                                (*(tptr+7) &  BGP_OSPF_RTYPE_METRIC_TYPE) ? "E2" : "",
                                ((*(tptr+6) == BGP_OSPF_RTYPE_EXT) || (*(tptr+6) == BGP_OSPF_RTYPE_NSSA)) ? "E1" : ""));
                         break;
@@ -2119,8 +2119,8 @@ bgp_attr_print(netdissect_options *ndo,
                         ND_PRINT((ndo, ": %s Control Flags [0x%02x]:MTU %u",
                                tok2str(l2vpn_encaps_values,
 					  "unknown encaps",
-					  *(tptr+2)),
-                                       *(tptr+3),
+					  EXTRACT_8BITS((tptr + 2))),
+                               *(tptr+3),
                                EXTRACT_BE_16BITS(tptr + 4)));
                         break;
                     case BGP_EXT_COM_SOURCE_AS:
@@ -2698,7 +2698,7 @@ bgp_notification_print(netdissect_options *ndo,
 		       tok2str(af_values, "Unknown",
 				  EXTRACT_BE_16BITS(tptr)),
 		       EXTRACT_BE_16BITS(tptr),
-		       tok2str(bgp_safi_values, "Unknown", *(tptr+2)),
+		       tok2str(bgp_safi_values, "Unknown", EXTRACT_8BITS((tptr + 2))),
 		       *(tptr+2),
 		       EXTRACT_BE_32BITS(tptr + 3)));
 	    }
diff --git a/print-cfm.c b/print-cfm.c
index 4c26e336..2acd8e90 100644
--- a/print-cfm.c
+++ b/print-cfm.c
@@ -566,7 +566,7 @@ cfm_print(netdissect_options *ndo,
                 return;
             }
             ND_PRINT((ndo, ", Status: %s (%u)",
-                   tok2str(cfm_tlv_port_status_values, "Unknown", *tptr),
+                   tok2str(cfm_tlv_port_status_values, "Unknown", EXTRACT_8BITS(tptr)),
                    *tptr));
             break;
 
@@ -576,7 +576,7 @@ cfm_print(netdissect_options *ndo,
                 return;
             }
             ND_PRINT((ndo, ", Status: %s (%u)",
-                   tok2str(cfm_tlv_interface_status_values, "Unknown", *tptr),
+                   tok2str(cfm_tlv_interface_status_values, "Unknown", EXTRACT_8BITS(tptr)),
                    *tptr));
             break;
 
diff --git a/print-dccp.c b/print-dccp.c
index 78c7c7d8..56ab2746 100644
--- a/print-dccp.c
+++ b/print-dccp.c
@@ -545,7 +545,7 @@ static int dccp_print_option(netdissect_options *ndo, const u_char *option, u_in
 				ND_PRINT((ndo, "CCID option %u optlen too short", *option));
 			else
 				ND_PRINT((ndo, "%s optlen too short",
-					  tok2str(dccp_option_values, "Option %u", *option)));
+					  tok2str(dccp_option_values, "Option %u", EXTRACT_8BITS(option))));
 			return 0;
 		}
 	} else
@@ -557,7 +557,7 @@ static int dccp_print_option(netdissect_options *ndo, const u_char *option, u_in
 				  *option));
 		else
 			ND_PRINT((ndo, "%s optlen goes past header length",
-				  tok2str(dccp_option_values, "Option %u", *option)));
+				  tok2str(dccp_option_values, "Option %u", EXTRACT_8BITS(option))));
 		return 0;
 	}
 	ND_TCHECK2(*option, optlen);
@@ -575,7 +575,7 @@ static int dccp_print_option(netdissect_options *ndo, const u_char *option, u_in
 				break;
 		}
 	} else {
-		ND_PRINT((ndo, "%s", tok2str(dccp_option_values, "Option %u", *option)));
+		ND_PRINT((ndo, "%s", tok2str(dccp_option_values, "Option %u", EXTRACT_8BITS(option))));
 		switch (*option) {
 		case 32:
 		case 33:
diff --git a/print-eap.c b/print-eap.c
index cc115ee6..3891d88e 100644
--- a/print-eap.c
+++ b/print-eap.c
@@ -227,7 +227,7 @@ eap_print(netdissect_options *ndo,
                 while (count < len) {
                     ND_TCHECK_8BITS(tptr+count);
                     ND_PRINT((ndo, " %s (%u),",
-                           tok2str(eap_type_values, "unknown", *(tptr+count)),
+                           tok2str(eap_type_values, "unknown", EXTRACT_8BITS((tptr + count))),
                            *(tptr + count)));
                     count++;
                 }
@@ -269,7 +269,7 @@ eap_print(netdissect_options *ndo,
             case EAP_TYPE_SIM:
                 ND_TCHECK_8BITS(tptr + 5);
                 ND_PRINT((ndo, " subtype [%s] 0x%02x,",
-                       tok2str(eap_aka_subtype_values, "unknown", *(tptr+5)),
+                       tok2str(eap_aka_subtype_values, "unknown", EXTRACT_8BITS((tptr + 5))),
                        *(tptr + 5)));
 
                 /* FIXME - TLV attributes follow */
diff --git a/print-isoclns.c b/print-isoclns.c
index fa4dc9c3..d4d79c8e 100644
--- a/print-isoclns.c
+++ b/print-isoclns.c
@@ -678,7 +678,7 @@ isoclns_print(netdissect_options *ndo, const uint8_t *p, u_int length)
 	}
 
 	if (ndo->ndo_eflag)
-		ND_PRINT((ndo, "OSI NLPID %s (0x%02x): ", tok2str(nlpid_values, "Unknown", *p), *p));
+		ND_PRINT((ndo, "OSI NLPID %s (0x%02x): ", tok2str(nlpid_values, "Unknown", EXTRACT_8BITS(p)), *p));
 
 	switch (*p) {
 
@@ -936,7 +936,7 @@ clnp_print(netdissect_options *ndo,
                             return (0);
                     }
                     ND_PRINT((ndo, "%s %s",
-                           tok2str(clnp_option_sr_rr_values,"Unknown",*tptr),
+                           tok2str(clnp_option_sr_rr_values,"Unknown",EXTRACT_8BITS(tptr)),
                            tok2str(clnp_option_sr_rr_string_values, "Unknown Option %u", op)));
                     nsap_offset=*(tptr+1);
                     if (nsap_offset == 0) {
@@ -1340,7 +1340,7 @@ esis_print(netdissect_options *ndo,
                     ND_PRINT((ndo, "%s (0x%02x)",
                            tok2str(nlpid_values,
                                    "unknown",
-                                   *tptr),
+                                   EXTRACT_8BITS(tptr)),
                            *tptr));
                     if (opli>1) /* further NPLIDs ? - put comma */
                         ND_PRINT((ndo, ", "));
@@ -1867,7 +1867,7 @@ isis_print_is_reach_subtlv(netdissect_options *ndo,
                 break;
             ND_PRINT((ndo, "%sBandwidth Constraints Model ID: %s (%u)",
                    ident,
-                   tok2str(diffserv_te_bc_values, "unknown", *tptr),
+                   tok2str(diffserv_te_bc_values, "unknown", EXTRACT_8BITS(tptr)),
                    *tptr));
             tptr++;
             /* decode BCs until the subTLV ends */
@@ -1916,7 +1916,7 @@ isis_print_is_reach_subtlv(netdissect_options *ndo,
                    ident,
                    tok2str(gmpls_switch_cap_values, "Unknown", gmpls_switch_cap)));
               ND_PRINT((ndo, ", LSP Encoding: %s",
-                   tok2str(gmpls_encoding_values, "Unknown", *(tptr + 1))));
+                   tok2str(gmpls_encoding_values, "Unknown", EXTRACT_8BITS((tptr + 1)))));
 	      tptr+=4;
               ND_PRINT((ndo, "%s  Max LSP Bandwidth:", ident));
               for (priority_level = 0; priority_level < 8; priority_level++) {
@@ -1945,7 +1945,7 @@ isis_print_is_reach_subtlv(netdissect_options *ndo,
                 bw.i = EXTRACT_BE_32BITS(tptr);
                 ND_PRINT((ndo, "%s  Min LSP Bandwidth: %.3f Mbps", ident, bw.f * 8 / 1000000));
                 ND_PRINT((ndo, "%s  Indication %s", ident,
-                       tok2str(gmpls_switch_cap_tsc_indication_values, "Unknown (%u)", *(tptr + 4))));
+                       tok2str(gmpls_switch_cap_tsc_indication_values, "Unknown (%u)", EXTRACT_8BITS((tptr + 4)))));
                 break;
               default:
                 /* there is some optional stuff left to decode but this is as of yet
@@ -2653,7 +2653,7 @@ isis_print(netdissect_options *ndo,
             ND_PRINT((ndo, "\n\t      %s",
                    tok2str(isis_is_reach_virtual_values,
                            "bogus virtual flag 0x%02x",
-                           *tptr++)));
+                           EXTRACT_8BITS(tptr++))));
 	    tlv_is_reach = (const struct isis_tlv_is_reach *)tptr;
             while (tmp >= sizeof(struct isis_tlv_is_reach)) {
 		ND_TCHECK(*tlv_is_reach);
@@ -2755,7 +2755,7 @@ isis_print(netdissect_options *ndo,
             ND_PRINT((ndo, "\n\t      %s: ",
                    tok2str(isis_subtlv_auth_values,
                            "unknown Authentication type 0x%02x",
-                           *tptr)));
+                           EXTRACT_8BITS(tptr))));
 
 	    switch (*tptr) {
 	    case ISIS_SUBTLV_AUTH_SIMPLE:
@@ -2798,8 +2798,8 @@ isis_print(netdissect_options *ndo,
 	    if(tmp>=1) {
 		ND_TCHECK2(*tptr, 1);
 		ND_PRINT((ndo, "\n\t      Adjacency State: %s (%u)",
-		       tok2str(isis_ptp_adjancey_values, "unknown", *tptr),
-                        *tptr));
+		       tok2str(isis_ptp_adjancey_values, "unknown", EXTRACT_8BITS(tptr)),
+		       *tptr));
 		tmp--;
 	    }
 	    if(tmp>sizeof(tlv_ptp_adj->extd_local_circuit_id)) {
@@ -2828,7 +2828,7 @@ isis_print(netdissect_options *ndo,
 		ND_PRINT((ndo, "%s (0x%02x)",
                        tok2str(nlpid_values,
                                "unknown",
-                               *tptr),
+                               EXTRACT_8BITS(tptr)),
                        *tptr));
 		if (tmp>1) /* further NPLIDs ? - put comma */
 		    ND_PRINT((ndo, ", "));
@@ -3027,7 +3027,7 @@ isis_print(netdissect_options *ndo,
             ND_PRINT((ndo, "\n\t      Inter-Domain Information Type: %s",
                    tok2str(isis_subtlv_idrp_values,
                            "Unknown (0x%02x)",
-                           *tptr)));
+                           EXTRACT_8BITS(tptr))));
             switch (*tptr++) {
             case ISIS_SUBTLV_IDRP_ASN:
                 ND_TCHECK2(*tptr, 2); /* fetch AS number */
diff --git a/print-lldp.c b/print-lldp.c
index 1decb31c..4c924d12 100644
--- a/print-lldp.c
+++ b/print-lldp.c
@@ -884,8 +884,8 @@ lldp_private_8023_print(netdissect_options *ndo,
         }
         ND_PRINT((ndo, "\n\t    MDI power support [%s], power pair %s, power class %s",
                bittok2str(lldp_mdi_values, "none", EXTRACT_8BITS((tptr + 4))),
-               tok2str(lldp_mdi_power_pairs_values, "unknown", *(tptr+5)),
-               tok2str(lldp_mdi_power_class_values, "unknown", *(tptr + 6))));
+               tok2str(lldp_mdi_power_pairs_values, "unknown", EXTRACT_8BITS((tptr + 5))),
+               tok2str(lldp_mdi_power_class_values, "unknown", EXTRACT_8BITS((tptr + 6)))));
         break;
 
     case LLDP_PRIVATE_8023_SUBTYPE_LINKAGGR:
@@ -991,7 +991,7 @@ lldp_private_tia_print(netdissect_options *ndo,
                bittok2str(lldp_tia_capabilities_values, "none",
                           EXTRACT_BE_16BITS(tptr + 4)), EXTRACT_BE_16BITS(tptr + 4)));
         ND_PRINT((ndo, "\n\t    Device type [%s] (0x%02x)",
-               tok2str(lldp_tia_device_type_values, "unknown", *(tptr+6)),
+               tok2str(lldp_tia_device_type_values, "unknown", EXTRACT_8BITS((tptr + 6))),
                *(tptr + 6)));
         break;
 
@@ -1000,7 +1000,7 @@ lldp_private_tia_print(netdissect_options *ndo,
             return hexdump;
         }
         ND_PRINT((ndo, "\n\t    Application type [%s] (0x%02x)",
-               tok2str(lldp_tia_application_type_values, "none", *(tptr+4)),
+               tok2str(lldp_tia_application_type_values, "none", EXTRACT_8BITS((tptr + 4))),
                *(tptr + 4)));
         ND_PRINT((ndo, ", Flags [%s]", bittok2str(
                    lldp_tia_network_policy_bits_values, "none", EXTRACT_8BITS((tptr + 5)))));
@@ -1037,7 +1037,7 @@ lldp_private_tia_print(netdissect_options *ndo,
                    (EXTRACT_BE_16BITS(tptr + 15)>>6)&0x3f,
                    ((EXTRACT_BE_32BITS(tptr + 16) & 0x3fffffff))));
             ND_PRINT((ndo, "\n\t    Datum %s (0x%02x)",
-                   tok2str(lldp_tia_location_datum_type_values, "unknown", *(tptr+20)),
+                   tok2str(lldp_tia_location_datum_type_values, "unknown", EXTRACT_8BITS((tptr + 20))),
                    *(tptr + 20)));
             break;
 
@@ -1054,7 +1054,7 @@ lldp_private_tia_print(netdissect_options *ndo,
             }
             ND_PRINT((ndo, "\n\t    LCI length %u, LCI what %s (0x%02x), Country-code ",
                    lci_len,
-                   tok2str(lldp_tia_location_lci_what_values, "unknown", *(tptr+6)),
+                   tok2str(lldp_tia_location_lci_what_values, "unknown", EXTRACT_8BITS((tptr + 6))),
                    *(tptr + 6)));
 
             /* Country code */
diff --git a/print-lmp.c b/print-lmp.c
index d8d9540e..999c830f 100644
--- a/print-lmp.c
+++ b/print-lmp.c
@@ -796,7 +796,7 @@ lmp_print(netdissect_options *ndo,
 		ND_PRINT((ndo, "\n\t    Data links: %u",
 			EXTRACT_BE_32BITS(obj_tptr + 4)));
                 ND_PRINT((ndo, "\n\t    Encoding type: %s",
-			tok2str(gmpls_encoding_values, "Unknown", *(obj_tptr+8))));
+			tok2str(gmpls_encoding_values, "Unknown", EXTRACT_8BITS((obj_tptr + 8)))));
                 ND_PRINT((ndo, "\n\t    Verify Transport Mechanism: %u (0x%x)%s",
 			EXTRACT_BE_16BITS(obj_tptr + 10),
 			EXTRACT_BE_16BITS(obj_tptr + 10),
diff --git a/print-openflow-1.0.c b/print-openflow-1.0.c
index de44d5ee..ee61054c 100644
--- a/print-openflow-1.0.c
+++ b/print-openflow-1.0.c
@@ -835,7 +835,7 @@ of10_bsn_message_print(netdissect_options *ndo,
 			goto invalid;
 		/* report_mirror_ports */
 		ND_TCHECK2(*cp, 1);
-		ND_PRINT((ndo, ", report_mirror_ports %s", tok2str(bsn_onoff_str, "bogus (%u)", *cp)));
+		ND_PRINT((ndo, ", report_mirror_ports %s", tok2str(bsn_onoff_str, "bogus (%u)", EXTRACT_8BITS(cp))));
 		cp += 1;
 		/* pad */
 		ND_TCHECK2(*cp, 3);
@@ -1009,7 +1009,7 @@ of10_bsn_actions_print(netdissect_options *ndo,
 		}
 		/* copy_stage */
 		ND_TCHECK2(*cp, 1);
-		ND_PRINT((ndo, ", copy_stage %s", tok2str(bsn_mirror_copy_stage_str, "unknown (%u)", *cp)));
+		ND_PRINT((ndo, ", copy_stage %s", tok2str(bsn_mirror_copy_stage_str, "unknown (%u)", EXTRACT_8BITS(cp))));
 		cp += 1;
 		/* pad */
 		ND_TCHECK2(*cp, 3);
@@ -1784,7 +1784,7 @@ of10_stats_request_print(netdissect_options *ndo,
 			return ep; /* end of snapshot */
 		/* table_id */
 		ND_TCHECK2(*cp, 1);
-		ND_PRINT((ndo, "\n\t table_id %s", tok2str(tableid_str, "%u", *cp)));
+		ND_PRINT((ndo, "\n\t table_id %s", tok2str(tableid_str, "%u", EXTRACT_8BITS(cp))));
 		cp += 1;
 		/* pad */
 		ND_TCHECK2(*cp, 1);
@@ -1899,7 +1899,7 @@ of10_flow_stats_reply_print(netdissect_options *ndo,
 		cp += 2;
 		/* table_id */
 		ND_TCHECK2(*cp, 1);
-		ND_PRINT((ndo, ", table_id %s", tok2str(tableid_str, "%u", *cp)));
+		ND_PRINT((ndo, ", table_id %s", tok2str(tableid_str, "%u", EXTRACT_8BITS(cp))));
 		cp += 1;
 		/* pad */
 		ND_TCHECK2(*cp, 1);
@@ -2005,7 +2005,7 @@ of10_table_stats_reply_print(netdissect_options *ndo,
 			goto invalid;
 		/* table_id */
 		ND_TCHECK2(*cp, 1);
-		ND_PRINT((ndo, "\n\t table_id %s", tok2str(tableid_str, "%u", *cp)));
+		ND_PRINT((ndo, "\n\t table_id %s", tok2str(tableid_str, "%u", EXTRACT_8BITS(cp))));
 		cp += 1;
 		/* pad */
 		ND_TCHECK2(*cp, 3);
@@ -2283,7 +2283,7 @@ of10_packet_in_print(netdissect_options *ndo,
 	cp += 2;
 	/* reason */
 	ND_TCHECK2(*cp, 1);
-	ND_PRINT((ndo, ", reason %s", tok2str(ofpr_str, "invalid (0x%02x)", *cp)));
+	ND_PRINT((ndo, ", reason %s", tok2str(ofpr_str, "invalid (0x%02x)", EXTRACT_8BITS(cp))));
 	cp += 1;
 	/* pad */
 	ND_TCHECK2(*cp, 1);
@@ -2316,7 +2316,7 @@ of10_flow_removed_print(netdissect_options *ndo,
 	cp += 2;
 	/* reason */
 	ND_TCHECK2(*cp, 1);
-	ND_PRINT((ndo, ", reason %s", tok2str(ofprr_str, "unknown (0x%02x)", *cp)));
+	ND_PRINT((ndo, ", reason %s", tok2str(ofprr_str, "unknown (0x%02x)", EXTRACT_8BITS(cp))));
 	cp += 1;
 	/* pad */
 	ND_TCHECK2(*cp, 1);
@@ -2457,7 +2457,7 @@ of10_header_body_print(netdissect_options *ndo,
 			goto next_message;
 		/* reason */
 		ND_TCHECK2(*cp, 1);
-		ND_PRINT((ndo, "\n\t reason %s", tok2str(ofppr_str, "invalid (0x%02x)", *cp)));
+		ND_PRINT((ndo, "\n\t reason %s", tok2str(ofppr_str, "invalid (0x%02x)", EXTRACT_8BITS(cp))));
 		cp += 1;
 		/* pad */
 		ND_TCHECK2(*cp, 7);
diff --git a/print-ospf.c b/print-ospf.c
index 4c82c611..fa0c8f02 100644
--- a/print-ospf.c
+++ b/print-ospf.c
@@ -230,7 +230,7 @@ ospf_print_grace_lsa(netdissect_options *ndo,
                 return -1;
             }
             ND_PRINT((ndo, "%s (%u)",
-                   tok2str(lsa_opaque_grace_tlv_reason_values, "Unknown", *tptr),
+                   tok2str(lsa_opaque_grace_tlv_reason_values, "Unknown", EXTRACT_8BITS(tptr)),
                    *tptr));
             break;
 
@@ -382,7 +382,7 @@ ospf_print_te_lsa(netdissect_options *ndo,
 		    }
 		    /* BC Model Id (1 octet) + Reserved (3 octets) */
                     ND_PRINT((ndo, "\n\t\tBandwidth Constraints Model ID: %s (%u)",
-                           tok2str(diffserv_te_bc_values, "unknown", *tptr),
+                           tok2str(diffserv_te_bc_values, "unknown", EXTRACT_8BITS(tptr)),
                            *tptr));
 		    if (subtlv_length % 4 != 0) {
 			ND_PRINT((ndo, "\n\t\tlength %u != N x 4", subtlv_length));
@@ -423,9 +423,9 @@ ospf_print_te_lsa(netdissect_options *ndo,
 		    }
 		    /* Switching Cap (1 octet) + Encoding (1) +  Reserved (2) */
                     ND_PRINT((ndo, "\n\t\tInterface Switching Capability: %s",
-                           tok2str(gmpls_switch_cap_values, "Unknown", *(tptr))));
+                           tok2str(gmpls_switch_cap_values, "Unknown", EXTRACT_8BITS((tptr)))));
                     ND_PRINT((ndo, "\n\t\tLSP Encoding: %s\n\t\tMax LSP Bandwidth:",
-                           tok2str(gmpls_encoding_values, "Unknown", *(tptr + 1))));
+                           tok2str(gmpls_encoding_values, "Unknown", EXTRACT_8BITS((tptr + 1)))));
                     for (priority_level = 0; priority_level < 8; priority_level++) {
                         bw.i = EXTRACT_BE_32BITS(tptr + 4 + (priority_level * 4));
                         ND_PRINT((ndo, "\n\t\t  priority level %d: %.3f Mbps",
@@ -439,7 +439,7 @@ ospf_print_te_lsa(netdissect_options *ndo,
 			goto invalid;
 		    }
                     ND_PRINT((ndo, ", %s (%u)",
-                           tok2str(lsa_opaque_te_tlv_link_type_sub_tlv_values,"unknown",*tptr),
+                           tok2str(lsa_opaque_te_tlv_link_type_sub_tlv_values,"unknown",EXTRACT_8BITS(tptr)),
                            *tptr));
                     break;
 
diff --git a/print-pptp.c b/print-pptp.c
index 779011a2..3d691bc0 100644
--- a/print-pptp.c
+++ b/print-pptp.c
@@ -338,7 +338,7 @@ pptp_err_code_print(netdissect_options *ndo,
 {
 	ND_PRINT((ndo, " ERR_CODE(%u", *err_code));
 	if (ndo->ndo_vflag) {
-		ND_PRINT((ndo, ":%s", tok2str(pptp_errcode_str, "?", *err_code)));
+		ND_PRINT((ndo, ":%s", tok2str(pptp_errcode_str, "?", EXTRACT_8BITS(err_code))));
 	}
 	ND_PRINT((ndo, ")"));
 }
@@ -493,7 +493,7 @@ pptp_result_code_print(netdissect_options *ndo,
 			ctrl_msg_type == PPTP_CTRL_MSG_TYPE_CDN      ? pptp_cdn_str :
 			NULL; /* assertion error */
 		if (dict != NULL)
-			ND_PRINT((ndo, ":%s", tok2str(dict, "?", *result_code)));
+			ND_PRINT((ndo, ":%s", tok2str(dict, "?", EXTRACT_8BITS(result_code))));
 	}
 	ND_PRINT((ndo, ")"));
 }
diff --git a/print-radius.c b/print-radius.c
index 0df38221..59e5fc5a 100644
--- a/print-radius.c
+++ b/print-radius.c
@@ -625,7 +625,7 @@ print_attr_string(netdissect_options *ndo,
            if (length < 1)
               goto trunc;
            ND_PRINT((ndo, "%s (0x%02x) ",
-                  tok2str(rfc4675_tagged,"Unknown tag",*data),
+                  tok2str(rfc4675_tagged,"Unknown tag",EXTRACT_8BITS(data)),
                   *data));
            data++;
            length--;
@@ -805,7 +805,7 @@ print_attr_num(netdissect_options *ndo,
 
         case EGRESS_VLAN_ID:
             ND_PRINT((ndo, "%s (0x%02x) ",
-                   tok2str(rfc4675_tagged,"Unknown tag",*data),
+                   tok2str(rfc4675_tagged,"Unknown tag",EXTRACT_8BITS(data)),
                    *data));
             data++;
             ND_PRINT((ndo, "%d", EXTRACT_BE_24BITS(data)));
diff --git a/print-rsvp.c b/print-rsvp.c
index 368aa904..1283c1bb 100644
--- a/print-rsvp.c
+++ b/print-rsvp.c
@@ -1041,14 +1041,14 @@ rsvp_obj_print(netdissect_options *ndo,
                        indent,
                        tok2str(gmpls_encoding_values,
                                "Unknown",
-                               *obj_tptr),
-		       *obj_tptr));
+                               EXTRACT_8BITS(obj_tptr)),
+                       *obj_tptr));
                 ND_PRINT((ndo, "%s  Switching Type: %s (%u), Payload ID: %s (0x%04x)",
                        indent,
                        tok2str(gmpls_switch_cap_values,
                                "Unknown",
-                               *(obj_tptr+1)),
-		       *(obj_tptr+1),
+                               EXTRACT_8BITS((obj_tptr + 1))),
+                       *(obj_tptr+1),
                        tok2str(gmpls_payload_values,
                                "Unknown",
                                EXTRACT_BE_16BITS(obj_tptr + 2)),
@@ -1378,7 +1378,7 @@ rsvp_obj_print(netdissect_options *ndo,
                     intserv_serv_tlen=EXTRACT_BE_16BITS(obj_tptr + 2)<<2;
                     ND_PRINT((ndo, "%s  Service Type: %s (%u), break bit %s set, Service length: %u",
                            indent,
-                           tok2str(rsvp_intserv_service_type_values,"unknown",*(obj_tptr)),
+                           tok2str(rsvp_intserv_service_type_values,"unknown",EXTRACT_8BITS((obj_tptr))),
                            *(obj_tptr),
                            (*(obj_tptr+1)&0x80) ? "" : "not",
                            intserv_serv_tlen));
@@ -1646,7 +1646,7 @@ rsvp_obj_print(netdissect_options *ndo,
                 while(obj_tlen >= 2 + padbytes) {
                     ND_PRINT((ndo, "%s    %s TLV (0x%02x), length: %u", /* length includes header */
                            indent,
-                           tok2str(rsvp_obj_prop_tlv_values,"unknown",*obj_tptr),
+                           tok2str(rsvp_obj_prop_tlv_values,"unknown",EXTRACT_8BITS(obj_tptr)),
                            *obj_tptr,
                            *(obj_tptr + 1)));
                     if (obj_tlen < *(obj_tptr+1))