diff options
author | Guy Harris <guy@alum.mit.edu> | 2004-07-09 04:54:08 +0000 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2004-07-09 04:54:08 +0000 |
commit | be8fa3eaa35ab6e9e04f9b954eeaa766e2c9b4de (patch) | |
tree | be07efed041804d16e4beca8d1799f50f6f22534 /packet-ieee80211.c | |
parent | e4351bb3685bf47d92573cfe95f1cca797917ecf (diff) | |
download | wireshark-be8fa3eaa35ab6e9e04f9b954eeaa766e2c9b4de.tar.gz wireshark-be8fa3eaa35ab6e9e04f9b954eeaa766e2c9b4de.tar.bz2 wireshark-be8fa3eaa35ab6e9e04f9b954eeaa766e2c9b4de.zip |
From Solomon Peachy: fix the decoding of the Association ID in
management frames.
svn path=/trunk/; revision=11348
Diffstat (limited to 'packet-ieee80211.c')
-rw-r--r-- | packet-ieee80211.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/packet-ieee80211.c b/packet-ieee80211.c index 95f4b2736e..7406a1d912 100644 --- a/packet-ieee80211.c +++ b/packet-ieee80211.c @@ -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.115 2004/07/07 04:48:38 guy Exp $ + * $Id: packet-ieee80211.c,v 1.116 2004/07/09 04:54:08 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -767,7 +767,9 @@ add_fixed_field (proto_tree * tree, tvbuff_t * tvb, int offset, int lfcode) break; case FIELD_ASSOC_ID: - proto_tree_add_item (tree, ff_assoc_id, tvb, offset, 2, TRUE); + proto_tree_add_uint(tree, ff_assoc_id, tvb, offset, 2, + COOK_ASSOC_ID(tvb_get_letohs(tvb,offset))); + /* proto_tree_add_item (tree, ff_assoc_id, tvb, offset, 2, TRUE); */ break; case FIELD_STATUS_CODE: |