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

GRE: call ID not always decoded 

Always decode Call ID (and payload length) when Version is Enhanced GRE (and no ACK flag)

Issue reported by Duncan Salerno

Bug:12149
Change-Id: I2f61dd6851e26cc93174f96e05c0055fc45be4e2
Reviewed-on: https://code.wireshark.org/review/14088
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
This commit is contained in:
Alexis La Goutte 2016-02-23 09:38:39 +01:00 committed by Michael Mann
parent fe1de0146e
commit 2485440cd1
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
epan/dissectors/packet-gre.c
View File

@ -344,7 +344,7 @@ dissect_gre(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
switch (type) {
case ETHERTYPE_PPP:
if (flags_and_ver & GRE_ACK)
if (flags_and_ver & GRE_VERSION)
is_ppp = TRUE;
break;
case ETHERTYPE_3GPP2: