diff options
| author | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2003-05-29 18:29:36 +0000 |
|---|---|---|
| committer | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2003-05-29 18:29:36 +0000 |
| commit | 32cfbd98a42d6d8f8be2a45cc1d6358f493ed1fd (patch) | |
| tree | 404d5e21367502ea72fa0c243dd1630152a760d2 /packet-sip.c | |
| parent | 90d3cb0d378fad0f9111e76bad1003d04a881b18 (diff) | |
From Steven Lass: if there is no whitespace after the colon in a header,
don't try to eat the non-existent whitespace.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@7763 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'packet-sip.c')
| -rw-r--r-- | packet-sip.c | 33 |
1 files changed, 26 insertions, 7 deletions
diff --git a/packet-sip.c b/packet-sip.c index ddd54cdce6..5b27ebda5c 100644 --- a/packet-sip.c +++ b/packet-sip.c @@ -17,7 +17,7 @@ * Copyright 2000, Heikki Vatiainen <hessu@cs.tut.fi> * Copyright 2001, Jean-Francois Mule <jfm@cablelabs.com> * - * $Id: packet-sip.c,v 1.35 2003/03/11 01:48:55 gerald Exp $ + * $Id: packet-sip.c,v 1.36 2003/05/29 18:29:36 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -326,12 +326,31 @@ static void dissect_sip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) hf_index = sip_is_known_sip_header(tvb, offset, &header_len); if (hf_index == -1) { - proto_tree_add_text(hdr_tree, tvb, offset , next_offset - offset, "%s", - tvb_format_text(tvb, offset, eol)); - } - else { - proto_tree_add_string(hdr_tree, hf_header_array[hf_index], tvb, offset, next_offset - offset , - tvb_format_text(tvb, offset + header_len + 2, eol - header_len - 2)); + proto_tree_add_text(hdr_tree, tvb, offset, + next_offset - offset, "%s", + tvb_format_text(tvb, offset, eol)); + } else { + /* + * XXX - shouldn't use "tvb_format_text()" + * here; we should add the string *as is* + * to the protocol tree. + */ + if (tvb_find_guint8(tvb, + offset + header_len + 1, 1, ' ') == -1) { + proto_tree_add_string(hdr_tree, + hf_header_array[hf_index], tvb, + offset, next_offset - offset, + tvb_format_text(tvb, + offset + header_len + 1, + eol - header_len - 1)); + } else { /* eat leading whitespace */ + proto_tree_add_string(hdr_tree, + hf_header_array[hf_index], tvb, + offset, next_offset - offset, + tvb_format_text(tvb, + offset + header_len + 2, + eol - header_len - 2)); + } } offset = next_offset; |