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

GSUP: remove the tree check 

It prevents the call of the sub dissector and an update of the columns /
expert infos in the first pass.

Change-Id: I016342ad168766bc275ffd3bf47df271755aa65d
Reviewed-on: https://code.wireshark.org/review/32390
Petri-Dish: Pascal Quantin <pascal@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
This commit is contained in:
Pascal Quantin 2019-03-12 12:58:03 +01:00
parent e3ae91e4c6
commit fbb5761250
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
epan/dissectors/packet-gsm_gsup.c
View File

@ -686,17 +686,15 @@ dissect_gsup(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_
str = val_to_str(msg_type, gsup_msg_types, "Unknown GSUP Message Type 0x%02x");
col_append_fstr(pinfo->cinfo, COL_INFO, "%s ", str);
if (tree) {
ti = proto_tree_add_protocol_format(tree, proto_gsup, tvb, 0, len, "GSUP %s", str);
gsup_tree = proto_item_add_subtree(ti, ett_gsup);
ti = proto_tree_add_protocol_format(tree, proto_gsup, tvb, 0, len, "GSUP %s", str);
gsup_tree = proto_item_add_subtree(ti, ett_gsup);
proto_tree_add_item(gsup_tree, hf_gsup_msg_type,
tvb, offset, 1, ENC_BIG_ENDIAN);
offset++;
proto_tree_add_item(gsup_tree, hf_gsup_msg_type,
tvb, offset, 1, ENC_BIG_ENDIAN);
offset++;
dissect_gsup_tlvs(tvb, offset, tvb_reported_length_remaining(tvb, offset), pinfo,
gsup_tree, ti, msg_type);
}
dissect_gsup_tlvs(tvb, offset, tvb_reported_length_remaining(tvb, offset), pinfo,
gsup_tree, ti, msg_type);
return tvb_captured_length(tvb);
}