diff options
author | Guy Harris <guy@alum.mit.edu> | 2000-08-21 18:36:35 +0000 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2000-08-21 18:36:35 +0000 |
commit | 879a38b4128d5b4c8be1b5cc754883176ddd6266 (patch) | |
tree | 48b238308b25f6517be79f4876b736ba1bd9c173 /packet-socks.c | |
parent | 05984d233d86ea3ade976216cacf2cf3b8bd6a01 (diff) | |
download | wireshark-879a38b4128d5b4c8be1b5cc754883176ddd6266.tar.gz |
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-socks.c')
-rw-r--r-- | packet-socks.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/packet-socks.c b/packet-socks.c index 7e87de7af7..e2edb4e575 100644 --- a/packet-socks.c +++ b/packet-socks.c @@ -2,7 +2,7 @@ * Routines for socks versions 4 &5 packet dissection * Copyright 2000, Jeffrey C. Foster <jfoste@woodward.com> * - * $Id: packet-socks.c,v 1.10 2000/08/13 14:09:01 deniel Exp $ + * $Id: packet-socks.c,v 1.11 2000/08/21 18:36:33 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -433,8 +433,7 @@ void new_udp_conversation( socks_hash_entry_t *hash_info){ g_assert( conversation); - conversation->is_old_dissector = TRUE; - conversation->dissector.old = socks_udp_dissector; + old_conversation_set_dissector(conversation, socks_udp_dissector); } |