From 9cf3a7d97db8893f7e2cde5e5bda342ce71c9ad9 Mon Sep 17 00:00:00 2001
From: Guy Harris <guy@alum.mit.edu>
Date: Wed, 7 Apr 2004 06:04:22 +0000
Subject: [PATCH] From Jouni Malinen: add support for the 802.11i/RSN
 pre-authentication Ethertype.

svn path=/trunk/; revision=10558
---
 etypes.h           | 6 +++++-
 packet-eapol.c     | 3 ++-
 packet-ethertype.c | 3 ++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/etypes.h b/etypes.h
index d2185952b0..ce5032498e 100644
--- a/etypes.h
+++ b/etypes.h
@@ -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
diff --git a/packet-eapol.c b/packet-eapol.c
index ff14b789d6..5fe09ff0d2 100644
--- a/packet-eapol.c
+++ b/packet-eapol.c
@@ -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);
 }
diff --git a/packet-ethertype.c b/packet-ethertype.c
index bfef8e5d25..83bf5bfbc8 100644
--- a/packet-ethertype.c
+++ b/packet-ethertype.c
@@ -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"		},