Use more the EXTRACT_U_1() macro (40/n)

[tcpdump] / print-eap.c

diff --git a/print-eap.c b/print-eap.c
index 84bbe1b4efd139e8133a55e3ff908acf14744dcd..924157de8bbe3271fa6fb5920c2eb58b1262bcf9 100644 (file)
--- a/print-eap.c
+++ b/print-eap.c
@@ -228,7 +228,7 @@ eap_print(netdissect_options *ndo,
                     ND_TCHECK_1(tptr + count);
                     ND_PRINT((ndo, " %s (%u),",
                            tok2str(eap_type_values, "unknown", EXTRACT_U_1((tptr + count))),
                     ND_TCHECK_1(tptr + count);
                     ND_PRINT((ndo, " %s (%u),",
                            tok2str(eap_type_values, "unknown", EXTRACT_U_1((tptr + count))),

-                           *(tptr + count)));
+                           EXTRACT_U_1(tptr + count)));

                     count++;
                 }
                 break;
                     count++;
                 }
                 break;


@@ -241,9 +241,9 @@ eap_print(netdissect_options *ndo,
                            EAP_TTLS_VERSION(EXTRACT_U_1((tptr + 5)))));
                 ND_PRINT((ndo, " flags [%s] 0x%02x,",
                        bittok2str(eap_tls_flags_values, "none", EXTRACT_U_1((tptr + 5))),
                            EAP_TTLS_VERSION(EXTRACT_U_1((tptr + 5)))));
                 ND_PRINT((ndo, " flags [%s] 0x%02x,",
                        bittok2str(eap_tls_flags_values, "none", EXTRACT_U_1((tptr + 5))),

-                       *(tptr + 5)));
+                       EXTRACT_U_1(tptr + 5)));

 
 

-                if (EAP_TLS_EXTRACT_BIT_L(*(tptr+5))) {
+                if (EAP_TLS_EXTRACT_BIT_L(EXTRACT_U_1(tptr + 5))) {

                     ND_TCHECK_4(tptr + 6);
                    ND_PRINT((ndo, " len %u", EXTRACT_BE_U_4(tptr + 6)));
                 }
                     ND_TCHECK_4(tptr + 6);
                    ND_PRINT((ndo, " len %u", EXTRACT_BE_U_4(tptr + 6)));
                 }


@@ -255,9 +255,9 @@ eap_print(netdissect_options *ndo,
                        EAP_TTLS_VERSION(EXTRACT_U_1((tptr + 5)))));
                 ND_PRINT((ndo, " flags [%s] 0x%02x,",
                        bittok2str(eap_tls_flags_values, "none", EXTRACT_U_1((tptr + 5))),
                        EAP_TTLS_VERSION(EXTRACT_U_1((tptr + 5)))));
                 ND_PRINT((ndo, " flags [%s] 0x%02x,",
                        bittok2str(eap_tls_flags_values, "none", EXTRACT_U_1((tptr + 5))),

-                       *(tptr + 5)));
+                       EXTRACT_U_1(tptr + 5)));

 
 

-                if (EAP_TLS_EXTRACT_BIT_L(*(tptr+5))) {
+                if (EAP_TLS_EXTRACT_BIT_L(EXTRACT_U_1(tptr + 5))) {

                     ND_TCHECK_4(tptr + 6);
                     ND_PRINT((ndo, " len %u", EXTRACT_BE_U_4(tptr + 6)));
                 }
                     ND_TCHECK_4(tptr + 6);
                     ND_PRINT((ndo, " len %u", EXTRACT_BE_U_4(tptr + 6)));
                 }


@@ -270,7 +270,7 @@ eap_print(netdissect_options *ndo,
                 ND_TCHECK_1(tptr + 5);
                 ND_PRINT((ndo, " subtype [%s] 0x%02x,",
                        tok2str(eap_aka_subtype_values, "unknown", EXTRACT_U_1((tptr + 5))),
                 ND_TCHECK_1(tptr + 5);
                 ND_PRINT((ndo, " subtype [%s] 0x%02x,",
                        tok2str(eap_aka_subtype_values, "unknown", EXTRACT_U_1((tptr + 5))),

-                       *(tptr + 5)));
+                       EXTRACT_U_1(tptr + 5)));

 
                 /* FIXME - TLV attributes follow */
                 break;
 
                 /* FIXME - TLV attributes follow */
                 break;