IEEE 802.1x, a/k/a EAPOL, and PPP/EAPOL EAP support, from Pekka

Nikander.

svn path=/trunk/; revision=4170

8 files changed, 314 insertions, 4 deletions

diff --git a/AUTHORS b/AUTHORS
index 3cd04081de..322f303be8 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -872,6 +872,11 @@ Tomas Kukosa <tomas.kukosa[AT]anfdata.cz> {
 	IPCOMP transformation and ID_IPV4_ADDR_SUBNET for ISAKMP
 }
 
+Pekka Nikander <pekka.nikander[AT]nomadiclab.com> {
+	IEEE 802.1x, a/k/a EAPOL
+	PPP/EAPOL EAP support
+}
+
 Alain Magloire <alainm[AT]rcsm.ece.mcgill.ca> was kind enough to
 give his permission to use his version of snprintf.c.
 
diff --git a/Makefile.am b/Makefile.am
index 72454859fe..c0c743895b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
 # Makefile.am
 # Automake file for Ethereal
 #
-# $Id: Makefile.am,v 1.376 2001/11/06 13:43:44 girlich Exp $
+# $Id: Makefile.am,v 1.377 2001/11/06 20:30:38 guy Exp $
 #
 # Ethereal - Network traffic analyzer
 # By Gerald Combs <gerald@ethereal.com>
@@ -108,6 +108,8 @@ DISSECTOR_SRC = \
 	packet-dns.c   \
 	packet-dsi.c   \
 	packet-dvmrp.c \
+	packet-eap.c \
+	packet-eapol.c \
 	packet-eigrp.c \
 	packet-esis.c  \
 	packet-eth.c   \
diff --git a/Makefile.nmake b/Makefile.nmake
index 7e9915aa13..d7498b5365 100644
--- a/Makefile.nmake
+++ b/Makefile.nmake
@@ -1,7 +1,7 @@
 ## Makefile for building ethereal.exe with Microsoft C and nmake
 ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake
 #
-# $Id: Makefile.nmake,v 1.137 2001/11/06 13:43:44 girlich Exp $
+# $Id: Makefile.nmake,v 1.138 2001/11/06 20:30:39 guy Exp $
 
 include config.nmake
 include <win32.mak>
@@ -59,6 +59,8 @@ DISSECTOR_SRC = \
 	packet-dns.c   \
 	packet-dsi.c   \
 	packet-dvmrp.c \
+	packet-eapol.c \
+	packet-eap.c \
 	packet-eigrp.c \
 	packet-esis.c  \
 	packet-eth.c   \
diff --git a/doc/ethereal.pod.template b/doc/ethereal.pod.template
index 0dc688b4c0..a009ca1410 100644
--- a/doc/ethereal.pod.template
+++ b/doc/ethereal.pod.template
@@ -1212,6 +1212,7 @@ B<http://www.ethereal.com>.
   Andrew C. Feren          <aferen[AT]cetacean.com>
   Tomas Kukosa             <tomas.kukosa[AT]anfdata.cz>
                            <a.stockmeier[AT]avm.de>
+  Pekka Nikander           <pekka.nikander[AT]nomadiclab.com>
 
 Alain Magloire <alainm[AT]rcsm.ece.mcgill.ca> was kind enough to give his
 permission to use his version of snprintf.c.
diff --git a/etypes.h b/etypes.h
index e1c5afaf62..f9bde01437 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.21 2001/06/14 20:37:07 guy Exp $
+ * $Id: etypes.h,v 1.22 2001/11/06 20:30:39 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -164,6 +164,10 @@
 #define ETHERTYPE_PPPOES	0x8864	/* PPPoE Session Protocol */
 #endif
 
