diff options
| author | Guy Harris <guy@alum.mit.edu> | 2002-11-08 01:00:07 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2002-11-08 01:00:07 +0000 |
| commit | 8181a836572de0193701944662c539b38b375bca (patch) | |
| tree | f95fffed05a1b3f410df72ed2330c88e5f8324fd /packet-wcp.c | |
| parent | 45d9642e5228177b4690e47effaecd7691d5c0be (diff) | |
Allow more than one circuit with the same circuit ID; a circuit has a
starting and ending frame number, and circuits with the same circuit ID
are sorted by the starting frame number (the last circuit can have 0 as
the ending frame number, meaning "unknown"), and, when looking up a
circuit, we take a frame number as an argument and return the circuit
that includes that frame.
Add a new circuit ID type for X.25 virtual circuits, and use the circuit
mechanism to keep track of the dissector for an X.25 virtual circuit
rather than having a private mechanism.
svn path=/trunk/; revision=6580
Diffstat (limited to 'packet-wcp.c')
| -rw-r--r-- | packet-wcp.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/packet-wcp.c b/packet-wcp.c index 0d248d9f8a..19c69896c4 100644 --- a/packet-wcp.c +++ b/packet-wcp.c @@ -2,7 +2,7 @@ * Routines for Wellfleet Compression frame disassembly * Copyright 2001, Jeffrey C. Foster <jfoste@woodward.com> * - * $Id: packet-wcp.c,v 1.29 2002/10/22 08:22:02 guy Exp $ + * $Id: packet-wcp.c,v 1.30 2002/11/08 01:00:04 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -458,9 +458,11 @@ wcp_window_t *get_wcp_window_ptr( packet_info *pinfo){ circuit_t *circuit; wcp_circuit_data_t *wcp_circuit_data; - circuit = find_circuit( pinfo->ctype, pinfo->circuit_id); + circuit = find_circuit( pinfo->ctype, pinfo->circuit_id, + pinfo->fd->num); if ( !circuit){ - circuit = circuit_new( pinfo->ctype, pinfo->circuit_id); + circuit = circuit_new( pinfo->ctype, pinfo->circuit_id, + pinfo->fd->num); } wcp_circuit_data = circuit_get_proto_data(circuit, proto_wcp); if ( !wcp_circuit_data){ |