diff options
| author | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2000-08-21 18:36:35 +0000 |
|---|---|---|
| committer | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2000-08-21 18:36:35 +0000 |
| commit | 9e8e9324370ab2125c9f8c3ff6718d12b75c19b1 (patch) | |
| tree | 48b238308b25f6517be79f4876b736ba1bd9c173 /packet-msproxy.c | |
| parent | cf8cc12423534a8e1e9015f536daf8bccfa1c127 (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).
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@2324 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'packet-msproxy.c')
| -rw-r--r-- | packet-msproxy.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/packet-msproxy.c b/packet-msproxy.c index 1608c5c164..58484fca74 100644 --- a/packet-msproxy.c +++ b/packet-msproxy.c @@ -2,7 +2,7 @@ * Routines for Microsoft Proxy packet dissection * Copyright 2000, Jeffrey C. Foster <jfoste@woodward.com> * - * $Id: packet-msproxy.c,v 1.10 2000/08/20 19:40:47 deniel Exp $ + * $Id: packet-msproxy.c,v 1.11 2000/08/21 18:36:34 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -304,8 +304,7 @@ static void add_msproxy_conversation( hash_entry_t *hash_info){ new_conv_info->server_int_port = hash_info->server_int_port; new_conv_info->proto = hash_info->proto; - conversation->is_old_dissector = TRUE; - conversation->dissector.old = msproxy_sub_dissector; + old_conversation_set_dissector(conversation, msproxy_sub_dissector); } |