Commit Graph

21706 Commits

Author SHA1 Message Date
Evan Huus 8610601f60 Simplify node structure. Use a boolean for whether or not it's a subtree, and an
enum for the color (red/black). Don't use bitfields since they don't save us
much (if anything) in terms of space and don't nest the fields in their own
anonymous struct.

svn path=/trunk/; revision=50011
2013-06-18 19:32:40 +00:00
Evan Huus 02752f3161 Factor function for node creation out and use it in several places.
svn path=/trunk/; revision=50010
2013-06-18 19:19:21 +00:00
Evan Huus 881845a555 Scrap wmem_memdup, it's not actually as useful as I thought it would be.
svn path=/trunk/; revision=50009
2013-06-18 19:01:01 +00:00
Evan Huus 115eb9c727 Factor common code for red-black tree array lookups into a helper function and
use it for both direct lookups and less-than-or-equal-to lookups.

svn path=/trunk/; revision=50008
2013-06-18 18:57:28 +00:00
Evan Huus 7fd970ac45 Remove wmem_tree_create_subtree, it does nothing we can't do with
wmem_tree_new.

svn path=/trunk/; revision=50007
2013-06-18 17:48:04 +00:00
Evan Huus d0c1d89cd6 Factor string-packing code into a common function to use in both insert_string
and lookup_string.

svn path=/trunk/; revision=50006
2013-06-18 17:39:15 +00:00
Evan Huus 701fb00afa Add test block for wmem_tree_lookup32_array_le(), fix other tests where certain
random seeds would cause collisions and false failures.

svn path=/trunk/; revision=50004
2013-06-18 06:22:47 +00:00
Evan Huus 54959c293d Wmem tree tests with non-trivial keys.
svn path=/trunk/; revision=50003
2013-06-18 05:41:16 +00:00
Evan Huus 7c99d55773 Re-port a bunch of the red-black tree code from wmem with fewer modifications,
and enable the tests.

Lesson: make it work, *then* refactor it into sanity.

svn path=/trunk/; revision=50002
2013-06-18 05:31:12 +00:00
Pascal Quantin 458dcb7ea2 Add ability to export decrypted SSL/DTLS PDUs
svn path=/trunk/; revision=50001
2013-06-18 01:13:07 +00:00
Jeff Morriss 3d1115c2bd From Anders:
Use integers intead of strings for hf_sync_timestamp
And hf_sync_packet_nr.
Ad ref. to specification.

svn path=/trunk/; revision=50000
2013-06-18 01:08:17 +00:00
Evan Huus b5c538ff81 Add tests for red-black tree array keys, if0-ed out until I can make them not
blow up. Not sure if the tests are wrong or if I broke something during the port
from wmem...

svn path=/trunk/; revision=49998
2013-06-18 00:21:32 +00:00
Evan Huus 5c027c2590 Extract some common code for array lookups, and replace some DISSECTOR
assertions with regular glib assertions - there's no guarantee that wmem code
will always be run from within a dissector.

svn path=/trunk/; revision=49993
2013-06-17 22:51:50 +00:00
Evan Huus eba26b89a4 From Niels de Vos via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8810
Use value_string array names_nfs4_operation_ext for nfs.main_opname, just like
nfs.opname does.

svn path=/trunk/; revision=49992
2013-06-17 22:41:43 +00:00
Evan Huus 3398ae2aea Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8809
The LLRP Standard 1.0.1 defines the ProtocolID Parameter as 8 bit value (see
LLRP Standard 1.0.1 document, page 138, AccessSpecParameter) but Wireshark
treats it as 16 bit value and therefore doesn't recognize the
EPCGlobalClass1Gen2 protocol type and marks the whole packet afterwards as
invalid.

svn path=/trunk/; revision=49991
2013-06-17 22:22:17 +00:00
Pascal Quantin 24623bdff3 More PDU export work:
- add automatic export of port type when exporting a source / destination port
- add export of SCTP PPID (usefulness to be checked)
- fix some field size

svn path=/trunk/; revision=49989
2013-06-17 21:54:21 +00:00
Pascal Quantin 20de5f1a9a Fix 7bit ASCII / IA5 SMS dissection broken in r49910
svn path=/trunk/; revision=49986
2013-06-17 19:52:01 +00:00
Evan Huus 3098636502 Ensure that the length parameter to dissect_per_length_determinant is
initialized even in cases where we error or otherwise fail to dissect.

Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8722

Thanks to Pascal for his help digging through this one.

svn path=/trunk/; revision=49985
2013-06-17 19:25:45 +00:00
Pascal Quantin eecfb7c423 Apply r49983 to other dissectors
svn path=/trunk/; revision=49984
2013-06-17 18:44:19 +00:00
Chris Maynard d3c38473b9 tvb_length_remaining() can return -1 so don't cast its return value to an unsigned type when performing integer comparisons. Instead, cast strlen()'s return value to a signed type and perform the comparison that way.
#BACKPORT(1.10,1.8)

svn path=/trunk/; revision=49983
2013-06-17 15:39:56 +00:00
Evan Huus b777bc825e Misc tweaks to packet-http-urlencoded.c
- add modelines
- convert emem to wmem
- add cast to satisfy my version of GCC

