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, 8 insertions, 8 deletions

diff --git a/packet-ipsec.c b/packet-ipsec.c
index 05b8cb3d1a..5cb757c101 100644
--- a/packet-ipsec.c
+++ b/packet-ipsec.c
@@ -1,7 +1,7 @@
 /* packet-ipsec.c
  * Routines for IPsec/IPComp packet disassembly 
  *
- * $Id: packet-ipsec.c,v 1.18 2000/07/08 10:46:20 gram Exp $
+ * $Id: packet-ipsec.c,v 1.19 2000/08/07 03:20:41 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -198,8 +198,8 @@ dissect_ah(const u_char *pd, int offset, frame_data *fd, proto_tree *tree)
     }
 
     /* do lookup with the subdissector table */
-    if (!dissector_try_port(ip_dissector_table, ah.ah_nxt, pd, offset, fd, next_tree)) {
-      dissect_data(pd, offset, fd, next_tree);
+    if (!old_dissector_try_port(ip_dissector_table, ah.ah_nxt, pd, offset, fd, next_tree)) {
+      old_dissect_data(pd, offset, fd, next_tree);
     }
 }
 
@@ -236,7 +236,7 @@ dissect_esp(const u_char *pd, int offset, frame_data *fd, proto_tree *tree)
 	proto_tree_add_uint(esp_tree, hf_esp_sequence, NullTVB,
 			    offset + offsetof(struct newesp, esp_seq), 4,
 			    (guint32)ntohl(esp.esp_seq));
-	dissect_data(pd, offset + sizeof(struct newesp), fd, esp_tree);
+	old_dissect_data(pd, offset + sizeof(struct newesp), fd, esp_tree);
     }
 }
 
@@ -293,7 +293,7 @@ dissect_ipcomp(const u_char *pd, int offset, frame_data *fd, proto_tree *tree)
 		"CPI: %s (0x%04x)",
 		p, ntohs(ipcomp.comp_cpi));
 	}
-	dissect_data(pd, offset + sizeof(struct ipcomp), fd, ipcomp_tree);
+	old_dissect_data(pd, offset + sizeof(struct ipcomp), fd, ipcomp_tree);
     }
 }
 
@@ -357,7 +357,7 @@ proto_register_ipsec(void)
 void
 proto_reg_handoff_ipsec(void)
 {
-  dissector_add("ip.proto", IP_PROTO_AH, dissect_ah);
-  dissector_add("ip.proto", IP_PROTO_ESP, dissect_esp);
-  dissector_add("ip.proto", IP_PROTO_IPCOMP, dissect_ipcomp);
+  old_dissector_add("ip.proto", IP_PROTO_AH, dissect_ah);
+  old_dissector_add("ip.proto", IP_PROTO_ESP, dissect_esp);
+  old_dissector_add("ip.proto", IP_PROTO_IPCOMP, dissect_ipcomp);
 }