Anders Broman
6bde918078
From beroset:
...
remove C++ incompatibilities
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416
svn path=/trunk/; revision=48426
2013-03-19 20:00:52 +00:00
Anders Broman
2cc00294c7
Use explicit casts.
...
svn path=/trunk/; revision=48260
2013-03-12 06:41:00 +00:00
Jaap Keuter
1b205127f8
Fix for bug 7939:
...
Register application/json-rpc and application/jsonrequest media types for JSON.
svn path=/trunk/; revision=47872
2013-02-25 06:48:35 +00:00
Evan Huus
a99e6fe842
From Jim Young via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8318
...
Support for processing UTF-16 surrogate pairs in JSON packets.
svn path=/trunk/; revision=47642
2013-02-12 16:20:24 +00:00
Jakub Zawadzki
d6d3e59660
RFC 4627 allows upper case hex digits as well
...
svn path=/trunk/; revision=45379
2012-10-08 09:48:38 +00:00
Jakub Zawadzki
9baaa74218
+10 ;|
...
svn path=/trunk/; revision=45374
2012-10-07 20:13:11 +00:00
Jakub Zawadzki
ac4419071b
Unescape JSON strings.
...
svn path=/trunk/; revision=45373
2012-10-07 19:57:21 +00:00
Jakub Zawadzki
cb12df2ca8
Fix bug #7805 : application/json HTTP packets sometimes isn't decoded
...
tvbparse_quoted() don't support well JSON string escaping, use our own tvbparse rule.
svn path=/trunk/; revision=45372
2012-10-07 19:33:47 +00:00
Jeff Morriss
2552c750e5
We always HAVE_CONFIG_H so don't bother checking whether we have it or not.
...
svn path=/trunk/; revision=45017
2012-09-20 02:03:38 +00:00
Chris Maynard
0d41b6edad
tvb_length_remaining() can return -1, so check that it's > 0, and not != 0. If tvb_length_remaining() is > 0, then tvb_reported_length_remaining() should also be > 0, so I don't think there's a need for further checks there.
...
svn path=/trunk/; revision=43719
2012-07-15 14:29:06 +00:00
Jakub Zawadzki
b18e880040
Update FSF address - part II.
...
svn path=/trunk/; revision=43538
2012-06-28 23:18:38 +00:00
Bill Meier
794757ae8f
For proto_tree_add_item(..., proto_xxx, ...)use ENC_NA as the encoding arg.
...
Also: remove trailing whitespace for a number of files.
svn path=/trunk/; revision=39503
2011-10-21 02:10:19 +00:00
Bill Meier
293049dfba
Do some conversions of proto_tree_add_item() 'encoding' arg.
...
(previously missed).
57 FT_BOOLEAN: FALSE-->ENC_BIG_ENDIAN
31 FT_BOOLEAN: TRUE-->ENC_LITTLE_ENDIAN
10 FT_BYTES: ENC_BIG_ENDIAN-->ENC_NA
1 FT_BYTES: ENC_LITTLE_ENDIAN-->ENC_NA
21 FT_BYTES: FALSE-->ENC_NA
2 FT_BYTES: TRUE-->ENC_NA
2 FT_IPXNET: ENC_BIG_ENDIAN-->ENC_NA
6 FT_IPv6: ENC_BIG_ENDIAN-->ENC_NA
1 FT_IPv6: FALSE-->ENC_NA
6 FT_NONE: ENC_BIG_ENDIAN-->ENC_NA
19 FT_NONE: FALSE-->ENC_NA
3 FT_NONE: TRUE-->ENC_NA
1 FT_STRING: ENC_BIG_ENDIAN-->ENC_ASCII|ENC_NA
1 FT_STRING: ENC_LITTLE_ENDIAN-->ENC_ASCII|ENC_NA
5 FT_STRING: FALSE-->ENC_ASCII|ENC_NA
1 FT_STRING: TRUE-->ENC_ASCII|ENC_NA
4 FT_STRINGZ: ENC_NA-->ENC_ASCII|ENC_NA
8 FT_STRINGZ: FALSE-->ENC_ASCII|ENC_NA
1 FT_INT32: FALSE-->ENC_BIG_ENDIAN
1 FT_INT32: TRUE-->ENC_LITTLE_ENDIAN
11 FT_UINT8: 0-->ENC_BIG_ENDIAN
111 FT_UINT8: FALSE-->ENC_BIG_ENDIAN
17 FT_UINT8: TRUE-->ENC_LITTLE_ENDIAN
1 FT_UINT16: 0-->ENC_BIG_ENDIAN
68 FT_UINT16: FALSE-->ENC_BIG_ENDIAN
18 FT_UINT16: TRUE-->ENC_LITTLE_ENDIAN
4 FT_UINT24: FALSE-->ENC_BIG_ENDIAN
70 FT_UINT32: FALSE-->ENC_BIG_ENDIAN
1 FT_UINT32: TRUE-->ENC_LITTLE_ENDIAN
4 FT_UINT64: FALSE-->ENC_BIG_ENDIAN
1 FT_UINT64: TRUE-->ENC_LITTLE_ENDIAN
1 FT_UINT_STRING: FALSE-->ENC_ASCII|ENC_BIG_ENDIAN
svn path=/trunk/; revision=39442
2011-10-16 23:38:49 +00:00
Bill Meier
94f36ca4ff
Use ENC_NA as encoding for proto_tree_add_item() calls which directly reference an hf item (in hf[] with types:
...
FT_NONE
FT_BYTES
FT_IPV6
FT_IPXNET
FT_OID
Note: Encoding field set to ENC_NA only if the field was previously TRUE|FALSE|ENC_LITTLE_ENDIAN|ENC_BIG_ENDIAN
svn path=/trunk/; revision=39260
2011-10-04 22:44:31 +00:00
Jakub Zawadzki
abe9ce28a5
Update my email address.
...
svn path=/trunk/; revision=37831
2011-06-29 11:03:41 +00:00
Jakub Zawadzki
f1c2141a26
Remove invalid svn:executable property
...
svn path=/trunk/; revision=36798
2011-04-22 07:36:37 +00:00
Chris Maynard
2cd8459ddb
From Jakub Zawadzki via bug 4753: New dissector: JSON, w/minor changes by me:
...
1) Add links to RFC 4627 and the json.org web site.
2) Comment out hf_json_member_key to keep tools/checkhf.pl happy.
3) Avoid duplicate (application/json) from being displayed in Info column.
svn path=/trunk/; revision=35317
2010-12-31 18:03:23 +00:00