osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

From Lo�c Minier: if the field name for "x-wap.tod" is shown as a text 

string, decode the value as a text string, as per 1.0, section 8.4.1.2
("Field Values"):

	If the field name is encoded in text format, textual values MUST
	be used.

svn path=/trunk/; revision=8130
This commit is contained in:
Guy Harris 2003-08-04 23:36:13 +00:00
parent 3d16d6a0c0
commit f9ded39a63
3 changed files with 34 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
AUTHORS
View File

@ -1781,6 +1781,7 @@ And assorted fixes and enhancements by the people listed above and by:
Michael Kopp <michael.kopp [AT] isarnet.de>
Bernd Leibing <bernd.leibing [AT] kiz.uni-ulm.de>
Chris Heath <chris [AT] heathens.co.nz>
Loïc Minier <lool [AT] via.ecp.fr>
Alain Magloire <alainm[AT]rcsm.ece.mcgill.ca> was kind enough to
give his permission to use his version of snprintf.c.

1
doc/ethereal.pod.template
View File

@ -1877,6 +1877,7 @@ B<http://www.ethereal.com>.
Michael Kopp <michael.kopp [AT] isarnet.de>
Bernd Leibing <bernd.leibing [AT] kiz.uni-ulm.de>
Chris Heath <chris [AT] heathens.co.nz>
Loïc Minier <lool [AT] via.ecp.fr>
Alain Magloire <alainm[AT]rcsm.ece.mcgill.ca> was kind enough to give his
permission to use his version of snprintf.c.

51
packet-wsp.c
View File

@ -2,7 +2,7 @@
*
* Routines to dissect WSP component of WAP traffic.
*
* $Id: packet-wsp.c,v 1.73 2003/07/29 21:30:32 guy Exp $
* $Id: packet-wsp.c,v 1.74 2003/08/04 23:36:12 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -2299,28 +2299,41 @@ add_application_header (proto_tree *tree, tvbuff_t *tvb, int offset)
{
valueType = get_value_type_len (tvb, offset,
&subvalueLen, &subvalueOffset, &offset);
if (get_integer (tvb, subvalueOffset, subvalueLen,
valueType, &secs) == 0)
if (valueType == VALUE_IS_TEXT_STRING)
{
/*
* Fill in the "struct timeval", and add it to the
* protocol tree.
* Note: this will succeed even if it's a Short-integer.
* A Short-integer would work, but, as the time values
* are UNIX seconds-since-the-Epoch value, and as
* there weren't WAP phones or Web servers back in
* late 1969/early 1970, they're unlikely to be used.
*/
timeValue.secs = secs;
timeValue.nsecs = 0;
proto_tree_add_time (tree, hf_wsp_header_x_wap_tod,
tvb, startOffset, offset - startOffset, &timeValue);
proto_tree_add_text (tree, tvb, startOffset,
offset - startOffset, "%s: %s", token,
tvb_get_ptr (tvb, subvalueOffset, subvalueLen));
}
else
{
proto_tree_add_text (tree, tvb, startOffset,
offset - startOffset,
"%s: invalid date value", token);
if (get_integer (tvb, subvalueOffset, subvalueLen,
valueType, &secs) == 0)
{
/*
* Fill in the "struct timeval", and add it
* to the protocol tree.
* Note: this will succeed even if it's a
* Short-integer rather than an Integer.
* A Short-integer would work, but, as the
* time values are UNIX seconds-since-the-
* Epoch value, and as there weren't WAP
* phones or Web servers back in late
* 1969/early 1970, they're unlikely to be
* used.
*/
timeValue.secs = secs;
timeValue.nsecs = 0;
proto_tree_add_time (tree, hf_wsp_header_x_wap_tod,
tvb, startOffset, offset - startOffset,
&timeValue);
}
else
{
proto_tree_add_text (tree, tvb, startOffset,
offset - startOffset,
"%s: invalid date value", token);
}
}
}
else