diff options
| author | Guy Harris <guy@alum.mit.edu> | 2002-07-17 06:55:29 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2002-07-17 06:55:29 +0000 |
| commit | 47b147ffd119809198871932874f6fc5b7e6e836 (patch) | |
| tree | e3040460a5348a10bfe0cba753a7eec70fb5349b /packet-ftp.c | |
| parent | cc00331455604ca51fa743a4f73f5c899c023a67 (diff) | |
| download | wireshark-47b147ffd119809198871932874f6fc5b7e6e836.tar.gz wireshark-47b147ffd119809198871932874f6fc5b7e6e836.tar.bz2 wireshark-47b147ffd119809198871932874f6fc5b7e6e836.zip | |
Add an extra argument to "tvb_find_line_end()", which specifies what it
should do if it doesn't find an EOL; if FALSE, it behaves as before,
returning values that treat the line as ending at the end of the tvbuff,
and if TRUE, it returns -1, so its caller can do segment reassembly
until it gets the EOL.
Add an option to the SMTP dissector to do segment reassembly, and do
segment reassembly of the first line.
svn path=/trunk/; revision=5891
Diffstat (limited to 'packet-ftp.c')
| -rw-r--r-- | packet-ftp.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/packet-ftp.c b/packet-ftp.c index d5b6a39c41..4c3d3d5fe8 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.46 2002/07/15 09:40:20 guy Exp $ + * $Id: packet-ftp.c,v 1.47 2002/07/17 06:55:19 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -236,7 +236,7 @@ dissect_ftp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) * not longer than what's in the buffer, so the "tvb_get_ptr()" * call won't throw an exception. */ - linelen = tvb_find_line_end(tvb, offset, -1, &next_offset); + linelen = tvb_find_line_end(tvb, offset, -1, &next_offset, FALSE); line = tvb_get_ptr(tvb, offset, linelen); if (check_col(pinfo->cinfo, COL_INFO)) { @@ -382,7 +382,7 @@ dissect_ftp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) * Find the end of the line. */ linelen = tvb_find_line_end(tvb, offset, -1, - &next_offset); + &next_offset, FALSE); /* * Put this line. |