X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/f78c60f54a9beb04f1409712ec95b46f2d52a0ab..d7b497cac78b6e22a66a6bae9bdec60a8044f67a:/print-eap.c diff --git a/print-eap.c b/print-eap.c index fba40e27..924157de 100644 --- a/print-eap.c +++ b/print-eap.c @@ -16,24 +16,18 @@ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. - * - * Format and print EAP packets. - * */ +/* \summary: Extensible Authentication Protocol (EAP) printer */ + #ifdef HAVE_CONFIG_H #include "config.h" #endif -#include - -#include -#include +#include #include "netdissect.h" -#include "interface.h" #include "extract.h" -#include "ether.h" #define EAP_FRAME_TYPE_PACKET 0 #define EAP_FRAME_TYPE_START 1 @@ -153,9 +147,9 @@ static const struct tok eap_aka_subtype_values[] = { * Print EAP requests / responses */ void -eap_print(netdissect_options *ndo _U_, +eap_print(netdissect_options *ndo, register const u_char *cp, - u_int length _U_) + u_int length) { const struct eap_frame_t *eap; const u_char *tptr; @@ -165,58 +159,60 @@ eap_print(netdissect_options *ndo _U_, tptr = cp; tlen = length; eap = (const struct eap_frame_t *)cp; - TCHECK(*eap); + ND_TCHECK(*eap); /* in non-verbose mode just lets print the basic info */ - if (vflag < 1) { - printf("%s (%u) v%u, len %u", + if (ndo->ndo_vflag < 1) { + ND_PRINT((ndo, "%s (%u) v%u, len %u", tok2str(eap_frame_type_values, "unknown", eap->type), eap->type, eap->version, - EXTRACT_16BITS(eap->length)); + EXTRACT_BE_U_2(eap->length))); return; } - printf("%s (%u) v%u, len %u", + ND_PRINT((ndo, "%s (%u) v%u, len %u", tok2str(eap_frame_type_values, "unknown", eap->type), eap->type, eap->version, - EXTRACT_16BITS(eap->length)); + EXTRACT_BE_U_2(eap->length))); - tptr += sizeof(const struct eap_frame_t); - tlen -= sizeof(const struct eap_frame_t); + tptr += sizeof(struct eap_frame_t); + tlen -= sizeof(struct eap_frame_t); switch (eap->type) { case EAP_FRAME_TYPE_PACKET: + ND_TCHECK_1(tptr); type = *(tptr); - len = EXTRACT_16BITS(tptr+2); - printf(", %s (%u), id %u, len %u", + ND_TCHECK_2(tptr + 2); + len = EXTRACT_BE_U_2(tptr + 2); + ND_PRINT((ndo, ", %s (%u), id %u, len %u", tok2str(eap_code_values, "unknown", type), type, - *(tptr+1), - len); + EXTRACT_U_1((tptr + 1)), + len)); - if (!TTEST2(*tptr, len)) - goto trunc; + ND_TCHECK2(*tptr, len); if (type <= 2) { /* For EAP_REQUEST and EAP_RESPONSE only */ - subtype = *(tptr+4); - printf("\n\t\t Type %s (%u)", - tok2str(eap_type_values, "unknown", *(tptr+4)), - *(tptr+4)); + ND_TCHECK_1(tptr + 4); + subtype = EXTRACT_U_1(tptr + 4); + ND_PRINT((ndo, "\n\t\t Type %s (%u)", + tok2str(eap_type_values, "unknown", subtype), + subtype)); switch (subtype) { case EAP_TYPE_IDENTITY: if (len - 5 > 0) { - printf(", Identity: "); - safeputs(gndo, tptr + 5, len - 5); + ND_PRINT((ndo, ", Identity: ")); + safeputs(ndo, tptr + 5, len - 5); } break; case EAP_TYPE_NOTIFICATION: if (len - 5 > 0) { - printf(", Notification: "); - safeputs(gndo, tptr + 5, len - 5); + ND_PRINT((ndo, ", Notification: ")); + safeputs(ndo, tptr + 5, len - 5); } break; @@ -229,35 +225,41 @@ eap_print(netdissect_options *ndo _U_, * type one octet per type */ while (count < len) { - printf(" %s (%u),", - tok2str(eap_type_values, "unknown", *(tptr+count)), - *(tptr+count)); + ND_TCHECK_1(tptr + count); + ND_PRINT((ndo, " %s (%u),", + tok2str(eap_type_values, "unknown", EXTRACT_U_1((tptr + count))), + EXTRACT_U_1(tptr + count))); count++; } break; case EAP_TYPE_TTLS: - printf(" TTLSv%u", - EAP_TTLS_VERSION(*(tptr+5))); /* fall through */ case EAP_TYPE_TLS: - printf(" flags [%s] 0x%02x,", - bittok2str(eap_tls_flags_values, "none", *(tptr+5)), - *(tptr+5)); - - if (EAP_TLS_EXTRACT_BIT_L(*(tptr+5))) { - printf(" len %u", EXTRACT_32BITS(tptr+6)); + ND_TCHECK_1(tptr + 5); + if (subtype == EAP_TYPE_TTLS) + ND_PRINT((ndo, " TTLSv%u", + 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))), + EXTRACT_U_1(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))); } break; case EAP_TYPE_FAST: - printf(" FASTv%u", - EAP_TTLS_VERSION(*(tptr+5))); - printf(" flags [%s] 0x%02x,", - bittok2str(eap_tls_flags_values, "none", *(tptr+5)), - *(tptr+5)); - - if (EAP_TLS_EXTRACT_BIT_L(*(tptr+5))) { - printf(" len %u", EXTRACT_32BITS(tptr+6)); + ND_TCHECK_1(tptr + 5); + ND_PRINT((ndo, " FASTv%u", + 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))), + EXTRACT_U_1(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))); } /* FIXME - TLV attributes follow */ @@ -265,9 +267,10 @@ eap_print(netdissect_options *ndo _U_, case EAP_TYPE_AKA: case EAP_TYPE_SIM: - printf(" subtype [%s] 0x%02x,", - tok2str(eap_aka_subtype_values, "unknown", *(tptr+5)), - *(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))), + EXTRACT_U_1(tptr + 5))); /* FIXME - TLV attributes follow */ break; @@ -291,7 +294,7 @@ eap_print(netdissect_options *ndo _U_, return; trunc: - printf("\n\t[|EAP]"); + ND_PRINT((ndo, "\n\t[|EAP]")); } /*