Update a URL.

[obnox/wireshark/wip.git] / packet-eap.c

diff --git a/packet-eap.c b/packet-eap.c
index 3a2448d8b1d0c8b1ea8a543be37bbe426c82421e..2a1bc999df4bc0683ba20bef565fc78b6549c63d 100644 (file)
--- a/packet-eap.c
+++ b/packet-eap.c
@@ -2,7 +2,7 @@
  * Routines for EAP Extensible Authentication Protocol dissection
  * RFC 2284
  *
- * $Id: packet-eap.c,v 1.29 2002/09/07 23:49:58 sahlberg Exp $
+ * $Id: packet-eap.c,v 1.34 2003/04/20 11:36:13 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -86,7 +86,7 @@ static const value_string eap_type_vals[] = {
   { 12,          "KEA-VALIDATE [Nace]" },
   {EAP_TYPE_TLS, "EAP-TLS [RFC2716] [Aboba]" },
   { 14,          "Defender Token (AXENT) [Rosselli]" },
-  { 15,          "Windows 2000 EAP [Asnes]" },
+  { 15,          "RSA Security SecurID EAP [Asnes, Liberman]" },
   { 16,          "Arcot Systems EAP [Jerdonek]" },
   {EAP_TYPE_LEAP,"EAP-Cisco Wireless (LEAP) [Norman]" },
   { 18,          "Nokia IP smart card authentication [Haverinen]" },
@@ -104,6 +104,15 @@ static const value_string eap_type_vals[] = {
   { 30,          "DynamID [Merlin]" },
   { 31,          "Rob EAP [Ullah]" },
   { 32,          "SecurID EAP [Josefsson]" },
+  { 33,          "MS-Authentication-TLV [Palekar]" },
+  { 34,          "SentriNET [Kelleher]" },
+  { 35,          "EAP-Actiontec Wireless [Chang]" },
+  { 36,          "Cogent Systems Biometrics Authentication EAP [Xiong]" },
+  { 37,          "AirFortress EAP [Hibbard]" },
+  { 38,          "EAP-HTTP Digest [Tavakoli]" },
+  { 39,          "SecureSuite EAP [Clements]" },
+  { 40,          "DeviceConnect EAP [Pitard]" },
+  { 41,          "EAP-SPEKE [Zick]" },
   { 255,         "Vendor-specific [draft-ietf-pppext-rfc2284bis-02.txt]" },
   { 0,          NULL }
 
@@ -194,7 +203,7 @@ static int   hf_eaptls_fragment_error = -1;
 static gint ett_eaptls_fragment  = -1;
 static gint ett_eaptls_fragments = -1;
 
-fragment_items eaptls_frag_items = {
+static const fragment_items eaptls_frag_items = {
        &ett_eaptls_fragment,
        &ett_eaptls_fragments,
        &hf_eaptls_fragments,
@@ -204,6 +213,7 @@ fragment_items eaptls_frag_items = {
        &hf_eaptls_fragment_multiple_tails,
        &hf_eaptls_fragment_too_long_fragment,
        &hf_eaptls_fragment_error,
+       NULL,
        "fragments"
 };
 
@@ -415,8 +425,7 @@ dissect_eap_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
       case EAP_TYPE_NAK:
        if (tree) {
          proto_tree_add_item(eap_tree, hf_eap_type_nak, tvb,
-                             offset, 1, TRUE);
-         offset++;
+                             offset, 1, FALSE);
        }
        break;
       /*********************************************************************
@@ -811,7 +820,7 @@ proto_register_eap(void)
                VALS(eap_type_vals), 0x0, "", HFILL }},
        { &hf_eaptls_fragment,
          { "EAP-TLS Fragment", "eaptls.fragment",
-               FT_NONE, BASE_NONE, NULL, 0x0,
+               FT_FRAMENUM, BASE_NONE, NULL, 0x0,
                "EAP-TLS Fragment", HFILL }},
        { &hf_eaptls_fragments,
          { "EAP-TLS Fragments", "eaptls.fragments",
@@ -835,7 +844,7 @@ proto_register_eap(void)
                "Fragment contained data past end of packet", HFILL }},
        { &hf_eaptls_fragment_error,
          { "Defragmentation error", "eaptls.fragment.error",
-               FT_NONE, BASE_NONE, NULL, 0x0,
+               FT_FRAMENUM, BASE_NONE, NULL, 0x0,
                "Defragmentation error due to illegal fragments", HFILL }},
   };
   static gint *ett[] = {