aboutsummaryrefslogtreecommitdiffstats
path: root/packet-wbxml.c
diff options
context:
space:
mode:
authorobiot <obiot@f5534014-38df-0310-8fa8-9805f1628bb7>2004-03-04 23:33:41 +0000
committerobiot <obiot@f5534014-38df-0310-8fa8-9805f1628bb7>2004-03-04 23:33:41 +0000
commit57d054530b0fdcec5956207871aa36a5db4e3d28 (patch)
tree53555027b3b6d6177a88e8c19a9968a64a272753 /packet-wbxml.c
parent70124d09cb4fc6887d3ef255e6b0177ccd18ee49 (diff)
Cosmetic fix in WV-CSP tag definitions.
Flag a known VERY NASTY bug in WV-CSP 1.2 where a token is being defined twice with the same binary identifier. It's already a mess that they don't provide backwards compatible encodings; you can now write a WV-CSP document without being able to parse it because of version issues (hint: 1.2 has no public WBXML identifier yet and the spec explicitly asks to set it to "Unknown/Missing" so you could write an 1.1 message in 1.2 format, which looks *really* weird as the tokens are mixed in both codings). Consequence: I have to foresee a discriminator for the WBXML dissectors so I *may* predict the correct version. I like reviewing in engineering :) git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@10308 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'packet-wbxml.c')
-rw-r--r--packet-wbxml.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/packet-wbxml.c b/packet-wbxml.c
index 4ce4d480c1..b4044f050c 100644
--- a/packet-wbxml.c
+++ b/packet-wbxml.c
@@ -3,7 +3,7 @@
* Routines for wbxml dissection
* Copyright 2003, Olivier Biot <olivier.biot (ad) siemens.com>
*
- * $Id: packet-wbxml.c,v 1.26 2004/03/04 23:16:08 obiot Exp $
+ * $Id: packet-wbxml.c,v 1.27 2004/03/04 23:33:41 obiot Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -2478,11 +2478,11 @@ static const value_string wbxml_wv_csp_11_tags_cp1[] = {
/* Service code page */
static const value_string wbxml_wv_csp_11_tags_cp2[] = {
/* 0x00 -- 0x04 GLOBAL */
- { 0x5, "ADDGM" },
- { 0x6, "AttListFunc" },
- { 0x7, "BLENT" },
- { 0x8, "CAAUT" },
- { 0x9, "CAINV" },
+ { 0x05, "ADDGM" },
+ { 0x06, "AttListFunc" },
+ { 0x07, "BLENT" },
+ { 0x08, "CAAUT" },
+ { 0x09, "CAINV" },
{ 0x0A, "CALI" },
{ 0x0B, "CCLI" },
{ 0x0C, "ContListFunc" },
@@ -3085,7 +3085,7 @@ static const value_string wbxml_wv_csp_12_tags_cp2[] = {
{ 0x39, "STSRC" },
{ 0x3A, "SUBGCN" },
{ 0x3B, "UPDPR" },
- { 0x3E, "VRID" },
+ { 0x3E, "VRID" }, /* Duplicate - WV-CSP is really crappy */
{ 0x3C, "WVCSPFeat" },
{ 0x00, NULL }