diff options
| author | gerald <gerald@f5534014-38df-0310-8fa8-9805f1628bb7> | 2004-07-06 19:01:32 +0000 |
|---|---|---|
| committer | gerald <gerald@f5534014-38df-0310-8fa8-9805f1628bb7> | 2004-07-06 19:01:32 +0000 |
| commit | beb07fe6e94a83a959e43a59b40a616d05771f8e (patch) | |
| tree | 83be3d232c51cbc40b13f4741ada7e92977960d6 /epan/conversation.c | |
| parent | 840dbd1d239aee943d9518812db2eaf2b2f45d54 (diff) | |
From Dinesh Dutt:
- conversation.[ch] - To support not setting port2 on matching a
conversation. This is used by protocols such as iSNS in which the client
registers a TCP/UDP port with the server for notifications and the server
sends notifications to this port from different source ports.
- packet-isns.c - Added support for handling zero-length TLVs and ESI & SCN
frames (when registering an SCN/ESI port, a conversation dissector is
setup).
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@11320 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/conversation.c')
| -rw-r--r-- | epan/conversation.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/conversation.c b/epan/conversation.c index f5ad54b4f1..96ec73999a 100644 --- a/epan/conversation.c +++ b/epan/conversation.c @@ -1,7 +1,7 @@ /* conversation.c * Routines for building lists of packets that are part of a "conversation" * - * $Id: conversation.c,v 1.24 2004/01/09 00:57:48 guy Exp $ + * $Id: conversation.c,v 1.25 2004/07/06 19:01:31 gerald Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -464,7 +464,7 @@ conversation_new(address *addr1, address *addr2, port_type ptype, new_index++; if (options & NO_ADDR2) { - if (options & NO_PORT2) { + if (options & (NO_PORT2|NO_PORT2_FORCE)) { g_hash_table_insert(conversation_hashtable_no_addr2_or_port2, new_key, conversation); } else { @@ -472,7 +472,7 @@ conversation_new(address *addr1, address *addr2, port_type ptype, new_key, conversation); } } else { - if (options & NO_PORT2) { + if (options & (NO_PORT2|NO_PORT2_FORCE)) { g_hash_table_insert(conversation_hashtable_no_port2, new_key, conversation); } else { @@ -493,7 +493,7 @@ conversation_set_port2(conversation_t *conv, guint32 port) /* * If the port 2 value is not wildcarded, don't set it. */ - if (!(conv->options & NO_PORT2)) + if ((!(conv->options & NO_PORT2)) || (conv->options & NO_PORT2_FORCE)) return; if (conv->options & NO_ADDR2) { |