diff options
author | Guy Harris <guy@alum.mit.edu> | 2014-05-29 10:56:46 -0700 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2014-05-29 17:57:14 +0000 |
commit | 21a1208735315a3a67e8a66ae6b5cb2776be6d60 (patch) | |
tree | 807403b835dc9b64e636128ad39397e3c8b358f6 /epan/dissectors/packet-peekremote.c | |
parent | 8b6c4e71ad5dec0318dc9fac9fcd710a25b5e449 (diff) |
Introduce 802.11 dissectors with wired-in "FCS present" indications.
For a number of protocols that encapsulate 802.11 frames inside packets,
whether the frame includes an FCS or not is specified by the protocol,
not by whether the link-layer frame carrying the packets *itself*
includes an FCS. As we've done with Ethernet, add "_withfcs" and
"_withoutfcs" dissectors, which *don't* check the pseudo-header FCS
length indication, and call those, rather than dissectors that check the
pseudo-header length indication, from the dissectors for those protocols.
Change-Id: Ib8c8ecdd872e1782fdfc66e7573415d91911a62e
Reviewed-on: https://code.wireshark.org/review/1866
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'epan/dissectors/packet-peekremote.c')
-rw-r--r-- | epan/dissectors/packet-peekremote.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/epan/dissectors/packet-peekremote.c b/epan/dissectors/packet-peekremote.c index 42be430875..be4e32e913 100644 --- a/epan/dissectors/packet-peekremote.c +++ b/epan/dissectors/packet-peekremote.c @@ -450,7 +450,6 @@ dissect_peekremote_new(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void proto_item_set_end(ti, tvb, offset); next_tvb = tvb_new_subset_remaining(tvb, offset); - pinfo->pseudo_header->ieee_802_11.fcs_len = 4; call_dissector(ieee80211_handle, next_tvb, pinfo, tree); return TRUE; } @@ -492,7 +491,6 @@ dissect_peekremote_legacy(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, v } proto_item_set_end(ti, tvb, 20); next_tvb = tvb_new_subset_remaining(tvb, 20); - pinfo->pseudo_header->ieee_802_11.fcs_len = 4; return 20 + call_dissector(ieee80211_handle, next_tvb, pinfo, tree); } @@ -575,7 +573,7 @@ proto_reg_handoff_peekremote(void) { dissector_handle_t peekremote_handle; - ieee80211_handle = find_dissector("wlan_datapad"); + ieee80211_handle = find_dissector("wlan_datapad_withfcs"); peekremote_handle = new_create_dissector_handle(dissect_peekremote_legacy, proto_peekremote); dissector_add_uint("udp.port", 5000, peekremote_handle); |