diff options
author | Guy Harris <guy@alum.mit.edu> | 2001-09-03 10:33:12 +0000 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2001-09-03 10:33:12 +0000 |
commit | 3388bde488ac5c54044a487ca4199f5dda0715ba (patch) | |
tree | 1c0bb040cbd4022d4c91c56160dc76dca922f005 /packet-wsp.c | |
parent | 31f2f8cabb4bce12d9cd9b60cd7644fe971b220e (diff) | |
download | wireshark-3388bde488ac5c54044a487ca4199f5dda0715ba.tar.gz |
Instead of having a single datum attached to a conversation, have a list
of protocol-id-plus-datum pairs, so that multiple protocols can attach
information to the same conversation.
Dissectors that attach information to a conversation should not assume
that if they find a conversation it has one of its data attached to it;
the conversation might've been created by another dissector.
svn path=/trunk/; revision=3901
Diffstat (limited to 'packet-wsp.c')
-rw-r--r-- | packet-wsp.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/packet-wsp.c b/packet-wsp.c index 44f0212a1b..a3d987ff25 100644 --- a/packet-wsp.c +++ b/packet-wsp.c @@ -2,7 +2,7 @@ * * Routines to dissect WSP component of WAP traffic. * - * $Id: packet-wsp.c,v 1.32 2001/07/30 21:24:29 guy Exp $ + * $Id: packet-wsp.c,v 1.33 2001/09/03 10:33:07 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -881,8 +881,7 @@ dissect_redirect(tvbuff_t *tvb, int offset, packet_info *pinfo, PT_UDP, port_num, 0, NO_PORT_B); if (conv == NULL) { conv = conversation_new(&redir_address, - &pinfo->dst, PT_UDP, port_num, 0, - NULL, NO_PORT2); + &pinfo->dst, PT_UDP, port_num, 0, NO_PORT2); } conversation_set_dissector(conv, dissector); break; @@ -916,8 +915,7 @@ dissect_redirect(tvbuff_t *tvb, int offset, packet_info *pinfo, PT_UDP, port_num, 0, NO_PORT_B); if (conv == NULL) { conv = conversation_new(&redir_address, - &pinfo->dst, PT_UDP, port_num, 0, - NULL, NO_PORT2); + &pinfo->dst, PT_UDP, port_num, 0, NO_PORT2); } conversation_set_dissector(conv, dissector); break; |