Ethereal-dev: Re: [Ethereal-dev] EAPOL / EAP

Note: This archive is from the project's previous web site, ethereal.com. This list is no longer active.

From: Yannick Koehler <yannick.koehler@xxxxxxxxxxxx>
Date: Wed, 06 Feb 2002 18:17:52 -0500
Guy Harris wrote:
It says that the EAP Authentication = 4 is 'One Time Password' when in fact that's value 5. The value 4 is 'MD5 Password'.


Everything after "Identity" is wrong, in fact.

I've checked in a fix, and attached a patch with that fix.


------------------------------------------------------------------------

Index: packet-eap.c
===================================================================
RCS file: /usr/local/cvsroot/ethereal/packet-eap.c,v
retrieving revision 1.5
diff -c -r1.5 packet-eap.c
*** packet-eap.c	2002/01/21 07:36:34	1.5
--- packet-eap.c	2002/02/06 22:44:56
***************
*** 58,83 ****
      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)
  {
--- 58,81 ----
      guint16 eap_len;
  } e_eap;
! static const value_string eap_code_vals[] = { ! { 1, "Request" },
!     { 2, "Response" },
!     { 3, "Success" },
!     { 4, "Failure" },
!     { 0, NULL }
  };
! static const value_string eap_type_vals[] = { ! { 1, "Identity" },
!     { 2, "Notification" },
!     { 3, "Nak (Response only)" },
!     { 4, "MD5-Challenge" },
!     { 5, "One-Time Password" },
!     { 6, "Generic Token Card" },
!     { 0, NULL }
  };
void
  dissect_eap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
  {
***************
*** 104,112 ****
      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);
--- 102,109 ----
      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) ",
! 			val_to_str(eaph.eap_code, eap_code_vals, "Unknown"),
  			eaph.eap_code);
proto_tree_add_uint(eap_tree, hf_eap_identifier, tvb, 1, 1, eaph.eap_id);
***************
*** 115,122 ****
      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)
--- 112,118 ----
      if (len > 4) {
  	guint8 eap_type = tvb_get_guint8(tvb, 4);
proto_tree_add_text(eap_tree, tvb, 4, 1, "Type: %s (%u)", ! val_to_str(eap_type, eap_type_vals, "Unknown"),
  			    eap_type);
      }
      if (len > 5)


This means 0.9.2 will contains the fix?

great.