Merge Jerry's version with a version I'd done.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@1317 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/packet-gre.c b/packet-gre.c
index fa4e82d252e75cf16999c888bf7575a6624ca8bf..f7a8b2146d06052e33ccf768db672848ce9e40c0 100644 (file)
--- 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: