* 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"
+#include <config.h>
#endif
-#include <tcpdump-stdinc.h>
-
-#include <stdio.h>
-#include <string.h>
+#include "netdissect-stdinc.h"
#include "netdissect.h"
-#include "interface.h"
#include "extract.h"
-#include "ether.h"
#define EAP_FRAME_TYPE_PACKET 0
#define EAP_FRAME_TYPE_START 1
#define EAP_FRAME_TYPE_ENCAP_ASF_ALERT 4
struct eap_frame_t {
- unsigned char version;
- unsigned char type;
- unsigned char length[2];
+ nd_uint8_t version;
+ nd_uint8_t type;
+ nd_uint16_t length;
};
static const struct tok eap_frame_type_values[] = {
/* RFC 3748 */
struct eap_packet_t {
- unsigned char code;
- unsigned char id;
- unsigned char length[2];
+ nd_uint8_t code;
+ nd_uint8_t id;
+ nd_uint16_t length;
};
#define EAP_REQUEST 1
* Print EAP requests / responses
*/
void
-eap_print(netdissect_options *ndo _U_,
- register const u_char *cp,
- u_int length _U_)
+eap_print(netdissect_options *ndo,
+ const u_char *cp,
+ u_int length)
{
- const struct eap_frame_t *eap;
- const u_char *tptr;
- u_int tlen, type, subtype;
- int count=0, len;
+ u_int type, subtype, len;
+ int count;
- tptr = cp;
- tlen = length;
- eap = (const struct eap_frame_t *)cp;
- TCHECK(*eap);
-
- /* in non-verbose mode just lets print the basic info */
- if (vflag < 1) {
- printf("%s (%u) v%u, len %u",
- tok2str(eap_frame_type_values, "unknown", eap->type),
- eap->type,
- eap->version,
- EXTRACT_16BITS(eap->length));
- return;
+ type = GET_U_1(cp);
+ len = GET_BE_U_2(cp + 2);
+ if(len != length) {
+ goto trunc;
}
-
- printf("%s (%u) v%u, len %u",
- tok2str(eap_frame_type_values, "unknown", eap->type),
- eap->type,
- eap->version,
- EXTRACT_16BITS(eap->length));
-
- tptr += sizeof(const struct eap_frame_t);
- tlen -= sizeof(const struct eap_frame_t);
-
- switch (eap->type) {
- case EAP_FRAME_TYPE_PACKET:
- type = *(tptr);
- len = EXTRACT_16BITS(tptr+2);
- printf(", %s (%u), id %u, len %u",
- tok2str(eap_code_values, "unknown", type),
- type,
- *(tptr+1),
- len);
-
- if (!TTEST2(*tptr, len))
- goto trunc;
-
- 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));
-
- switch (subtype) {
+ ND_PRINT("%s (%u), id %u, len %u",
+ tok2str(eap_code_values, "unknown", type),
+ type,
+ GET_U_1((cp + 1)),
+ len);
+
+ ND_TCHECK_LEN(cp, len);
+
+ if (type == EAP_REQUEST || type == EAP_RESPONSE) {
+ /* RFC 3748 Section 4.1 */
+ subtype = GET_U_1(cp + 4);
+ ND_PRINT("\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(", Identity: ");
+ nd_printjnp(ndo, cp + 5, len - 5);
}
break;
case EAP_TYPE_NOTIFICATION:
if (len - 5 > 0) {
- printf(", Notification: ");
- safeputs(gndo, tptr + 5, len - 5);
+ ND_PRINT(", Notification: ");
+ nd_printjnp(ndo, cp + 5, len - 5);
}
break;
* the desired authentication
* type one octet per type
*/
- while (count < len) {
- printf(" %s (%u),",
- tok2str(eap_type_values, "unknown", *(tptr+count)),
- *(tptr+count));
+ while (count < (int)len) {
+ ND_PRINT(" %s (%u),",
+ tok2str(eap_type_values, "unknown", GET_U_1((cp + count))),
+ GET_U_1(cp + 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));
+ if (subtype == EAP_TYPE_TTLS)
+ ND_PRINT(" TTLSv%u",
+ EAP_TTLS_VERSION(GET_U_1((cp + 5))));
+ ND_PRINT(" flags [%s] 0x%02x,",
+ bittok2str(eap_tls_flags_values, "none", GET_U_1((cp + 5))),
+ GET_U_1(cp + 5));
+
+ if (EAP_TLS_EXTRACT_BIT_L(GET_U_1(cp + 5))) {
+ ND_PRINT(" len %u", GET_BE_U_4(cp + 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_PRINT(" FASTv%u",
+ EAP_TTLS_VERSION(GET_U_1((cp + 5))));
+ ND_PRINT(" flags [%s] 0x%02x,",
+ bittok2str(eap_tls_flags_values, "none", GET_U_1((cp + 5))),
+ GET_U_1(cp + 5));
+
+ if (EAP_TLS_EXTRACT_BIT_L(GET_U_1(cp + 5))) {
+ ND_PRINT(" len %u", GET_BE_U_4(cp + 6));
}
/* FIXME - TLV attributes follow */
case EAP_TYPE_AKA:
case EAP_TYPE_SIM:
- printf(" subtype [%s] 0x%02x,",
- tok2str(eap_aka_subtype_values, "unknown", *(tptr+5)),
- *(tptr+5));
+ ND_PRINT(" subtype [%s] 0x%02x,",
+ tok2str(eap_aka_subtype_values, "unknown", GET_U_1((cp + 5))),
+ GET_U_1(cp + 5));
/* FIXME - TLV attributes follow */
break;
case EAP_TYPE_EXPERIMENTAL:
default:
break;
- }
}
- break;
+ }
+ return;
+trunc:
+ nd_print_trunc(ndo);
+}
+
+void
+eapol_print(netdissect_options *ndo,
+ const u_char *cp)
+{
+ const struct eap_frame_t *eap;
+ u_int eap_type, eap_len;
+
+ ndo->ndo_protocol = "eap";
+ eap = (const struct eap_frame_t *)cp;
+ ND_TCHECK_SIZE(eap);
+ eap_type = GET_U_1(eap->type);
+ ND_PRINT("%s (%u) v%u, len %u",
+ tok2str(eap_frame_type_values, "unknown", eap_type),
+ eap_type,
+ GET_U_1(eap->version),
+ GET_BE_U_2(eap->length));
+ if (ndo->ndo_vflag < 1)
+ return;
+
+ cp += sizeof(struct eap_frame_t);
+ eap_len = GET_BE_U_2(eap->length);
+
+ switch (eap_type) {
+ case EAP_FRAME_TYPE_PACKET:
+ if (eap_len == 0)
+ goto trunc;
+ ND_PRINT(", ");
+ eap_print(ndo, cp, eap_len);
+ return;
case EAP_FRAME_TYPE_LOGOFF:
case EAP_FRAME_TYPE_ENCAP_ASF_ALERT:
default:
return;
trunc:
- printf("\n\t[|EAP]");
+ nd_print_trunc(ndo);
}
-
-/*
- * Local Variables:
- * c-basic-offset: 4
- * End:
- */
projects / tcpdump / blobdiff