osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

The conversation comparison code should, if *any* of the tests that 

check whether the two packets are going in the same direction in the
same conversation fails, check whether the two packets are going in
opposite directions in the same conversation.

svn path=/trunk/; revision=1014
This commit is contained in:
Guy Harris 1999-11-11 20:44:14 +00:00
parent 119a787b88
commit 4020918fa4
1 changed files with 33 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
conversation.c
View File

@ -1,7 +1,7 @@
/* conversation.c /* conversation.c
* Routines for building lists of packets that are part of a "conversation" * Routines for building lists of packets that are part of a "conversation"
* *
* $Id: conversation.c,v 1.2 1999/10/24 07:27:17 guy Exp $ * $Id: conversation.c,v 1.3 1999/11/11 20:44:14 guy Exp $
* *
* Ethereal - Network traffic analyzer * Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org> * By Gerald Combs <gerald@zing.org>
@ -84,60 +84,43 @@ conversation_equal(gconstpointer v, gconstpointer w)
if (v1->ptype != v2->ptype) if (v1->ptype != v2->ptype)
return 0; /* different types of port */ return 0; /* different types of port */
/*
* Are the first and second source addresses the same, the
* first and second destination addresses the same, the
* first and second source ports the same, and the first and
* second destination ports the same?
*/
if (v1->src.len == v2->src.len && if (v1->src.len == v2->src.len &&
memcmp(v1->src.data, v2->src.data, v1->src.len) == 0) { memcmp(v1->src.data, v2->src.data, v1->src.len) == 0 &&
v1->dst.len == v2->dst.len &&
memcmp(v1->dst.data, v2->dst.data, v1->dst.len) == 0 &&
v1->port_src == v2->port_src &&
v1->port_dst == v2->port_dst) {
/* /*
* The first and second source addresses are the same. * Yes. It's the same conversation, and the two
* address/port pairs are going in the same direction.
*/ */
if (v1->dst.len == v2->dst.len && return 1;
memcmp(v1->dst.data, v2->dst.data, v1->dst.len) == 0) { }
/*
* The first and second destination addresses /*
* are the same, so they're both going from * Is the first source address the same as the second destination
* the same machine and they're both going to * address, the first destination address the same as the second
* the same machine. * source address, the first source port the same as the second
*/ * destination port, and the first destination port the same
if (v1->port_src == v2->port_src && * as the second source port?
v1->port_dst == v2->port_dst) { */
/* if (v1->src.len == v2->dst.len &&
* The first and second source ports memcmp(v1->src.data, v2->dst.data, v1->src.len) == 0 &&
* are the same, and the first and second v1->dst.len == v2->src.len &&
* destination ports are the same, so memcmp(v1->dst.data, v2->src.data, v1->dst.len) == 0 &&
* it's the same conversation, and the two v1->port_src == v2->port_dst &&
* address/port pairs are going in the same v1->port_dst == v2->port_src) {
* direction.
*/
return 1;
}
}
} else if (v1->src.len == v2->dst.len &&
memcmp(v1->src.data, v2->dst.data, v1->src.len) == 0) {
/* /*
* The first source address is the same as the second * Yes. It's the same conversation, and the two
* destination address. * address/port pairs are going in opposite directions.
*/ */
if (v1->dst.len == v2->src.len && return 1;
memcmp(v1->dst.data, v2->src.data, v1->dst.len) == 0) {
/*
* The first destination address is the same as
* the second source address, so they're going
* between the same machines, but in opposite
* directions.
*/
if (v1->port_src == v2->port_dst &&
v1->port_dst == v2->port_src) {
/*
* The first source port is the same as
* the second destination port, and the
* first destination port is the same as
* the second source port, so it's
* the same conversation, and the two
* address/port pairs are going in
* opposite directions.
*/
return 1;
}
}
} }
/* /*