1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
|
$NetBSD: patch-aa,v 1.15 2005/07/13 10:01:53 drochner Exp $
--- epan/dissectors/packet-radiotap.c.orig 2005-07-12 17:36:14.000000000 +0200
+++ epan/dissectors/packet-radiotap.c
@@ -397,6 +397,7 @@ dissect_radiotap(tvbuff_t *tvb, packet_i
offset++;
break;
case IEEE80211_RADIOTAP_CHANNEL:
+ offset = (offset + 1) & ~1;
if (tree) {
freq = tvb_get_letohs(tvb, offset);
flags = tvb_get_letohs(tvb, offset+2);
@@ -412,12 +413,14 @@ dissect_radiotap(tvbuff_t *tvb, packet_i
case IEEE80211_RADIOTAP_LOCK_QUALITY:
case IEEE80211_RADIOTAP_TX_ATTENUATION:
case IEEE80211_RADIOTAP_DB_TX_ATTENUATION:
+ offset = (offset + 1) & ~1;
#if 0
tvb_get_letohs(tvb, offset);
#endif
offset+=2;
break;
case IEEE80211_RADIOTAP_TSFT:
+ offset = (offset + 7) & ~7;
if (tree) {
proto_tree_add_item(radiotap_tree, hf_radiotap_mactime,
tvb, offset, 8, FALSE);
|