]> The Tcpdump Group git mirrors - tcpdump/commitdiff
Use more the EXTRACT_8BITS() macro to fetch a one-byte value (3/n)
authorFrancois-Xavier Le Bail <[email protected]>
Sun, 19 Nov 2017 13:33:52 +0000 (14:33 +0100)
committerFrancois-Xavier Le Bail <[email protected]>
Sun, 19 Nov 2017 13:35:37 +0000 (14:35 +0100)
In EAP_TTLS_VERSION() macro calls.

print-eap.c

index 3891d88e572e07890ea7524b73ac450e540de506..182b81e2818175e8f8b2fd56eb90e20da22f2190 100644 (file)
@@ -238,7 +238,7 @@ eap_print(netdissect_options *ndo,
                 ND_TCHECK_8BITS(tptr + 5);
                 if (subtype == EAP_TYPE_TTLS)
                     ND_PRINT((ndo, " TTLSv%u",
-                           EAP_TTLS_VERSION(*(tptr + 5))));
+                           EAP_TTLS_VERSION(EXTRACT_8BITS((tptr + 5)))));
                 ND_PRINT((ndo, " flags [%s] 0x%02x,",
                        bittok2str(eap_tls_flags_values, "none", EXTRACT_8BITS((tptr + 5))),
                        *(tptr + 5)));
@@ -252,7 +252,7 @@ eap_print(netdissect_options *ndo,
             case EAP_TYPE_FAST:
                 ND_TCHECK_8BITS(tptr + 5);
                 ND_PRINT((ndo, " FASTv%u",
-                       EAP_TTLS_VERSION(*(tptr + 5))));
+                       EAP_TTLS_VERSION(EXTRACT_8BITS((tptr + 5)))));
                 ND_PRINT((ndo, " flags [%s] 0x%02x,",
                        bittok2str(eap_tls_flags_values, "none", EXTRACT_8BITS((tptr + 5))),
                        *(tptr + 5)));