diff options
| author | Chris Maynard <Christopher.Maynard@GTECH.COM> | 2011-11-08 17:25:22 +0000 |
|---|---|---|
| committer | Chris Maynard <Christopher.Maynard@GTECH.COM> | 2011-11-08 17:25:22 +0000 |
| commit | d55d8781b88da7e4dfe94ee4fbb495ffa1df0f1e (patch) | |
| tree | dafa28c79b9a6815988bf26ebe7e5a1ce88e0487 /epan/dissectors/packet-gre.c | |
| parent | ea3cc6ae43ba30754f53a745dccfbed17bf8f1aa (diff) | |
Improve ICMP conversation tracking, especially when capturing on multiple interfaces and one of them is a GRE tunnel. Resolves bug 5770, which was reopened.
svn path=/trunk/; revision=39757
Diffstat (limited to 'epan/dissectors/packet-gre.c')
| -rw-r--r-- | epan/dissectors/packet-gre.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/epan/dissectors/packet-gre.c b/epan/dissectors/packet-gre.c index e278c7562d..944796f01b 100644 --- a/epan/dissectors/packet-gre.c +++ b/epan/dissectors/packet-gre.c @@ -495,6 +495,7 @@ dissect_gre(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) return; /* no payload */ } next_tvb = tvb_new_subset_remaining(tvb, offset); + pinfo->flags.in_gre_pkt = TRUE; if (!dissector_try_uint(gre_dissector_table, type, next_tvb, pinfo, tree)) call_dissector(data_handle,next_tvb, pinfo, gre_tree); } |