osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

From Jouni Malinen: add support for the 802.11i/RSN pre-authentication 

Ethertype.

svn path=/trunk/; revision=10558
This commit is contained in:
Guy Harris 2004-04-07 06:04:22 +00:00
parent 55aab5b071
commit 9cf3a7d97d
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
etypes.h
View File

@ -1,7 +1,7 @@
/* etypes.h
* Defines ethernet packet types, similar to tcpdump's ethertype.h
*
* $Id: etypes.h,v 1.38 2004/02/28 22:56:35 guy Exp $
* $Id: etypes.h,v 1.39 2004/04/07 06:04:22 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -212,6 +212,10 @@
#define ETHERTYPE_BRDWALK 0x88AE
#endif
#ifndef ETHERTYPE_RSN_PREAUTH
#define ETHERTYPE_RSN_PREAUTH 0x88c7 /* 802.11i Pre-Authentication */
#endif
#ifndef ETHERTYPE_LOOP
#define ETHERTYPE_LOOP 0x9000 /* used for layer 2 testing (do i see my own frames on the wire) */
#endif

3
packet-eapol.c
View File

@ -3,7 +3,7 @@
* (From IEEE Draft P802.1X/D11; is there a later draft, or a
* final standard? If so, check it.)
*
* $Id: packet-eapol.c,v 1.18 2004/03/30 19:15:24 guy Exp $
* $Id: packet-eapol.c,v 1.19 2004/04/07 06:04:22 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -427,4 +427,5 @@ proto_reg_handoff_eapol(void)
eapol_handle = create_dissector_handle(dissect_eapol, proto_eapol);
dissector_add("ethertype", ETHERTYPE_EAPOL, eapol_handle);
dissector_add("ethertype", ETHERTYPE_RSN_PREAUTH, eapol_handle);
}

3
packet-ethertype.c
View File

@ -1,7 +1,7 @@
/* ethertype.c
* Routines for calling the right protocol for the ethertype.
*
* $Id: packet-ethertype.c,v 1.45 2004/02/21 05:12:44 guy Exp $
* $Id: packet-ethertype.c,v 1.46 2004/04/07 06:04:22 guy Exp $
*
* Gilbert Ramirez <gram@alumni.rice.edu>
*
@ -69,6 +69,7 @@ const value_string etype_vals[] = {
{ETHERTYPE_MS_NLB_HEARTBEAT, "MS NLB heartbeat" },
{ETHERTYPE_VLAN, "802.1Q Virtual LAN" },
{ETHERTYPE_EAPOL, "802.1X Authentication" },
{ETHERTYPE_RSN_PREAUTH, "802.11i Pre-Authentication" },
{ETHERTYPE_MPLS, "MPLS label switched packet" },
{ETHERTYPE_MPLS_MULTI, "MPLS multicast label switched packet" },
{ETHERTYPE_3C_NBP_DGRAM, "3Com NBP Datagram" },