Allow either old-style (pre-tvbuff) or new-style (tvbuffified)

dissectors to be registered as dissectors for particular ports,
registered as heuristic dissectors, and registered as dissectors for
conversations, and have routines to be used both by old-style and
new-style dissectors to call registered dissectors.

Have the code that calls those dissectors translate the arguments as
necessary.  (For conversation dissectors, replace
"find_conversation_dissector()", which just returns a pointer to the
dissector, with "old_try_conversation_dissector()" and
"try_conversation_dissector()", which actually call the dissector, so
that there's a single place at which we can do that translation.  Also
make "dissector_lookup()" static and, instead of calling it and, if it
returns a non-null pointer, calling that dissector, just use
"old_dissector_try_port()" or "dissector_try_port()", for the same
reason.)

This allows some dissectors that took old-style arguments and
immediately translated them to new-style arguments to just take
new-style arguments; make them do so.  It also allows some new-style
dissectors not to have to translate arguments before calling routines to
look up and call dissectors; make them not do so.

Get rid of checks for too-short frames in new-style dissectors - the
tvbuff code does those checks for you.

Give the routines to register old-style dissectors, and to call
dissectors from old-style dissectors, names beginning with "old_", with
the routines for new-style dissectors not having the "old_".  Update the
dissectors that use those routines appropriately.

Rename "dissect_data()" to "old_dissect_data()", and
"dissect_data_tvb()" to "dissect_data()".

svn path=/trunk/; revision=2218

1 files changed, 9 insertions, 9 deletions

diff --git a/packet-icmpv6.c b/packet-icmpv6.c
index 85bc272b67..df92c5b88d 100644
--- a/packet-icmpv6.c
+++ b/packet-icmpv6.c
@@ -1,7 +1,7 @@
 /* packet-icmpv6.c
  * Routines for ICMPv6 packet disassembly 
  *
- * $Id: packet-icmpv6.c,v 1.17 2000/05/31 05:07:06 guy Exp $
+ * $Id: packet-icmpv6.c,v 1.18 2000/08/07 03:20:36 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -183,7 +183,7 @@ again:
 	if ((pd[offset + 8] & 0xf0) == 0x60)
 	    dissect_ipv6(pd, offset + 8, fd, icmp6opt_tree);
 	else
-	    dissect_data(pd, offset + 8, fd, icmp6opt_tree);
+	    old_dissect_data(pd, offset + 8, fd, icmp6opt_tree);
 	break;
     case ND_OPT_MTU:
       {
@@ -370,7 +370,7 @@ dissect_icmpv6(const u_char *pd, int offset, frame_data *fd, proto_tree *tree)
 	    if ((pd[offset + sizeof(*dp)] & 0xf0) == 0x60) {
 		dissect_ipv6(pd, offset + sizeof(*dp), fd, icmp6_tree);
 	    } else {
-		dissect_data(pd, offset + sizeof(*dp), fd, icmp6_tree);
+		old_dissect_data(pd, offset + sizeof(*dp), fd, icmp6_tree);
 	    }
 	    break;
 	case ICMP6_PACKET_TOO_BIG:
@@ -381,7 +381,7 @@ dissect_icmpv6(const u_char *pd, int offset, frame_data *fd, proto_tree *tree)
 	    if ((pd[offset + sizeof(*dp)] & 0xf0) == 0x60) {
 		dissect_ipv6(pd, offset + sizeof(*dp), fd, icmp6_tree);
 	    } else {
-		dissect_data(pd, offset + sizeof(*dp), fd, icmp6_tree);
+		old_dissect_data(pd, offset + sizeof(*dp), fd, icmp6_tree);
 	    }
 	    break;
 	case ICMP6_PARAM_PROB:
@@ -392,7 +392,7 @@ dissect_icmpv6(const u_char *pd, int offset, frame_data *fd, proto_tree *tree)
 	    if ((pd[offset + sizeof(*dp)] & 0xf0) == 0x60) {
 		dissect_ipv6(pd, offset + sizeof(*dp), fd, icmp6_tree);
 	    } else {
-		dissect_data(pd, offset + sizeof(*dp), fd, icmp6_tree);
+		old_dissect_data(pd, offset + sizeof(*dp), fd, icmp6_tree);
 	    }
 	    break;
 	case ICMP6_ECHO_REQUEST:
@@ -403,7 +403,7 @@ dissect_icmpv6(const u_char *pd, int offset, frame_data *fd, proto_tree *tree)
 	    proto_tree_add_text(icmp6_tree, NullTVB,
 		offset + offsetof(struct icmp6_hdr, icmp6_seq), 2,
 		"Sequence: 0x%04x", (guint16)ntohs(dp->icmp6_seq));
-	    dissect_data(pd, offset + sizeof(*dp), fd, icmp6_tree);
+	    old_dissect_data(pd, offset + sizeof(*dp), fd, icmp6_tree);
 	    break;
 	case ICMP6_MEMBERSHIP_QUERY:
 	case ICMP6_MEMBERSHIP_REPORT:
@@ -567,10 +567,10 @@ dissect_icmpv6(const u_char *pd, int offset, frame_data *fd, proto_tree *tree)
 	    proto_tree_add_text(icmp6_tree, NullTVB,
 		offset + offsetof(struct icmp6_router_renum, rr_segnum), 2,
 		"Max delay: 0x%04x", pntohs(&rr->rr_maxdelay));
-	    dissect_data(pd, offset + sizeof(*rr), fd, tree);	/*XXX*/
+	    old_dissect_data(pd, offset + sizeof(*rr), fd, tree);	/*XXX*/
 	  }
 	default:
-	    dissect_data(pd, offset + sizeof(*dp), fd, tree);
+	    old_dissect_data(pd, offset + sizeof(*dp), fd, tree);
 	    break;
 	}
     }
@@ -605,6 +605,6 @@ proto_register_icmpv6(void)
 void
 proto_reg_handoff_icmpv6(void)
 {
-  dissector_add("ip.proto", IP_PROTO_ICMPV6, dissect_icmpv6);
+  old_dissector_add("ip.proto", IP_PROTO_ICMPV6, dissect_icmpv6);
 }