Remove the literal WSP content type dissector table, and replace it with the "media_type" table defined in the HTTP dissector.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@9194 f5534014-38df-0310-8fa8-9805f1628bb7

1 files changed, 26 insertions, 22 deletions

diff --git a/packet-wbxml.c b/packet-wbxml.c
index 34fd90c7a4..cbbe964653 100644
--- a/packet-wbxml.c
+++ b/packet-wbxml.c
@@ -2,7 +2,7 @@
  * Routines for wbxml dissection
  * Copyright 2003, Olivier Biot <olivier.biot (ad) siemens.com>
  *
- * $Id: packet-wbxml.c,v 1.16 2003/11/21 21:58:53 guy Exp $
+ * $Id: packet-wbxml.c,v 1.17 2003/12/07 18:09:52 obiot Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -3748,109 +3748,113 @@ proto_reg_handoff_wbxml(void)
 	 * for WBXML dissection.
 	 * 
 	 * See http://www.wapforum.org/wina/wsp-content-type.htm
+	 * 
+	 * As the media types for WSP and HTTP are the same, the WSP dissector
+	 * uses the same string dissector table as the HTTP protocol. This is
+	 * not true for the integer representation of the WSP media types.
 	 */
 
 	/**** Well-known WBXML WSP Content-Type values ****/
 	
 	/* application/vnd.wap.wmlc */
 	dissector_add("wsp.content_type.integer", 0x14, wbxml_handle);
-	dissector_add_string("wsp.content_type.literal",
+	dissector_add_string("media_type",
 			"application/vnd.wap.wmlc", wbxml_handle);
 	
 	/* application/vnd.wap.wta-eventc */
 	dissector_add("wsp.content_type.integer", 0x16, wbxml_handle);
-	dissector_add_string("wsp.content_type.literal",
+	dissector_add_string("media_type",
 			"application/vnd.wap.wta-eventc", wbxml_handle);
 	
 	/* application/vnd.wap.wbxml */
 	dissector_add("wsp.content_type.integer", 0x29, wbxml_handle);
-	dissector_add_string("wsp.content_type.literal",
+	dissector_add_string("media_type",
 			"application/vnd.wap.wbxml", wbxml_handle);
 	
 	/* application/vnd.wap.sic */
 	dissector_add("wsp.content_type.integer", 0x2E, wbxml_handle);
-	dissector_add_string("wsp.content_type.literal",
+	dissector_add_string("media_type",
 			"application/vnd.wap.sic", wbxml_handle);
 	
 	/* application/vnd.wap.slc */
 	dissector_add("wsp.content_type.integer", 0x30, wbxml_handle);
-	dissector_add_string("wsp.content_type.literal",
+	dissector_add_string("media_type",
 			"application/vnd.wap.slc", wbxml_handle);
 	
 	/* application/vnd.wap.coc */
 	dissector_add("wsp.content_type.integer", 0x32, wbxml_handle);
-	dissector_add_string("wsp.content_type.literal",
+	dissector_add_string("media_type",
 			"application/vnd.wap.coc", wbxml_handle);
 	
 	/* application/vnd.wap.connectivity-wbxml */
 	dissector_add("wsp.content_type.integer", 0x36, wbxml_handle);
-	dissector_add_string("wsp.content_type.literal",
+	dissector_add_string("media_type",
 			"application/vnd.wap.connectivity-wbxml", wbxml_handle);
 	
 	/* application/vnd.wap.locc+wbxml */
 	dissector_add("wsp.content_type.integer", 0x40, wbxml_handle);
-	dissector_add_string("wsp.content_type.literal",
+	dissector_add_string("media_type",
 			"application/vnd.wap.locc+wbxml", wbxml_handle);
 	
 	/* application/vnd.syncml.dm+wbxml */
 	dissector_add("wsp.content_type.integer", 0x42, wbxml_handle);
-	dissector_add_string("wsp.content_type.literal",
+	dissector_add_string("media_type",
 			"application/vnd.syncml.dm+wbxml", wbxml_handle);
 	
 	/* application/vnd.oma.drm.rights+wbxml */
 	dissector_add("wsp.content_type.integer", 0x4B, wbxml_handle);
-	dissector_add_string("wsp.content_type.literal",
+	dissector_add_string("media_type",
 			"application/vnd.oma.drm.rights+wbxml", wbxml_handle);
 
 	/**** Registered WBXML WSP Content-Type values ****/
 
 	/* application/vnd.uplanet.cacheop-wbxml */
 	dissector_add("wsp.content_type.integer", 0x0201, wbxml_handle);
-	dissector_add_string("wsp.content_type.literal",
+	dissector_add_string("media_type",
 			"application/vnd.uplanet.cacheop-wbxml", wbxml_handle);
 	
 	/* application/vnd.uplanet.alert-wbxml */
 	dissector_add("wsp.content_type.integer", 0x0203, wbxml_handle);
-	dissector_add_string("wsp.content_type.literal",
+	dissector_add_string("media_type",
 			"application/vnd.uplanet.alert-wbxml", wbxml_handle);
 	
 	/* application/vnd.uplanet.list-wbxml */
 	dissector_add("wsp.content_type.integer", 0x0204, wbxml_handle);
-	dissector_add_string("wsp.content_type.literal",
+	dissector_add_string("media_type",
 			"application/vnd.uplanet.list-wbxml", wbxml_handle);
 	
 	/* application/vnd.uplanet.listcmd-wbxml */
 	dissector_add("wsp.content_type.integer", 0x0205, wbxml_handle);
-	dissector_add_string("wsp.content_type.literal",
+	dissector_add_string("media_type",
 			"application/vnd.uplanet.listcmd-wbxml", wbxml_handle);
 	
 	/* application/vnd.uplanet.channel-wbxml */
 	dissector_add("wsp.content_type.integer", 0x0206, wbxml_handle);
-	dissector_add_string("wsp.content_type.literal",
+	dissector_add_string("media_type",
 			"application/vnd.uplanet.channel-wbxml", wbxml_handle);
 	
 	/* application/vnd.uplanet.bearer-choice-wbxml */
 	dissector_add("wsp.content_type.integer", 0x0209, wbxml_handle);
-	dissector_add_string("wsp.content_type.literal",
+	dissector_add_string("media_type",
 			"application/vnd.uplanet.bearer-choice-wbxml", wbxml_handle);
 	
 	/* application/vnd.phonecom.mmc-wbxml */
 	dissector_add("wsp.content_type.integer", 0x020A, wbxml_handle);
-	dissector_add_string("wsp.content_type.literal",
+	dissector_add_string("media_type",
 			"application/vnd.phonecom.mmc-wbxml", wbxml_handle);
 	
 	/* application/vnd.nokia.syncset+wbxml */
 	dissector_add("wsp.content_type.integer", 0x020B, wbxml_handle);
-	dissector_add_string("wsp.content_type.literal",
+	dissector_add_string("media_type",
 			"application/vnd.nokia.syncset+wbxml", wbxml_handle);
 
 	/***** Content types that only have a textual representation *****/
-	dissector_add_string("wsp.content_type.literal",
+	dissector_add_string("media_type",
 			"application/x-wap-prov.browser-bookmarks", wbxml_handle);
-	dissector_add_string("wsp.content_type.literal",
+	dissector_add_string("media_type",
 			"application/x-wap-prov.browser-settings", wbxml_handle);
 	/* Same as application/vnd.nokia.syncset+wbxml */
-	dissector_add_string("wsp.content_type.literal",
+	dissector_add_string("media_type",
 			"application/x-prov.syncset+wbxml", wbxml_handle);
 	
 }