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

gtp: T-PDU heuristic - don't call the PPP dissector as "else" branch. 

Change-Id: Ibb3038f9aba5fa3dab098ec50e7c4070d3f1c534
Reviewed-on: https://code.wireshark.org/review/29200
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
This commit is contained in:
Anders 2018-08-20 15:38:35 +02:00 committed by Anders Broman
parent a956069961
commit f63e3535c5
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8825,7 +8825,6 @@ dissect_gtp_common(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
tvbuff_t *next_tvb;
guint8 sub_proto;
guint8 acfield_len = 0;
guint8 control_field;
gtp_msg_hash_t *gcrp = NULL;
conversation_t *conversation;
gtp_conv_info_t *gtp_info;
@ -9420,9 +9419,12 @@ dissect_gtp_common(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
next_tvb = tvb_new_subset_remaining(tvb, offset);
call_dissector(ipv6_handle, next_tvb, pinfo, tree);
} else {
#if 0
/* This turns out not to be true, remove the code and try to improve it if we get bug reports */
/* this seems to be a PPP packet */
if (sub_proto == 0xff) {
guint8 control_field;
/* this might be an address field, even it shouldn't be here */
control_field = tvb_get_guint8(tvb, offset + 1);
if (control_field == 0x03)
@ -9432,6 +9434,8 @@ dissect_gtp_common(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
next_tvb = tvb_new_subset_remaining(tvb, offset + acfield_len);
call_dissector(ppp_handle, next_tvb, pinfo, tree);
#endif
proto_tree_add_item(tree, hf_gtp_tpdu_data, tvb, offset, -1, ENC_NA);
}
}