From 2485440cd1310bf18cc337d650a68f030ab78846 Mon Sep 17 00:00:00 2001 From: Alexis La Goutte Date: Tue, 23 Feb 2016 09:38:39 +0100 Subject: 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 Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann --- epan/dissectors/packet-gre.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'epan/dissectors/packet-gre.c') diff --git a/epan/dissectors/packet-gre.c b/epan/dissectors/packet-gre.c index 6c44314627..ae0e7a12e8 100644 --- a/epan/dissectors/packet-gre.c +++ b/epan/dissectors/packet-gre.c @@ -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: -- cgit v1.2.3