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-dccp.c | |
| parent | cc00331455604ca51fa743a4f73f5c899c023a67 (diff) | |
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-dccp.c')
| -rw-r--r-- | packet-dccp.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/packet-dccp.c b/packet-dccp.c index be36cf0d62..435166b1a2 100644 --- a/packet-dccp.c +++ b/packet-dccp.c @@ -4,7 +4,7 @@ * * Copyright 1999, Nathan Neulinger <nneul@umr.edu> * - * $Id: packet-dccp.c,v 1.5 2002/05/03 20:34:14 nneul Exp $ + * $Id: packet-dccp.c,v 1.6 2002/07/17 06:55:19 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -102,9 +102,10 @@ static gint ett_dccp_trace = -1; #define D_TEXT(label, endpad) { \ int next_offset,linelen,left; \ const char *line; \ - while (tvb_offset_exists(tvb, offset+endpad)) { \ + while (tvb_offset_exists(tvb, offset+endpad)) { \ left = tvb_length_remaining(tvb,offset) - endpad; \ - linelen = tvb_find_line_end(tvb, offset, left, &next_offset); \ + linelen = tvb_find_line_end(tvb, offset, left, &next_offset, \ + FALSE); \ line = tvb_get_ptr(tvb, offset, linelen); \ proto_tree_add_text(dccp_optree, tvb, offset, \ next_offset - offset, "%s: %s", \ |