osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

More wlan_mgt cleanup: 

- Fix test script to use wlan instead of wlan_mgt
  - Remove a now useless test in the dissector

Change-Id: I9a7644947c3002c759a7ae5728a8559682cfd4fd
Reviewed-on: https://code.wireshark.org/review/18215
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
This commit is contained in:
Joerg Mayer 2016-10-16 15:58:09 +02:00 committed by Jörg Mayer
parent 9711d2220c
commit 95c944884a
2 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
epan/dissectors/packet-ieee80211.c
View File

@ -16119,12 +16119,6 @@ dissect_ieee80211_mgt(guint16 fcf, tvbuff_t *tvb, packet_info *pinfo, proto_tree
ieee80211_tvb_invalid = FALSE;
/* check protocol activation */
if (!proto_is_protocol_enabled(find_protocol_by_id(proto_wlan))) {
call_data_dissector(tvb, pinfo, tree);
return;
}
ti = proto_tree_add_item(tree, proto_wlan, tvb, 0, -1, ENC_NA);
mgt_tree = proto_item_add_subtree(ti, ett_80211_mgt);

2
test/suite-decryption.sh
View File

@ -113,7 +113,7 @@ decryption_step_80211_wpa_psk_mfp() {
out=$($TESTS_DIR/run_and_catch_crashes env $TS_DC_ENV $TSHARK $TS_DC_ARGS \
-o "wlan.enable_decryption: TRUE" \
-r "$CAPTURE_DIR/wpa-test-decode-mgmt.pcap.gz" \
-Y "wlan_mgt.fixed.reason_code == 2 || wlan_mgt.fixed.category_code == 3" \
-Y "wlan.fixed.reason_code == 2 || wlan.fixed.category_code == 3" \
2>&1)
RETURNVALUE=$?
frames=$(echo "$out" | wc -l)