Commit Graph

38 Commits

Author SHA1 Message Date
Olivier Biot f0a74d30c1 Add the dissection of a WBXML-encoded Profile-Diff header to the WSP and
WBXML dissectors by define a new protocol handle in the WBXML dissector.
This is necessary as the Profile document (XML or WBXML) has no associated
media type (or not a useful registration).

New WBXML media: "UAPROF for Profile-Diff header (WSP)"

svn path=/trunk/; revision=11251
2004-06-27 22:21:28 +00:00
Olivier Biot 5deb0ad918 While looking at a WV-CSP packet capture, I realized that there were still
leftovers from before the EXT_T fix where tvb_strsize() was being called.

This patch fixes this (both in TAG and ATTR processors).

svn path=/trunk/; revision=10895
2004-05-14 16:32:49 +00:00
Olivier Biot 42aca6e848 Fix a typo in the CHANNEL document ID.
svn path=/trunk/; revision=10874
2004-05-13 17:26:32 +00:00
Olivier Biot 9d78c83f6d Fix a bug in the processing of WV-CSP OPAQUE data (TCPAddress was Integer in
WV-CSP 1.0 but became a String from WV-CSP 1.1 onwards).

The token code page 3 of WV-CSP 1.2 is the same as in WV-CSP 1.1 (not 1.0).

svn path=/trunk/; revision=10643
2004-04-19 23:26:36 +00:00
Olivier Biot 5c550c3788 Fix a typo in %DateTime of length 7 (missing colon between minutes and seconds).
svn path=/trunk/; revision=10627
2004-04-17 10:45:58 +00:00
Olivier Biot a0146ed5be Add a discriminator for WV-CSP so the correct version is used for rendering the WBXML tokens in WV-CSP.
Provide rendering of OPAQUE data for media types, based on a framework of 4 functions that take care of well-known and literal tags and attribute names for deciding on the meaning of the OPAQUE data. Applied to SI, EMN and WV-CSP.

Update reference URLs for WAP, OMA and related specs.

Note: as the WBXML common code only takes ~2000 lines while the token mappings take ~4000 lines, maybe it is time to envisage writing the per-media mappings to dedicated source files (packet-wbxml-wml.c, packet-wbxml-wv_csp.c etc)?

svn path=/trunk/; revision=10615
2004-04-16 22:44:24 +00:00
Olivier Biot e6ee0dc7c7 Add two preferences to the WBXML dissector:
- Control the rendering of WBXML tokens to a media type token mapping.
- Control the dissection of the tokens that make up the WBXML body.
Both preferences are OFF by default.

Fix some comments as they did not reflect the current state anymore.

svn path=/trunk/; revision=10608
2004-04-15 22:38:22 +00:00
Olivier Biot aac47b1b7a Enclose WV-CSP 1.2 token mappings in conditional compile comments. Once the
WV-CSP 1.2 specifications will be corrected and in approved state, we can
get rid of those comments (#ifdef ... #endif).

svn path=/trunk/; revision=10396
2004-03-17 19:50:05 +00:00
Olivier Biot 0952c3042d Redesigned the token map aggregation.
New simpler lists for both known registered WBXML public IDs and unknown
lists based on content type value. The latter have the possibility to add
a discriminator which facilitates a more correct/appropriate selection of
the token map in cases where more (backwards incompatible) versions exist.

Now the EXT_T tokens are correctly decoded, and a mapping function can be
assigned. This has been done in WML (existing code reused there) and in WV-CSP
(new functions looking up a value in a value_string based on the offset after
the EXT_T_0 token).

Add the textual WV-CSP media type to packet-text-media.c.

TODO - write the discriminators for WML, SyncML and WV-CSP. Add the code for
running the discriminators and possibly iterating over a list of mappings.

svn path=/trunk/; revision=10352
2004-03-09 02:12:56 +00:00
Olivier Biot 4117eb2b7d Remove email addresses and add a reference to the AUTHORS file (or man page)
for contacting the authors of the files.

svn path=/trunk/; revision=10345
2004-03-08 22:03:59 +00:00
Olivier Biot d312189f0d Rearrange WV-CSP tokens in numeric order, and flag WV-CSP bugs.
Track differences between WV-CSP versions in the token definitions.

Get rid of 8-bit characters in some comments.

Get rid of 'unused symbol' warnings.

svn path=/trunk/; revision=10344
2004-03-08 21:41:47 +00:00
Olivier Biot b90bc92dfc 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 :)

