osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

From Jouni Malinen: 

Fix offset of challenge element in 802.11 dissector.
	Show fragmented 802.11 frames as fragments.

svn path=/trunk/; revision=5151
This commit is contained in:
Guy Harris 2002-04-13 18:41:47 +00:00
parent c3b66ffa9c
commit 2309234678
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
AUTHORS
View File

@ -1102,6 +1102,8 @@ Alex Ruzin <alexr[AT]nbase.co.il> {
Jouni Malinen <jkmaline[AT]cc.hut.fi> {
802.11 authentication frame dissection bug fix
Fix offset of challenge element in 802.11 dissector
Show fragmented 802.11 frames as fragments
}
Paul E. Erkkila <pee[AT]erkkila.org> {

14
packet-ieee80211.c
View File

@ -3,7 +3,7 @@
* Copyright 2000, Axis Communications AB
* Inquiries/bugreports should be sent to Johan.Jorgensen@axis.com
*
* $Id: packet-ieee80211.c,v 1.53 2002/04/08 09:09:47 guy Exp $
* $Id: packet-ieee80211.c,v 1.54 2002/04/13 18:41:47 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -815,8 +815,8 @@ add_tagged_field (proto_tree * tree, tvbuff_t * tvb, int offset)
proto_tree_add_uint (tree, tag_length, tvb, offset + 1, 1, tag_len);
memset (out_buff, 0, SHORT_STR);
snprintf (out_buff, SHORT_STR, "Challenge text: %.47s", tag_data_ptr);
proto_tree_add_string (tree, tag_interpretation, tvb, offset, tag_len,
out_buff);
proto_tree_add_string (tree, tag_interpretation, tvb, offset + 2,
tag_len, out_buff);
break;
@ -1559,6 +1559,14 @@ dissect_ieee80211_common (tvbuff_t * tvb, packet_info * pinfo,
}
ENDTRY;
if (COOK_FRAGMENT_NUMBER(tvb_get_letohs(tvb, 22)) > 0) {
/* Just show this as a fragment. */
if (check_col(pinfo->cinfo, COL_INFO))
col_add_fstr(pinfo->cinfo, COL_INFO, "Fragmented IEEE 802.11 frame");
call_dissector(data_handle, next_tvb, pinfo, tree);
break;
}
if (is_802_2)
call_dissector(llc_handle, next_tvb, pinfo, tree);
else