osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

wsp: Remove lwm2m.dm length check 

Remove length check when detected x-wap lwm2m.dm because the CoAP
message is not always 15 bytes.

Change-Id: Ib1e58a997a906a6723abae6f86fe4306bd5061c6
Reviewed-on: https://code.wireshark.org/review/36310
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
This commit is contained in:
Stig Bjørlykke 2020-03-06 08:25:58 +01:00 committed by Anders Broman
parent a58b398461
commit b31e9f3e20
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
epan/dissectors/packet-wsp.c
View File

@ -5008,14 +5008,13 @@ dissect_wsp_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
}
if (! found_match){
/*
* Try to dissect x-wap-application lwm2m.dm data as COaP
* Try to dissect x-wap-application lwm2m.dm data as CoAP
* see docs: (page 141)
* http://www.openmobilealliance.org/release/LightweightM2M/V1_0_2-20180209-A/OMA-TS-LightweightM2M-V1_0_2-20180209-A.pdf
* header bytes should be: 0xAF, 0x9A
*/
if (tvb_get_guint8(tvb, headerStart + headerLength - 1) == 0xAF && /* x-wap app id */
tvb_get_guint8(tvb, headerStart + headerLength) == 0x9A && /* x-wap app lwm2m.dm */
tvb_reported_length(tmp_tvb) == 15 ){
tvb_get_guint8(tvb, headerStart + headerLength) == 0x9A) { /* x-wap app lwm2m.dm */
call_dissector(coap_handle, tmp_tvb, pinfo, tree);
} else if (! dissector_try_heuristic(heur_subdissector_list,