diff options
| author | Olivier Biot <obiot.ethereal@gmail.com> | 2004-01-18 23:21:20 +0000 |
|---|---|---|
| committer | Olivier Biot <obiot.ethereal@gmail.com> | 2004-01-18 23:21:20 +0000 |
| commit | d2a8b3d2cc60ab91880e794612f580883db2b273 (patch) | |
| tree | ac4b32ff5521331e6d08f141f3d94302fbd2153f /packet-sip.c | |
| parent | 0d2b82ba7c8c43c2abfdec01e44d42d81980c026 (diff) | |
| download | wireshark-d2a8b3d2cc60ab91880e794612f580883db2b273.tar.gz | |
From Anders Broman:
Convert content type to lowercase, and save pinfo->prvate_data before
handing off to a subdissector.
svn path=/trunk/; revision=9725
Diffstat (limited to 'packet-sip.c')
| -rw-r--r-- | packet-sip.c | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/packet-sip.c b/packet-sip.c index a2178385f8..77631e1b06 100644 --- a/packet-sip.c +++ b/packet-sip.c @@ -18,7 +18,7 @@ * Copyright 2000, Heikki Vatiainen <hessu@cs.tut.fi> * Copyright 2001, Jean-Francois Mule <jfm@cablelabs.com> * - * $Id: packet-sip.c,v 1.54 2004/01/07 19:49:45 obiot Exp $ + * $Id: packet-sip.c,v 1.55 2004/01/18 23:21:20 obiot Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -408,6 +408,7 @@ dissect_sip_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guchar contacts = 0, contact_is_star = 0, expires_is_0 = 0; char csec_method[16] = ""; char *media_type_str = NULL; + char *media_type_str_lower_case = NULL; char *content_type_parameter_str = NULL; /* @@ -701,6 +702,13 @@ dissect_sip_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, content_type_parameter_str_len); } media_type_str = tvb_get_string(tvb, value_offset, content_type_len); +#if GLIB_MAJOR_VERSION < 2 + media_type_str_lower_case = g_strdup(media_type_str); + g_strdown(media_type_str_lower_case); +#else + media_type_str_lower_case = g_ascii_strdown(media_type_str, -1); +#endif + g_free(media_type_str); break; case POS_CONTACT : @@ -742,13 +750,16 @@ dissect_sip_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, /* give the content type parameters to sub dissectors */ if ( media_type_str != NULL ) { + void *save_private_data = pinfo->private_data; pinfo->private_data = content_type_parameter_str; found_match = dissector_try_string(media_type_dissector_table, - media_type_str, + media_type_str_lower_case, next_tvb, pinfo, message_body_tree); g_free(media_type_str); + g_free(media_type_str_lower_case); g_free(content_type_parameter_str); + pinfo->private_data = save_private_data; /* If no match dump as text */ } if ( found_match != TRUE ) |