aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGilbert Ramirez <gram@alumni.rice.edu>1999-10-21 15:06:02 +0000
committerGilbert Ramirez <gram@alumni.rice.edu>1999-10-21 15:06:02 +0000
commit06b0aeedfe9cb58380ecdc06e449979bd8c934b6 (patch)
tree4fd2ddcf8eee0039144fcc948dff7b3f1a54bcab
parent33e47ffb6fbefa3fe9af4009d61f32f6805b19d6 (diff)
Put tunneled protocols under pimopt_tree instead of tree like Jun-ichiro
originally had it. svn path=/trunk/; revision=901
-rw-r--r--packet-pim.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/packet-pim.c b/packet-pim.c
index 3f03492880..5b450ced74 100644
--- a/packet-pim.c
+++ b/packet-pim.c
@@ -2,7 +2,7 @@
* Routines for PIM disassembly
* (c) Copyright Jun-ichiro itojun Hagino <itojun@itojun.org>
*
- * $Id: packet-pim.c,v 1.5 1999/10/15 13:14:43 itojun Exp $
+ * $Id: packet-pim.c,v 1.6 1999/10/21 15:06:02 gram Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -280,16 +280,16 @@ dissect_pim(const u_char *pd, int offset, frame_data *fd, proto_tree *tree) {
switch((*ip & 0xf0) >> 4) {
case 4: /* IPv4 */
#if 0
- dissect_ip(pd, ip - pd, fd, pimopt_tree);
-#else
dissect_ip(pd, ip - pd, fd, tree);
+#else
+ dissect_ip(pd, ip - pd, fd, pimopt_tree);
#endif
break;
case 6: /* IPv6 */
#if 0
- dissect_ipv6(pd, ip - pd, fd, pimopt_tree);
-#else
dissect_ipv6(pd, ip - pd, fd, tree);
+#else
+ dissect_ipv6(pd, ip - pd, fd, pimopt_tree);
#endif
break;
default: