Use more the ND_TTEST_1() macro

[tcpdump] / print-eap.c

diff --git a/print-eap.c b/print-eap.c
index 84bbe1b4efd139e8133a55e3ff908acf14744dcd..827bf6725b0a185bb6934140af31c89f2e0674c8 100644 (file)
--- a/print-eap.c
+++ b/print-eap.c
@@ -148,7 +148,7 @@ static const struct tok eap_aka_subtype_values[] = {
  */
 void
 eap_print(netdissect_options *ndo,
-          register const u_char *cp,
+          const u_char *cp,
           u_int length)
 {
     const struct eap_frame_t *eap;
@@ -183,7 +183,7 @@ eap_print(netdissect_options *ndo,
     switch (eap->type) {
     case EAP_FRAME_TYPE_PACKET:
         ND_TCHECK_1(tptr);
-        type = *(tptr);
+        type = EXTRACT_U_1(tptr);
         ND_TCHECK_2(tptr + 2);
         len = EXTRACT_BE_U_2(tptr + 2);
         ND_PRINT((ndo, ", %s (%u), id %u, len %u",
@@ -192,7 +192,7 @@ eap_print(netdissect_options *ndo,
                EXTRACT_U_1((tptr + 1)),
                len));
 
-        ND_TCHECK2(*tptr, len);
+        ND_TCHECK_LEN(tptr, len);
 
         if (type <= 2) { /* For EAP_REQUEST and EAP_RESPONSE only */
             ND_TCHECK_1(tptr + 4);
@@ -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))),
-                           *(tptr + count)));
+                           EXTRACT_U_1(tptr + count)));
                     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))),
-                       *(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)));
                 }
@@ -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))),
-                       *(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)));
                 }
@@ -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))),
-                       *(tptr + 5)));
+                       EXTRACT_U_1(tptr + 5)));
 
                 /* FIXME - TLV attributes follow */
                 break;