diff options
| author | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2016-02-23 09:38:39 +0100 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2016-02-25 12:44:31 +0000 |
| commit | 2485440cd1310bf18cc337d650a68f030ab78846 (patch) | |
| tree | 7b44c6057e3b1720a8e443e2b22a9f70ab38e6fc /epan/dissectors/packet-gre.c | |
| parent | fe1de0146e607652333e729d6c11f43584744785 (diff) | |
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>
Diffstat (limited to 'epan/dissectors/packet-gre.c')
| -rw-r--r-- | epan/dissectors/packet-gre.c | 2 |
1 files changed, 1 insertions, 1 deletions
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: |