+#ifndef ETHERTYPE_EAPOL
+#define ETHERTYPE_EAPOL 	0x888e  /* 802.1x 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-eap.c b/packet-eap.c
new file mode 100644
index 0000000000..176671fd22
--- /dev/null
+++ b/packet-eap.c
@@ -0,0 +1,156 @@
+/* packet-eap.c
+ * Routines for EAP Extensible Authentication Protocol header disassembly
+ *
+ * $Id: packet-eap.c,v 1.1 2001/11/06 20:30:39 guy Exp $
+ *
+ * Ethereal - Network traffic analyzer
+ * By Gerald Combs <gerald@ethereal.com>
+ * Copyright 1998 Gerald Combs
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+
+#ifdef HAVE_NETINET_IN_H
+# include <netinet/in.h>
+#endif
+
+#include <glib.h>
+#include "packet.h"
+#include "packet-ieee8023.h"
+#include "packet-ipx.h"
+#include "packet-llc.h"
+#include "etypes.h"
+#include "ppptypes.h"
+
+static int proto_eap = -1;
+static int hf_eap_code = -1;
+static int hf_eap_identifier = -1;
+static int hf_eap_len = -1;
+static int hf_eap_type = -1;
+
+static gint ett_eap = -1;
+
+typedef struct _e_eap {
+    guint8 eap_code;
+    guint8 eap_id;
+    guint16 eap_len;
+} e_eap;
+
+static const char *eap_code_name[] = { 
+    "Undefined",
+    "Request",
+    "Response",
+    "Success",
+    "Failure",
+};
+#define EAP_CODE_COUNT (sizeof(eap_code_name)/sizeof(eap_code_name[0]))
+
+static const char *eap_type_name[] = { 
+    "Undefined",
+    "Identity",
+    "Nak (Response only)",
+    "MD5-Challenge",
+    "One-Time Password",
+    "Generic Token Card",
+};
+#define EAP_TYPE_COUNT (sizeof(eap_type_name)/sizeof(eap_type_name[0]))
+
+
+void
+dissect_eap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
+{
+  e_eap       eaph;
+  guint       len;
+  proto_tree *ti;
+  proto_tree *volatile eap_tree;
+
+  if (check_col(pinfo->fd, COL_PROTOCOL))
+    col_set_str(pinfo->fd, COL_PROTOCOL, "EAP");
+  if (check_col(pinfo->fd, COL_INFO))
+    col_clear(pinfo->fd, COL_INFO);
+
+  tvb_memcpy(tvb, (guint8 *)&eaph, 0, sizeof(eaph));
+  eaph.eap_len = ntohs(eaph.eap_len);
+
+  len = eaph.eap_len;
+
+  set_actual_length(tvb, pinfo, len);
+
+  eap_tree = NULL;
+
+  if (tree) {
+    ti = proto_tree_add_item(tree, proto_eap, tvb, 0, len, FALSE);
+    eap_tree = proto_item_add_subtree(ti, ett_eap);
+
+    proto_tree_add_text(eap_tree, tvb, 0, 0, "Code: %s (%u) ", 
+			eaph.eap_code > EAP_CODE_COUNT?
+			"Unknown": eap_code_name[eaph.eap_code],
+			eaph.eap_code);
+
+    proto_tree_add_uint(eap_tree, hf_eap_identifier, tvb, 1, 1, eaph.eap_id);
+    proto_tree_add_uint(eap_tree, hf_eap_len,    tvb, 2, 2, eaph.eap_len);
+
+    if (len > 4) {
+	guint8 eap_type = tvb_get_guint8(tvb, 4);
+	proto_tree_add_text(eap_tree, tvb, 4, 1, "Type: %s (%u)", 
+			    eap_type > EAP_TYPE_COUNT?
+			    "Unknown" : eap_type_name[eap_type],
+			    eap_type);
+    }
+    if (len > 5)
+      dissect_data(tvb, 5, pinfo, tree);
+  }
+}
+
+void
+proto_register_eap(void)
+{
+  static hf_register_info hf[] = {
+	{ &hf_eap_code, { 
+		"Code", "eap.code", FT_UINT8, BASE_DEC, 
+		NULL, 0x0, "", HFILL }},
+	{ &hf_eap_identifier, {
+		"Id", "eap.id", FT_UINT8, BASE_DEC,
+		NULL, 0x0, "", HFILL }},
+	{ &hf_eap_len, {
+		"Length", "eap.len", FT_UINT16, BASE_DEC,
+		NULL, 0x0, "", HFILL }},
+	{ &hf_eap_type, { 
+		"Type", "eap.type", FT_UINT8, BASE_DEC, 
+		NULL, 0x0, "", HFILL }},
+  };
+  static gint *ett[] = {
+	&ett_eap,
+  };
+
+  proto_eap = proto_register_protocol("Extensible Authentication Protocol", 
+				      "EAP", "eap");
+  proto_register_field_array(proto_eap, hf, array_length(hf));
+  proto_register_subtree_array(ett, array_length(ett));
+}
+
+void
+proto_reg_handoff_eap(void)
+{
+  dissector_add("ppp.protocol", PPP_EAP, dissect_eap, proto_eap);
+}
diff --git a/packet-eapol.c b/packet-eapol.c
new file mode 100644
index 0000000000..3e6a1b8e0c
--- /dev/null
+++ b/packet-eapol.c
@@ -0,0 +1,139 @@
+/* packet-eapol.c
+ * Routines for EAPOL 802.1X authentication header disassembly
+ *
+ * $Id: packet-eapol.c,v 1.1 2001/11/06 20:30:39 guy Exp $
+ *
+ * Ethereal - Network traffic analyzer
+ * By Gerald Combs <gerald@ethereal.com>
+ * Copyright 1998 Gerald Combs
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+
+#ifdef HAVE_NETINET_IN_H
+# include <netinet/in.h>
+#endif
+
+#include <glib.h>
+#include "packet.h"
+#include "packet-ieee8023.h"
+#include "packet-ipx.h"
+#include "packet-llc.h"
+#include "etypes.h"
+
+static int proto_eapol = -1;
+static int hf_eapol_version = -1;
+static int hf_eapol_type = -1;
+static int hf_eapol_len = -1;
+
+static gint ett_eapol = -1;
+
+typedef struct _e_eapol
+{
+    guint8 eapol_ver;
+    guint8 eapol_type;
+    guint16 eapol_len;
+} e_eapol;
+
+static const char *eapol_type_name[] = { 
+    "EAP",
+    "Start",
+    "Logoff",
+    "Key",
+    "Encapsulated ASF Alert"
+};
+#define EAPOL_TYPE_COUNT (sizeof(eapol_type_name)/sizeof(eapol_type_name[0]))
+
+extern void dissect_eap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
+
+static void
+dissect_eapol(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
+{
+  e_eapol     eapolh;
+  guint       len;
+  proto_tree *ti;
+  proto_tree *volatile eapol_tree;
+  tvbuff_t   *next_tvb;
+
+  if (check_col(pinfo->fd, COL_PROTOCOL))
+    col_set_str(pinfo->fd, COL_PROTOCOL, "EAPOL");
+  if (check_col(pinfo->fd, COL_INFO))
+    col_clear(pinfo->fd, COL_INFO);
+
+  tvb_memcpy(tvb, (guint8 *)&eapolh, 0, sizeof(eapolh));
+  eapolh.eapol_len = ntohs(eapolh.eapol_len);
+
+  len = sizeof(eapolh) + eapolh.eapol_len;
+
+  set_actual_length(tvb, pinfo, len);
+
+  eapol_tree = NULL;
+
+  if (tree) {
+    ti = proto_tree_add_item(tree, proto_eapol, tvb, 0, len, FALSE);
+    eapol_tree = proto_item_add_subtree(ti, ett_eapol);
+
+    proto_tree_add_uint(eapol_tree, hf_eapol_version, tvb, 0, 1, eapolh.eapol_ver);
+    proto_tree_add_text(eapol_tree, tvb, 1, 1, "Type: %s (%u)", 
+			eapolh.eapol_type > EAPOL_TYPE_COUNT?
+			"Unknown" : eapol_type_name[eapolh.eapol_type],
+			eapolh.eapol_type);
+    proto_tree_add_uint(eapol_tree, hf_eapol_len,    tvb, 2, 2, eapolh.eapol_len);
+  }
+
+  next_tvb = tvb_new_subset(tvb, 4, -1, -1);
+
+  if (eapolh.eapol_type == 0 && next_tvb != NULL) 
+      dissect_eap(next_tvb, pinfo, eapol_tree);
+  else
+      dissect_data(tvb, 4, pinfo, tree);
+}
+
+void
+proto_register_eapol(void)
+{
+  static hf_register_info hf[] = {
+	{ &hf_eapol_version, { 
+		"Version", "eapol.version", FT_UINT8, BASE_DEC, 
+		NULL, 0x0, "", HFILL }},
+	{ &hf_eapol_type, { 
+		"Type", "eapol.type", FT_UINT8, BASE_DEC, 
+		0, 0x0, "", HFILL }},
+	{ &hf_eapol_len, {
+		"Length", "eapol.len", FT_UINT16, BASE_DEC,
+		NULL, 0x0, "Length", HFILL }},
+  };
+  static gint *ett[] = {
+	&ett_eapol,
+  };
+
+  proto_eapol = proto_register_protocol("802.1x Authentication", "EAPOL", "eapol");
+  proto_register_field_array(proto_eapol, hf, array_length(hf));
+  proto_register_subtree_array(ett, array_length(ett));
+}
+
+void
+proto_reg_handoff_eapol(void)
+{
+  dissector_add("ethertype", ETHERTYPE_EAPOL, dissect_eapol, proto_eapol);
+}
diff --git a/packet-ethertype.c b/packet-ethertype.c
index b7ebdf2758..fd0d8e8e6d 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.18 2001/06/16 00:54:33 guy Exp $
+ * $Id: packet-ethertype.c,v 1.19 2001/11/06 20:30:39 guy Exp $
  *
  * Gilbert Ramirez <gram@xiexie.org>
  *
@@ -61,6 +61,7 @@ const value_string etype_vals[] = {
     {ETHERTYPE_PPPOED,		"PPPoE Discovery"		}, 
     {ETHERTYPE_PPPOES,		"PPPoE Session"			}, 
     {ETHERTYPE_VLAN,		"802.1Q Virtual LAN"		},
+    {ETHERTYPE_EAPOL,		"802.1X Authentication"         },
     {ETHERTYPE_MPLS,		"MPLS label switched packet"	},
     {ETHERTYPE_MPLS_MULTI,	"MPLS multicast label switched packet" },
     {ETHERTYPE_3C_NBP_DGRAM,	"3Com NBP Datagram"		},