diff options
| author | Guy Harris <guy@alum.mit.edu> | 2015-06-29 21:43:40 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2015-06-30 04:44:34 +0000 |
| commit | 74338f5e5cfde51170a0492a2663c465fdc70168 (patch) | |
| tree | 5adb544ed7ae15519d02c7943ebb4b28c069b64d | |
| parent | 2325550c0d82288c2957212282fd5e1211c53ad8 (diff) | |
| download | wireshark-74338f5e5cfde51170a0492a2663c465fdc70168.tar.gz | |
Set the PHY value when providing our own metadata structure.
Bug: 11319
Change-Id: I8b746f7238729173b2ca23734e9f7fdbbe4f5110
Reviewed-on: https://code.wireshark.org/review/9232
Reviewed-by: Guy Harris <guy@alum.mit.edu>
| -rw-r--r-- | epan/dissectors/packet-ieee80211.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c index b63713761c..ae7c4112dc 100644 --- a/epan/dissectors/packet-ieee80211.c +++ b/epan/dissectors/packet-ieee80211.c @@ -18443,6 +18443,7 @@ dissect_ieee80211 (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *da ourphdr.fcs_len = -1; ourphdr.decrypted = FALSE; ourphdr.datapad = FALSE; + ourphdr.phy = PHDR_802_11_PHY_UNKNOWN; ourphdr.presence_flags = 0; phdr = &ourphdr; } @@ -18462,6 +18463,7 @@ dissect_ieee80211_withfcs (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) phdr.fcs_len = 4; phdr.decrypted = FALSE; phdr.datapad = FALSE; + phdr.phy = PHDR_802_11_PHY_UNKNOWN; phdr.presence_flags = 0; dissect_ieee80211_common (tvb, pinfo, tree, FALSE, FALSE, FALSE, &phdr); } @@ -18479,6 +18481,7 @@ dissect_ieee80211_withoutfcs (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre phdr.fcs_len = 0; phdr.decrypted = FALSE; phdr.datapad = FALSE; + phdr.phy = PHDR_802_11_PHY_UNKNOWN; phdr.presence_flags = 0; dissect_ieee80211_common (tvb, pinfo, tree, FALSE, FALSE, FALSE, &phdr); } @@ -18495,6 +18498,7 @@ dissect_ieee80211_centrino(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) phdr.fcs_len = 0; phdr.decrypted = FALSE; phdr.datapad = FALSE; + phdr.phy = PHDR_802_11_PHY_UNKNOWN; phdr.presence_flags = 0; dissect_ieee80211_common (tvb, pinfo, tree, FALSE, FALSE, TRUE, &phdr); } @@ -18513,6 +18517,7 @@ dissect_ieee80211_bsfc (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) phdr.fcs_len = 0; phdr.decrypted = FALSE; phdr.datapad = FALSE; + phdr.phy = PHDR_802_11_PHY_UNKNOWN; phdr.presence_flags = 0; dissect_ieee80211_common (tvb, pinfo, tree, FALSE, TRUE, FALSE, &phdr); } @@ -18530,6 +18535,7 @@ dissect_ieee80211_fixed (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) phdr.fcs_len = 0; phdr.decrypted = FALSE; phdr.datapad = FALSE; + phdr.phy = PHDR_802_11_PHY_UNKNOWN; phdr.presence_flags = 0; dissect_ieee80211_common (tvb, pinfo, tree, TRUE, FALSE, FALSE, &phdr); } |