diff options
| author | Guy Harris <guy@alum.mit.edu> | 1999-12-14 00:27:29 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 1999-12-14 00:27:29 +0000 |
| commit | a20a427b9e6924574b8950675271148688e272f6 (patch) | |
| tree | 70a22470932187d9c00c15a3bfe2f660a4b3b642 /packet-gre.c | |
| parent | 0c4067f31efba31c163b2d5b276ce927b887da94 (diff) | |
| download | wireshark-a20a427b9e6924574b8950675271148688e272f6.tar.gz wireshark-a20a427b9e6924574b8950675271148688e272f6.tar.bz2 wireshark-a20a427b9e6924574b8950675271148688e272f6.zip | |
Merge Jerry's version with a version I'd done.
svn path=/trunk/; revision=1317
Diffstat (limited to 'packet-gre.c')
| -rw-r--r-- | packet-gre.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/packet-gre.c b/packet-gre.c index fa4e82d252..f7a8b2146d 100644 --- a/packet-gre.c +++ b/packet-gre.c @@ -2,7 +2,7 @@ * Routines for the Generic Routing Encapsulation (GRE) protocol * Brad Robel-Forrest <brad.robel-forrest@watchguard.com> * - * $Id: packet-gre.c,v 1.12 1999/12/12 03:05:56 guy Exp $ + * $Id: packet-gre.c,v 1.13 1999/12/14 00:27:29 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@unicom.net> @@ -198,17 +198,18 @@ dissect_gre(const u_char *pd, int offset, frame_data *fd, proto_tree *tree) { } } - if (is_wccp2) { - proto_tree_add_text(gre_tree, offset, sizeof(guint32), "WCCPv2 Data"); - offset += 4; - } - switch (type) { case GRE_PPP: - dissect_payload_ppp(pd, offset, fd, tree); + dissect_payload_ppp(pd, offset, fd, tree); break; case GRE_IP: + dissect_ip(pd, offset, fd, tree); + break; case GRE_WCCP: + if (is_wccp2) { + proto_tree_add_text(gre_tree, offset, sizeof(guint32), "WCCPv2 Data"); + offset += 4; + } dissect_ip(pd, offset, fd, tree); break; default: |