svn path=/trunk/; revision=10308
2004-03-04 23:33:41 +00:00
Olivier Biot e995c6bc47 Fix WML 1.0 token definitions (WBXML tokens must be in the range 0--3F
as the 2 most significant bits of every token byte represent whether the
tag has content and/or has an attribute list.

svn path=/trunk/; revision=10307
2004-03-04 23:16:08 +00:00
Olivier Biot 7fc8a5255a Add Wireless Village dissection (part 1). I will have to rewrite the support
for custom EXT_T_x handlers as in WV-CSP you're allowed to *not* have the
index point to a string in the string table (verified in WBXML specs).

Unfortunately, WV-CSP is *never* backwards compatible. Additionally, things
get messed up when the WBXML document does *not* contain the WV-CSP DocType.
As a result, I eventually require to let the end-user choose which WV-CSP
version they want to see in such cases.

Fix code page errors with global tokens (don't depend on code pages).

Add some comment at the top level of the file.

svn path=/trunk/; revision=10280
2004-03-02 22:15:30 +00:00
Olivier Biot 9d1b12808c Spotted by Guy Harris: SyncML media type was not registered (it was lost
when we introduced the media dissector table and got rid of the WSP
binary content type dissector table).

svn path=/trunk/; revision=9983
2004-02-05 18:57:14 +00:00
Jörg Mayer e78aba0a40 warning: ISO C does not allow extra ; outside of a function
svn path=/trunk/; revision=9387
2003-12-21 05:51:34 +00:00
Olivier Biot d6b851b8d7 WBXML dissector: Move summary update code outside of if (tree) construct.
WSP dissector: clean up redirect dissection, add generic address field
dissection, add Session Initiation Request dissection, rewrite capability
dissection, and various small updates.

svn path=/trunk/; revision=9301
2003-12-16 22:39:32 +00:00
Olivier Biot 283f925b93 Remove unused dissector handles from the WAP dissectors.
Rename the WAP protocols so that they reflect the protocol name and not the
protocol stack name.

Fix the WSP content-type header.

Rename the WSP header fields from 'hdr' to 'header'.

Rename the WSP Openwave header fields from header code page 'x-up-1':
replace 'openwave' with 'x_up_1' (is more intuitive).

Remove unused WSP header fields.

Rename the WTLS header fields so they do not contain 'wsp' anymore.

Correct the WBXML code page switches in the token parsers.

Fix the code page support of multi-codepage content.

Update the PROV WBXML content (and find bugs in the new OMA Prov spec :).

svn path=/trunk/; revision=9291
2003-12-15 22:38:29 +00:00
Olivier Biot 24a0f45006 Add an equal sign to WBXML Attribute Start items that didn't have it.
svn path=/trunk/; revision=9271
2003-12-13 13:27:30 +00:00
Olivier Biot df1236de05 Move info column update code outside of if (tree).
svn path=/trunk/; revision=9251
2003-12-12 23:35:22 +00:00
Olivier Biot 2b8a6c6f4d Get rid of the integer media type dissector table in WSP, WBXML and MMSE.
svn path=/trunk/; revision=9203
2003-12-08 20:37:15 +00:00
Olivier Biot 3565f7da28 Remove the literal WSP content type dissector table, and replace it with the "media_type" table defined in the HTTP dissector.
svn path=/trunk/; revision=9194
2003-12-07 18:09:52 +00:00
Guy Harris 364261f0ad From Olivier Biot:
* Add a "match_string" field to the "packet_info" structure,
	  saving the string value that matched in a string dissector
	  lookup, by analogy to "match_port" - this was required for
	  dissection with token rendering of WBXML content when no public
	  ID was given (e.g. Nokia/Ericsson OTA provisioning data).
	* Add support for textual content type based WBXML token
	  mapping.
	* Add extra WBXML public identifiers.
	* Add the Nokia/Ericsson OTA provisioning (version 7) token
	  definitions.
	* Inform the user when a content-type based token match is found.

svn path=/trunk/; revision=9061
2003-11-21 21:58:55 +00:00
Guy Harris 7005a5f725 From Olivier Biot: add support for media type
"application/x-prov.syncset+wbxml".

svn path=/trunk/; revision=9049
2003-11-20 22:50:56 +00:00
Guy Harris e4080b8a02 From Olivier Biot:
* Fix an incorrectly #ifdef'ed return introduced by the previous
	  patch
	* Remove the parsed_length parameter from the function signature
	  of the tag and attribute dissectors - have it return the
	  parsed length, instead
	* Throw ReportedBoundsError exceptions if we run past the end of
	  the tvbuff, rather than putting a special entry in
	* Produce consistent and extensive debug logging (enabled by
	  defining DEBUG_wbxml)
	* Get rid of the dozens of "#ifdef DEBUG ... #endif" constructs
	  for debug logging

svn path=/trunk/; revision=9047
2003-11-20 22:24:15 +00:00
Guy Harris 674c756e6d From Olivier Biot: fix the WBXML dissector in cases where dissection is
interrupted because of a short frame or packets not being reassembled,
and provide additional debug logging.

svn path=/trunk/; revision=9040
2003-11-19 22:55:27 +00:00
Guy Harris 98b0611239 From Biot Olivier:
Rename WSP defines to avoid collisions with Windows defines.

	Rename WSP dissector table for integer-value content types.

	Add WSP dissector table for literal content types.

	Add WSP dissection registration for literal content types.

	Register literal and extra WBXML content types to WSP dissector.

	Register textual MMS content type to WSP dissector.

svn path=/trunk/; revision=8648
2003-10-09 18:54:06 +00:00
Guy Harris 19568c0901 From Biot Olivier: get rid of unused value_string table, and allow WBXML
1.0 dissection.

svn path=/trunk/; revision=7946
2003-06-26 18:28:12 +00:00
Guy Harris 202ee2ce25 Use "tvb_format_text()" to display strings, so that non-printable
characters don't show up.  (We really need to handle strings better in
Ethereal, so that we can handle various character encodings in the
packets; GTK+ 2.x uses UTF-8 internally, so we could at least map
everything to that when displaying, and I think GTK+ 1.x for Win32 does
so as well, and but we need to clean up the GTK+ 1.x-for-X11 stuff to
handle the various font encodings.)

Get rid of "strtbl_lookup()" in favor of the appropriate direct calls.

svn path=/trunk/; revision=7800
2003-06-06 20:31:45 +00:00
Guy Harris 72cc048ae1 From Olivier Biot:
* Support correct processing of code page switches
* Provide a new datatype containing scarce array of
  const value_string arrays (value_valuestring)
  allowing an efficient support for WBXML code pages.
* Minor fix (XML PI was always decoded without
  mapping known tokens)
* Add support for decoding of more WBXML content
  types (SyncML 1.0, SyncML 1.1, CHANNEL 1.0, EMN 1.0).

svn path=/trunk/; revision=7626
2003-05-01 18:18:20 +00:00
Guy Harris 9137608763 From Olivier Biot: add more (WB)XML DTDs from WINA.
svn path=/trunk/; revision=7472
2003-04-16 18:29:38 +00:00
Guy Harris d85fbe9cdb From Olivier Biot: fix quotation of attibute values for the WAP
Provisioning DTD representation.

svn path=/trunk/; revision=7377
2003-03-27 19:23:10 +00:00
Guy Harris 1837c71d7d From Olivier Biot: fix up various field names and descriptions, add a
URL for WAP specifications, and clean up some other stuff.

svn path=/trunk/; revision=7211
2003-02-27 02:52:50 +00:00
Guy Harris 44fed5407e From Olivier Biot:
- Move all static definitions from packet-wbxml.h to packet-wbxml.c
 - Comment out inclusion of packet-wbxml.h in packet-wbxml.c
 - Append WBXML + version + public ID to the Info column

Then, while we're at it, get rid of packet-wbxml.h (we can reinstate it
if there's any functionality to export other than the dissector) and get
rid of the include of packet-wbxml.h (and update comments not to refer
to it).

svn path=/trunk/; revision=7153
2003-02-14 19:39:54 +00:00
Jörg Mayer 8f75637e6f Mark pinfo parameter as unused
svn path=/trunk/; revision=7136
2003-02-13 22:00:53 +00:00
Guy Harris 699e4314d5 From Olivier Biot:
add string table parsing and displaying;

	add registration to more content types;

	LITERAL tag indentation fix;

	add and a change in unrendered WBXML: from confusing "<Tag
	0x37>" type display to "<Tag_0x37>" (and same in attribute
	state).

svn path=/trunk/; revision=7129
2003-02-12 21:46:15 +00:00
Guy Harris eb9a181518 WBXML updates, and e-mail address update, from Olivier Biot.
svn path=/trunk/; revision=7126
2003-02-12 01:17:07 +00:00
Guy Harris d48ec06a6a From Olivier Biot: WBXML/WMLC support.
svn path=/trunk/; revision=7084
2003-02-06 01:23:32 +00:00