diff options
| author | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2002-03-27 19:38:37 +0000 |
|---|---|---|
| committer | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2002-03-27 19:38:37 +0000 |
| commit | f38afc600063620ac818a36adb175816ae039e8a (patch) | |
| tree | 78af830af780c3383187e0c4695b29a2d192d5e5 /packet-eap.c | |
| parent | 5695f0bf103e889595777ba91e397171900015e3 (diff) | |
Cleanups from Adam Sulmicki.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@5028 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'packet-eap.c')
| -rw-r--r-- | packet-eap.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/packet-eap.c b/packet-eap.c index 64aad0826c..772a5cb0f7 100644 --- 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.22 2002/03/27 07:41:20 guy Exp $ + * $Id: packet-eap.c,v 1.23 2002/03/27 19:38:37 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -240,6 +240,7 @@ dissect_eap_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, col_clear(pinfo->cinfo, COL_INFO); eap_code = tvb_get_guint8(tvb, 0); + if (check_col(pinfo->cinfo, COL_INFO)) col_add_str(pinfo->cinfo, COL_INFO, val_to_str(eap_code, eap_code_vals, "Unknown code (0x%02X)")); @@ -413,14 +414,14 @@ dissect_eap_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, if (tree) proto_tree_add_text(eap_tree, tvb, offset, 1, "Flags(0x%X): %s%s%s", flags, - has_length ? "Length " : "", - more_fragments ? "More " : "", - test_flag(flags,EAP_TLS_FLAG_S) ? "Start " : ""); + has_length ? "Length ":"", + more_fragments ? "More " :"", + test_flag(flags,EAP_TLS_FLAG_S) ? "Start " :""); size--; offset++; /* Length field, 4 bytes, OPTIONAL. */ - if ( test_flag(flags, EAP_TLS_FLAG_L) ) { + if ( has_length ) { length = tvb_get_ntohl(tvb, offset); if (tree) proto_tree_add_text(eap_tree, tvb, offset, 4, "Length: %i",length); |