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-ftp.c | |
| parent | 31f2f8cabb4bce12d9cd9b60cd7644fe971b220e (diff) | |
| download | wireshark-3388bde488ac5c54044a487ca4199f5dda0715ba.tar.gz wireshark-3388bde488ac5c54044a487ca4199f5dda0715ba.tar.bz2 wireshark-3388bde488ac5c54044a487ca4199f5dda0715ba.zip | |
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-ftp.c')
| -rw-r--r-- | packet-ftp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/packet-ftp.c b/packet-ftp.c index 8109b2ba24..b58ee64230 100644 --- a/packet-ftp.c +++ b/packet-ftp.c @@ -3,7 +3,7 @@ * Copyright 1999, Richard Sharpe <rsharpe@ns.aus.com> * Copyright 2001, Juan Toledo <toledo@users.sourceforge.net> (Passive FTP) * - * $Id: packet-ftp.c,v 1.33 2001/09/03 03:12:01 guy Exp $ + * $Id: packet-ftp.c,v 1.34 2001/09/03 10:33:05 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -180,7 +180,7 @@ handle_pasv_response(const u_char *line, int linelen, packet_info *pinfo) * handle conversations not in the hash table? */ conversation = conversation_new(&server_addr, &pinfo->dst, - PT_TCP, server_port, 0, NULL, NO_PORT2); + PT_TCP, server_port, 0, NO_PORT2); conversation_set_dissector(conversation, dissect_ftpdata); } |