diff options
| author | Guy Harris <guy@alum.mit.edu> | 2002-08-19 12:57:12 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2002-08-19 12:57:12 +0000 |
| commit | a57f7e942acecff8fe36d031ec32dc9b2d67bb3b (patch) | |
| tree | 5eef6c24175652e24453744418602069f2137e42 /packet-sdp.c | |
| parent | 1ae796de009392b02d5b1fa6d91818ff40077f1b (diff) | |
| download | wireshark-a57f7e942acecff8fe36d031ec32dc9b2d67bb3b.tar.gz wireshark-a57f7e942acecff8fe36d031ec32dc9b2d67bb3b.tar.bz2 wireshark-a57f7e942acecff8fe36d031ec32dc9b2d67bb3b.zip | |
When processing "i" and "a" tags, check only whether we've seen an "m"
tag or not - if we haven't, "i" is "session info" and "a" is "session
attribute", and if we have, "i" is "media title" and "a" is "media
attribute".
svn path=/trunk/; revision=6018
Diffstat (limited to 'packet-sdp.c')
| -rw-r--r-- | packet-sdp.c | 31 |
1 files changed, 9 insertions, 22 deletions
diff --git a/packet-sdp.c b/packet-sdp.c index f2344094e2..ceefcd3142 100644 --- a/packet-sdp.c +++ b/packet-sdp.c @@ -4,7 +4,7 @@ * Jason Lango <jal@netapp.com> * Liberally copied from packet-http.c, by Guy Harris <guy@alum.mit.edu> * - * $Id: packet-sdp.c,v 1.31 2002/08/02 23:36:00 jmayer Exp $ + * $Id: packet-sdp.c,v 1.32 2002/08/19 12:57:12 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -55,7 +55,6 @@ static int hf_repeat_time = -1; static int hf_media = -1; static int hf_media_title = -1; static int hf_unknown = -1; -static int hf_misplaced = -1; static int hf_invalid = -1; /* hf_owner subfields*/ @@ -146,7 +145,7 @@ dissect_sdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) gint offset = 0; gint next_offset; int linelen; - guchar section; + gboolean in_media_description; guchar type; guchar delim; int datalen; @@ -185,7 +184,7 @@ dissect_sdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* * Show the SDP message a line at a time. */ - section = 0; + in_media_description = FALSE; while (tvb_offset_exists(tvb, offset)) { /* * Find the end of the line. @@ -214,7 +213,6 @@ dissect_sdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) switch (type) { case 'v': hf = hf_protocol_version; - section = 'v'; break; case 'o': hf = hf_owner; @@ -223,14 +221,11 @@ dissect_sdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) hf = hf_session_name; break; case 'i': - if (section == 'v'){ - hf = hf_session_info; - } - else if (section == 'm'){ + if (in_media_description) { hf = hf_media_title; } else{ - hf = hf_misplaced; + hf = hf_session_info; } break; case 'u': @@ -250,27 +245,23 @@ dissect_sdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) break; case 't': hf = hf_time; - section = 't'; break; case 'r': hf = hf_repeat_time; break; case 'm': hf = hf_media; - section = 'm'; + in_media_description = TRUE; break; case 'k': hf = hf_encryption_key; break; case 'a': - if (section == 'v'){ - hf = hf_session_attribute; - } - else if (section == 'm'){ + if (in_media_description) { hf = hf_media_attribute; } else{ - hf = hf_misplaced; + hf = hf_session_attribute; } break; case 'z': @@ -281,7 +272,7 @@ dissect_sdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) break; } tokenoffset = 2; - if( hf == hf_unknown || hf == hf_misplaced ) + if( hf == hf_unknown ) tokenoffset = 0; string = g_malloc(linelen - tokenoffset + 1); CLEANUP_PUSH(g_free, string); @@ -833,10 +824,6 @@ proto_register_sdp(void) { "Unknown", "sdp.unknown",FT_STRING, BASE_NONE, NULL, 0x0, "Unknown", HFILL }}, - { &hf_misplaced, - { "Misplaced", - "sdp.misplaced",FT_STRING, BASE_NONE, NULL, 0x0, - "Misplaced", HFILL }}, { &hf_invalid, { "Invalid line", "sdp.invalid",FT_STRING, BASE_NONE, NULL, 0x0, |