svn path=/trunk/; revision=49982
2013-06-17 14:18:23 +00:00
Michael Tüxen 42e31acad2 Fix typo.
svn path=/trunk/; revision=49979
2013-06-17 08:08:14 +00:00
Jakub Zawadzki f2f2f13db3 Fix for previous commit, don't use string if get_form_key_value() failed.
svn path=/trunk/; revision=49978
2013-06-17 07:41:48 +00:00
Jakub Zawadzki 6dd022f14f Add small dissector for application/x-www-form-urlencoded
svn path=/trunk/; revision=49977
2013-06-17 07:35:30 +00:00
Pascal Quantin 17fa61c36e Use a more compact display for the status bitmap
svn path=/trunk/; revision=49974
2013-06-17 04:26:16 +00:00
Pascal Quantin 503f7daaa9 Remove preceding zeroes
svn path=/trunk/; revision=49973
2013-06-17 04:22:45 +00:00
Evan Huus 858cb85eb4 Fix the test to respect the new behaviour.
svn path=/trunk/; revision=49971
2013-06-17 00:45:44 +00:00
Evan Huus fd22c548f5 Much smarter handling of autoreset trees.
svn path=/trunk/; revision=49970
2013-06-17 00:08:44 +00:00
Evan Huus 55264582be More callback tweaks, to permit unregistering a callback from the same place
it was originally registered.

svn path=/trunk/; revision=49969
2013-06-16 22:37:55 +00:00
Evan Huus ffee3af207 Fix include to use "" not <> for local headers.
svn path=/trunk/; revision=49968
2013-06-16 22:25:27 +00:00
Evan Huus 88c5b2e892 Rework the user callback code a bit to make it saner to use with the auto-reset
trees.

svn path=/trunk/; revision=49966
2013-06-16 22:07:24 +00:00
Martin Kaiser 27598e20a2 fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8806
assign the return values of decode_...() functions to a signed int
check for negative return values

svn path=/trunk/; revision=49963
2013-06-16 15:29:14 +00:00
Evan Huus d0fb6aca01 Simplify the tree code slightly - just don't call the transform function
if it's NULL, meaning we don't need to define an identity callback.

svn path=/trunk/; revision=49962
2013-06-16 15:17:53 +00:00
Martin Mathieson f4b3cb0917 Clarify interface/test for DL HARQ id, and remove a trailing comma from
an enum.

svn path=/trunk/; revision=49961
2013-06-16 15:11:21 +00:00
Martin Mathieson 562a126ddc Improve the way PDCP status PDUs are shown.
For the bitmap, present and missing SNs are both
interesting, but only until the last received SN 
(i.e. the last byte of the bitmap will be padded
out with zero bits).

It would be possible to use existing sequence analysis
info, where available, to decide if any zeros beyond the last
received SN are interesting...

svn path=/trunk/; revision=49959
2013-06-16 14:24:47 +00:00
Martin Kaiser 69f08fd281 display some more box names
svn path=/trunk/; revision=49955
2013-06-16 02:52:01 +00:00
Martin Mathieson b3ac3506e8 Add some comments around looking up names for port numbers.
(calling getservbyname() is really slow, but only called once per port
number...)

svn path=/trunk/; revision=49953
2013-06-16 01:53:43 +00:00
Evan Huus 82a13484b3 Add warning comment to tree autoreset function about allocator
destruction order, and note that it may need thinking about.

svn path=/trunk/; revision=49952
2013-06-16 01:47:43 +00:00
Evan Huus 28dafa414a Fix occasional wmem_test failure, allocator destruction order matters
(should it?)

svn path=/trunk/; revision=49951
2013-06-16 01:44:09 +00:00
Michael Mann 3846abe34d Replace if-else-if with switch statements
svn path=/trunk/; revision=49948
2013-06-16 00:14:07 +00:00
Evan Huus 6fd601bc3b Most of a red-black tree implementation for wmem, based heavily on the emem
version.

One plane trip's worth of work.

svn path=/trunk/; revision=49945
2013-06-15 10:40:56 +00:00
Michael Mann f42e5bc9c0 Remove check_col() and the occasional tree.
This leaves just the Pidl dissectors remaining for removal of check_col() in the dissectors directory.  A small handful of check_col() calls remain outside of the dissectors.

svn path=/trunk/; revision=49941
2013-06-14 19:46:54 +00:00
Chris Maynard dd7b71e384 Fix IEEE802a OUI lookups.
Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3123
#BACKPORT(1.10,1.8)

svn path=/trunk/; revision=49939
2013-06-14 17:57:08 +00:00
Michael Mann de68fd6eea Removed check_col() and the occasional tree.
svn path=/trunk/; revision=49938
2013-06-14 17:49:53 +00:00
Martin Kaiser 48dccb60ad remove some unnecessary check_col() calls
svn path=/trunk/; revision=49936
2013-06-14 15:53:52 +00:00
Martin Kaiser 2de0e97d65 add editor modelines
svn path=/trunk/; revision=49935
2013-06-14 15:50:20 +00:00
Martin Kaiser 3fe6a50c03 new dissector for the MP4/ISOBMFF file format
svn path=/trunk/; revision=49934
2013-06-14 15:33:58 +00:00
Martin Kaiser b19c7d5537 make line endings consistent
add svn properties

svn path=/trunk/; revision=49933
2013-06-14 15:08:10 +00:00
Evan Huus 101af7fa2d Mark unused params as such.
svn path=/trunk/; revision=49932
2013-06-14 14:56:00 +00:00
Michael Mann 66f10eec2e Add Common Address Redundancy Protocol (CARP) dissector, bug 8633 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8633)
From Uli Heilmeier

CARP shares the same protocol ID as VRRP (and VRRP's is IANA registered), so heuristics are provided.  VRRP and CARP are very similar, so I'm not sure having heuristics for both dissectors will help CARP.

svn path=/trunk/; revision=49931
2013-06-14 14:35:34 +00:00