aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVasil Velichkov <vvvelichkov@gmail.com>2017-06-20 21:30:42 +0300
committerAnders Broman <a.broman58@gmail.com>2017-06-20 20:16:24 +0000
commit3b7440996b2f3637656575ad121fa6edfa03cfcb (patch)
tree7e797d9c9e20da9df4131e21a08f600c043a23c9
parent6b9b4bd96833e31f659118b5e34f1393cb95b247 (diff)
packet-xml: Add 3GPP, ETSI, GSMA and OMA media types
Not all media types are IANA registered https://www.iana.org/assignments/media-types/media-types.xhtml http://www.gsma.com/newsroom/wp-content/uploads/IR.95-v2.0-3.docx http://www.openmobilealliance.org/release/XDM/V2_2_1-20170124-A/OMA-ERELD-XDM-V2_2_1-20170124-A.pdf Change-Id: I7e2e1ef5ddcff91f04655d84836e10b9bf20d765 Reviewed-on: https://code.wireshark.org/review/22273 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
-rw-r--r--epan/dissectors/packet-xml.c59
1 files changed, 59 insertions, 0 deletions
diff --git a/epan/dissectors/packet-xml.c b/epan/dissectors/packet-xml.c
index d42c0ee91e..e007f5d14f 100644
--- a/epan/dissectors/packet-xml.c
+++ b/epan/dissectors/packet-xml.c
@@ -98,12 +98,16 @@ static const gchar *default_media_types[] = {
"text/vnd.wap.sl",
"text/vnd.wap.co",
"text/vnd.wap.emn",
+ "application/3gpp-ims+xml",
"application/atom+xml",
"application/auth-policy+xml",
"application/ccmp+xml",
+ "application/conference-info+xml", /*RFC4575*/
"application/cpim-pidf+xml",
"application/cpl+xml",
"application/dds-web+xml",
+ "application/im-iscomposing+xml", /*RFC3994*/
+ "application/load-control+xml", /*RFC7200*/
"application/mathml+xml",
"application/media_control+xml",
"application/note+xml",
@@ -118,6 +122,7 @@ static const gchar *default_media_types[] = {
"application/rss+xml",
"application/smil",
"application/simple-filter+xml",
+ "application/simple-message-summary+xml", /*RFC3842*/
"application/simservs+xml",
"application/soap+xml",
"application/vnd.etsi.aoc+xml",
@@ -128,14 +133,67 @@ static const gchar *default_media_types[] = {
"application/vnd.etsi.iptvsad-bc+xml",
"application/vnd.etsi.iptvsad-cod+xml",
"application/vnd.etsi.iptvsad-npvr+xml",
+ "application/vnd.etsi.iptvservice+xml",
+ "application/vnd.etsi.iptvsync+xml",
"application/vnd.etsi.iptvueprofile+xml",
"application/vnd.etsi.mcid+xml",
+ "application/vnd.etsi.overload-control-policy-dataset+xml",
+ "application/vnd.etsi.pstn+xml",
"application/vnd.etsi.sci+xml",
"application/vnd.etsi.simservs+xml",
+ "application/vnd.etsi.tsl+xml",
"application/vnd.oma.xdm-apd+xml",
+ "application/vnd.oma.fnl+xml",
+ "application/vnd.oma.access-permissions-list+xml",
+ "application/vnd.oma.alias-principals-list+xml",
+ "application/upp-directory+xml", /*OMA-ERELD-XDM-V2_2_1-20170124-A*/
+ "application/vnd.oma.xdm-hi+xml",
+ "application/vnd.oma.xdm-rhi+xml",
+ "application/vnd.oma.xdm-prefs+xml",
+ "application/vnd.oma.xdcp+xml",
+ "application/vnd.oma.bcast.associated-procedure-parameter+xml",
+ "application/vnd.oma.bcast.drm-trigger+xml",
+ "application/vnd.oma.bcast.imd+xml",
+ "application/vnd.oma.bcast.notification+xml",
+ "application/vnd.oma.bcast.sgdd+xml",
+ "application/vnd.oma.bcast.smartcard-trigger+xml",
+ "application/vnd.oma.bcast.sprov+xml",
+ "application/vnd.oma.cab-address-book+xml",
+ "application/vnd.oma.cab-feature-handler+xml",
+ "application/vnd.oma.cab-pcc+xml",
+ "application/vnd.oma.cab-subs-invite+xml",
+ "application/vnd.oma.cab-user-prefs+xml",
+ "application/vnd.oma.dd2+xml",
+ "application/vnd.oma.drm.risd+xml",
+ "application/vnd.oma.group-usage-list+xml",
+ "application/vnd.oma.pal+xml",
+ "application/vnd.oma.poc.detailed-progress-report+xml",
+ "application/vnd.oma.poc.final-report+xml",
+ "application/vnd.oma.poc.groups+xml",
+ "application/vnd.oma.poc.invocation-descriptor+xml",
+ "application/vnd.oma.poc.optimized-progress-report+xml",
+ "application/vnd.oma.scidm.messages+xml",
+ "application/vnd.oma.suppnot+xml", /*OMA-ERELD-Presence_SIMPLE-V2_0-20120710-A*/
+ "application/vnd.oma.xcap-directory+xml",
+ "application/vnd.omads-email+xml",
+ "application/vnd.omads-file+xml",
+ "application/vnd.omads-folder+xml",
+ "application/vnd.3gpp.access-transfer-events+xml",
+ "application/vnd.3gpp.bsf+xml",
+ "application/vnd.3gpp.comm-div-info+xml", /*3GPP TS 24.504 version 8.19.0*/
"application/vnd.3gpp.cw+xml",
+ "application/vnd.3gpp.iut+xml", /*3GPP TS 24.337*/
+ "application/vnc.3gpp.iut-config+xml", /*3GPP TS 24.337*/
+ "application/vnd.3gpp.mid-call+xml",
+ "application/vnd.3gpp-prose-pc3ch+xml",
+ "application/vnd.3gpp-prose+xml",
+ "application/vnd.3gpp.replication+xml", /*3GPP TS 24.337*/
"application/vnd.3gpp.sms+xml",
"application/vnd.3gpp.srvcc-info+xml",
+ "application/vnd.3gpp.srvcc-ext+xml",
+ "application/vnd.3gpp.state-and-event-info+xml",
+ "application/vnd.3gpp.ussd+xml",
+ "application/vnd.3gpp2.bcmcsinfo+xml",
"application/vnd.wv.csp+xml",
"application/vnd.wv.csp.xml",
"application/watcherinfo+xml",
@@ -154,6 +212,7 @@ static const gchar *default_media_types[] = {
"application/x-wms-logplaystats",
"application/x-wms-sendevent",
"image/svg+xml",
+ "message/imdn+xml", /*RFC5438*/
};
static void insert_xml_frame(xml_frame_t *parent, xml_frame_t *new_child)