diff options
| author | Gerald Combs <gerald@wireshark.org> | 2002-12-08 02:32:36 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2002-12-08 02:32:36 +0000 |
| commit | b60b1414c39e902281dd7c819cb2deb5083d6bcc (patch) | |
| tree | 0eb50f10825095cede74b16fe654c9e89ca64281 /epan/conversation.c | |
| parent | c2ecb0daa5c959f4c0bcc36443b90eb545d294db (diff) | |
| download | wireshark-b60b1414c39e902281dd7c819cb2deb5083d6bcc.tar.gz | |
From Dinesh Dutt: Add Fibre Channel support, including FCIP, Basic FC
header, Extended Link Service, Interswitch Link Service, FCP, and IPFC.
svn path=/trunk/; revision=6757
Diffstat (limited to 'epan/conversation.c')
| -rw-r--r-- | epan/conversation.c | 50 |
1 files changed, 42 insertions, 8 deletions
diff --git a/epan/conversation.c b/epan/conversation.c index 09a5f5c240..95e6536999 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.22 2002/11/27 22:44:41 guy Exp $ + * $Id: conversation.c,v 1.23 2002/12/08 02:32:36 gerald Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -621,7 +621,17 @@ find_conversation(address *addr_a, address *addr_b, port_type ptype, */ conversation = conversation_lookup_hashtable(conversation_hashtable_exact, - addr_a, addr_b, ptype, port_a, port_b); + addr_a, addr_b, ptype, + port_a, port_b); + if ((conversation == NULL) && (addr_a->type == AT_FC)) { + /* In Fibre channel, OXID & RXID are never swapped as + * TCP/UDP ports are in TCP/IP. + */ + conversation = + conversation_lookup_hashtable(conversation_hashtable_exact, + addr_b, addr_a, ptype, + port_a, port_b); + } if (conversation != NULL) return conversation; } @@ -643,6 +653,15 @@ find_conversation(address *addr_a, address *addr_b, port_type ptype, conversation = conversation_lookup_hashtable(conversation_hashtable_no_addr2, addr_a, addr_b, ptype, port_a, port_b); + if ((conversation == NULL) && (addr_a->type == AT_FC)) { + /* In Fibre channel, OXID & RXID are never swapped as + * TCP/UDP ports are in TCP/IP. + */ + conversation = + conversation_lookup_hashtable(conversation_hashtable_no_addr2, + addr_b, addr_a, ptype, + port_a, port_b); + } if (conversation != NULL) { /* * If search address B isn't wildcarded, and this @@ -673,9 +692,9 @@ find_conversation(address *addr_a, address *addr_b, port_type ptype, * ("addr_a" doesn't take part in this lookup.) */ if (!(options & NO_ADDR_B)) { - conversation = - conversation_lookup_hashtable(conversation_hashtable_no_addr2, - addr_b, addr_a, ptype, port_b, port_a); + conversation = + conversation_lookup_hashtable(conversation_hashtable_no_addr2, + addr_b, addr_a, ptype, port_b, port_a); if (conversation != NULL) { /* * If this is for a connection-oriented @@ -711,6 +730,14 @@ find_conversation(address *addr_a, address *addr_b, port_type ptype, conversation = conversation_lookup_hashtable(conversation_hashtable_no_port2, addr_a, addr_b, ptype, port_a, port_b); + if ((conversation == NULL) && (addr_a->type == AT_FC)) { + /* In Fibre channel, OXID & RXID are never swapped as + * TCP/UDP ports are in TCP/IP + */ + conversation = + conversation_lookup_hashtable(conversation_hashtable_no_port2, + addr_b, addr_a, ptype, port_a, port_b); + } if (conversation != NULL) { /* * If search port B isn't wildcarded, and this is @@ -805,9 +832,16 @@ find_conversation(address *addr_a, address *addr_b, port_type ptype, * first packet in the conversation). * (Neither "addr_a" nor "port_a" take part in this lookup.) */ - conversation = - conversation_lookup_hashtable(conversation_hashtable_no_addr2_or_port2, - addr_b, addr_a, ptype, port_b, port_a); + if (addr_a->type == AT_FC) + conversation = + conversation_lookup_hashtable(conversation_hashtable_no_addr2_or_port2, + addr_b, addr_a, ptype, port_a, + port_b); + else + conversation = + conversation_lookup_hashtable(conversation_hashtable_no_addr2_or_port2, + addr_b, addr_a, ptype, port_b, + port_a); if (conversation != NULL) { /* * If this is for a connection-oriented protocol, set the |