aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Biot <obiot.ethereal@gmail.com>2005-03-09 19:52:58 +0000
committerOlivier Biot <obiot.ethereal@gmail.com>2005-03-09 19:52:58 +0000
commite16aebe91983c02cfd5aa2d98578c5757b68c0f6 (patch)
tree1ed1ac84c2dc6f2a5cc084c3b92fa557d9351d19
parentaa8bea055986c42d7e43c6e94ab30765d980ef89 (diff)
Remove duplicate media types and add XML media types from packet-text-media.c.
NOTE: we need to make sure that all the media types registered in the XML dissector get registered with the line-based text dissector as a fall-back when the XML dissector is disabled. svn path=/trunk/; revision=13683
-rw-r--r--plugins/xml/packet-xml.c18
1 files changed, 15 insertions, 3 deletions
diff --git a/plugins/xml/packet-xml.c b/plugins/xml/packet-xml.c
index 1868d15b18..59c0b38495 100644
--- a/plugins/xml/packet-xml.c
+++ b/plugins/xml/packet-xml.c
@@ -259,9 +259,21 @@ proto_reg_handoff_xml(void)
xml_handle = find_dissector("xml");
dissector_add_string("media_type", "text/xml", xml_handle);
- dissector_add_string("media_type", "application/smil", xml_handle);
- dissector_add_string("media_type", "text/xml", xml_handle);
dissector_add_string("media_type", "application/xml", xml_handle);
dissector_add_string("media_type", "application/soap+xml", xml_handle);
-
+ dissector_add_string("media_type", "application/xml-dtd", xml_handle);
+ /* WAP and OMA XML media */
+ dissector_add_string("media_type", "text/vnd.wap.wml", xml_handle);
+ dissector_add_string("media_type", "text/vnd.wap.si", xml_handle);
+ dissector_add_string("media_type", "text/vnd.wap.sl", xml_handle);
+ dissector_add_string("media_type", "text/vnd.wap.co", xml_handle);
+ dissector_add_string("media_type", "text/vnd.wap.emn", xml_handle);
+ dissector_add_string("media_type", "application/vnd.wv.csp+xml", xml_handle);
+ /* Other */
+ dissector_add_string("media_type", "application/smil", xml_handle);
+ dissector_add_string("media_type", "application/cpim-pidf+xml", xml_handle);
+ dissector_add_string("media_type", "application/rdf+xml", xml_handle);
+ dissector_add_string("media_type", "application/xslt+xml", xml_handle);
+ dissector_add_string("media_type", "application/mathml+xml", xml_handle);
+ dissector_add_string("media_type", "image/svg+xml", xml_handle);
}