aboutsummaryrefslogtreecommitdiffstats
path: root/packet-quake.c
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2000-08-21 18:36:35 +0000
committerGuy Harris <guy@alum.mit.edu>2000-08-21 18:36:35 +0000
commit879a38b4128d5b4c8be1b5cc754883176ddd6266 (patch)
tree48b238308b25f6517be79f4876b736ba1bd9c173 /packet-quake.c
parent05984d233d86ea3ade976216cacf2cf3b8bd6a01 (diff)
Change from Andreas Sikkema to change the "old" and "new" members of the
"dissector" union in the "conversation_t" structure to "old_d" and "new_d", to avoid using a C++ reserved word. Add "old_conversation_set_dissector()" and "conversation_set_dissector()" routines to set the dissector for a conversation, to hide the details of how that's done (e.g., details such as whether there's a union at all - eventually, when all dissectors have been tvbuffified, there won't be a need for the union - and what the names of the union members are, and so on). Convert all dissectors to use those routines (they had to be changed anyway, due to the name change). svn path=/trunk/; revision=2324
Diffstat (limited to 'packet-quake.c')
-rw-r--r--packet-quake.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/packet-quake.c b/packet-quake.c
index e337f4d77c..f32d6c7d1a 100644
--- a/packet-quake.c
+++ b/packet-quake.c
@@ -4,7 +4,7 @@
* Uwe Girlich <uwe@planetquake.com>
* http://www.idsoftware.com/q1source/q1source.zip
*
- * $Id: packet-quake.c,v 1.4 2000/08/13 14:08:36 deniel Exp $
+ * $Id: packet-quake.c,v 1.5 2000/08/21 18:36:34 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -267,8 +267,7 @@ dissect_quake_CCREP_ACCEPT
port = tvb_get_letohl(tvb, 0);
c = conversation_new( &pi.src, &pi.dst, PT_UDP, port, pi.destport, NULL);
if (c) {
- c->is_old_dissector = FALSE;
- c->dissector.new = dissect_quake;
+ conversation_set_dissector(c, dissect_quake);
}
if (tree) {
proto_tree_add_uint(tree, hf_quake_CCREP_ACCEPT_port,