diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2006-05-16 19:04:53 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2006-05-16 19:04:53 +0000 |
| commit | 56f73049b9671efeea99fbf7133845605f383e3e (patch) | |
| tree | e9f47862efa7bf68a343e0230a62a230fcb53303 /epan/dissectors/packet-xml.c | |
| parent | 103ad0253f531c40b35cc26194d90673d2ce99b4 (diff) | |
From Martin Mathieson:
- adds application/xpidf+xml as a media type known to be xml
- appends /xml to the protocol column (as SDP does). It would be nice
to append the top-level element, or the name taken from a matching DTD,
but this will do for now (at least its a short name).
- corrects the help text for the preference. I can see that it is
registered as a heuristic for "http", "sip" and "media"
I've also included a slightly updated version of reginfo.dtd (RFC 3680)
for the dtds folder.
svn path=/trunk/; revision=18173
Diffstat (limited to 'epan/dissectors/packet-xml.c')
| -rw-r--r-- | epan/dissectors/packet-xml.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/epan/dissectors/packet-xml.c b/epan/dissectors/packet-xml.c index 11df7d00af..30dc18251e 100644 --- a/epan/dissectors/packet-xml.c +++ b/epan/dissectors/packet-xml.c @@ -160,6 +160,7 @@ static const gchar* default_media_types[] = { "application/xcap-error+xml", "application/xml", "application/xml-dtd", + "application/xpidf+xml", "application/xslt+xml", "image/svg+xml", }; @@ -171,7 +172,10 @@ dissect_xml(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tvbparse_elem_t* tok = NULL; static GPtrArray* stack = NULL; xml_frame_t* current_frame; - + + if (check_col(pinfo->cinfo, COL_PROTOCOL)) + col_append_str(pinfo->cinfo, COL_PROTOCOL, "/XML"); + if(!tree) return; if (stack != NULL) @@ -1118,7 +1122,7 @@ static void init_xml_names(void) { } if (test_for_directory(dirname) == EISDIR) { - + if ((dir = OPENDIR_OP(dirname)) != NULL) { while ((file = DIRGETNEXT_OP(dir)) != NULL) { guint namelen; @@ -1216,7 +1220,7 @@ proto_register_xml(void) { xml_module = prefs_register_protocol(xml_ns.hf_tag,apply_prefs); prefs_register_bool_preference(xml_module, "heuristic", "Use Heuristics", - "Try to recognize XML for unknown HTTP media types", + "Try to recognize XML for unknown media types", &pref_heuristic); g_array_free(hf_arr,FALSE); |