From ad5af7cf85140bae71a48f4d6b316b0c4aa7383e Mon Sep 17 00:00:00 2001 From: Jeff Morriss Date: Tue, 27 Mar 2012 01:17:38 +0000 Subject: [PATCH] From Nick Lowe via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7001 : Show EAPOL versions textually. svn path=/trunk/; revision=41786 --- epan/dissectors/packet-eapol.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/epan/dissectors/packet-eapol.c b/epan/dissectors/packet-eapol.c index 885a1fb71c..9cd51b8149 100644 --- a/epan/dissectors/packet-eapol.c +++ b/epan/dissectors/packet-eapol.c @@ -75,6 +75,10 @@ static dissector_handle_t data_handle; #define EAPOL_HDR_LEN 4 +#define EAPOL_2001 1 +#define EAPOL_2004 2 +#define EAPOL_2010 3 + #define EAP_PACKET 0 #define EAPOL_START 1 #define EAPOL_LOGOFF 2 @@ -85,6 +89,13 @@ static dissector_handle_t data_handle; */ #define EAPOL_WPA_KEY 254 +static const value_string eapol_version_vals[] = { + { EAPOL_2001, "802.1X-2001" }, + { EAPOL_2004, "802.1X-2004" }, + { EAPOL_2010, "802.1X-2010" }, + { 0, NULL } +}; + static const value_string eapol_type_vals[] = { { EAP_PACKET, "EAP Packet" }, { EAPOL_START, "Start" }, @@ -327,7 +338,7 @@ proto_register_eapol(void) static hf_register_info hf[] = { { &hf_eapol_version, { "Version", "eapol.version", FT_UINT8, BASE_DEC, - NULL, 0x0, NULL, HFILL }}, + VALS(eapol_version_vals), 0x0, NULL, HFILL }}, { &hf_eapol_type, { "Type", "eapol.type", FT_UINT8, BASE_DEC, VALS(eapol_type_vals), 0x0, NULL, HFILL }},