Commit Graph

38329 Commits

Author SHA1 Message Date
Chris Maynard 618b231e19 Alphabetize the list of encapsulation types via "mergecap -T" as well as the list of capture file types via "mergecap -F".
svn path=/trunk/; revision=40282
2011-12-22 21:52:16 +00:00
Chris Maynard fe290f10f6 Appease the buildbots.
svn path=/trunk/; revision=40281
2011-12-22 19:41:13 +00:00
Chris Maynard a856a7ec53 Revert some of the changes made as part of the patch from bug 6194 committed in r38326. Also, change the 3 separate reserved bit fields to a single 3-bit reserved field to more closely match the spec. Lastly, in accordance with NOTE 2 of Table 3-1 of the spec, display the connection id, whatever it is, rather than assuming it's zero just because the Com bit isn't set.
svn path=/trunk/; revision=40280
2011-12-22 19:22:43 +00:00
Martin Mathieson ac8463ce5b Missed in last commit, define symbol for new RNTI type...
svn path=/trunk/; revision=40279
2011-12-22 18:45:15 +00:00
Bill Meier 1e89640004 (Trivial) Indentation, whitespace & formatting cleanup.
svn path=/trunk/; revision=40278
2011-12-22 18:13:18 +00:00
Bill Meier 70e4b3dab4 Add two missing calls to add_new_data_source().
svn path=/trunk/; revision=40277
2011-12-22 18:09:06 +00:00
Martin Mathieson 412385e6fd Support for MCH PDUs (introduced in R9 for MBMS).
From Pascal Quantin.

svn path=/trunk/; revision=40276
2011-12-22 18:05:48 +00:00
Chris Maynard 4b735ad5f3 What is the airspeed velocity of an unladen swallow?
aspell and my own spelling preferences do not always agree with the spelling variations used by folks across the pond.  Revert a couple of spelling changes.

svn path=/trunk/; revision=40275
2011-12-22 14:49:43 +00:00
Guy Harris 7962edcf56 The encapsulation following WTAP_ENCAP_ARCNET is
WTAP_ENCAP_ARCNET_LINUX; update various tables mapping Wiretap
encapsulations to file-type encapsulations.  Get rid of some trailing
"sorry, that's not supported" entries while we're at it.

svn path=/trunk/; revision=40274
2011-12-22 09:22:35 +00:00
Anders Broman 678711f488 From Naoyoshi Ueda:
Enable decryption of TLS 1.2.

 Add some cipher suites from RFC5246 and RFC5289.

Fixed a bug in the handling of stream cipher.
(The explicit IV field in the application record doesn't exist when stream ciphers are used. But the original code handles it as if one-byte IV exists.)

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

svn path=/trunk/; revision=40273
2011-12-22 07:03:42 +00:00
Anders Broman 55b05cb42b From Fred Fierling:
Update the ZigBee dissectors to the latest profile identifier database,
05-3298-18.

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

svn path=/trunk/; revision=40272
2011-12-22 06:55:31 +00:00
Chris Maynard c4f4087a9a Use ENC_LITTLE_ENDIAN instead of TRUE as endian argument to proto_tree_add_bitmask_text().
svn path=/trunk/; revision=40271
2011-12-22 02:17:11 +00:00
Chris Maynard b3ee0e1295 Set encoding to ENC_BIG_ENDIAN instead of the incorrect encoding of TRUE.
svn path=/trunk/; revision=40270
2011-12-22 01:57:20 +00:00
Bill Meier 9708878fa3 Rework some code in tvbtest to fix an issue when testing composite tvbs.
tvbtest now completes all the tvb tests successfully (including those for composite tvbs) !!

In addition, running tvbtest under valgrind shows no memory leaks.


svn path=/trunk/; revision=40269
2011-12-21 23:42:17 +00:00
Bill Meier a15064f02f Fix a Windows compile error.
svn path=/trunk/; revision=40268
2011-12-21 21:49:10 +00:00
Bill Meier 522950401f Add code to allow tvbuff memory leak testing (using valgrind, for example).
Essentially: tvbtest.c patch from Robert G. Jakabosky:
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6573

Also: Update tvbtest code slightly to reflect the revised tvbuffs code
committed in SVN #40264;
 (Composite tvbs should not be individually freed).


svn path=/trunk/; revision=40267
2011-12-21 21:40:25 +00:00
Chris Maynard 796847fdc7 Avoid a potential buffer overflow (and fix some typos). Resolves bug 6391: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6391
svn path=/trunk/; revision=40266
2011-12-21 21:34:37 +00:00
Bill Meier 77fe2b7b69 Remove no longer relevant comment about incrementing tvb usage count to prevent freeing tvbs.
svn path=/trunk/; revision=40265
2011-12-21 18:57:42 +00:00
Bill Meier 14309d2c72 A simplified version of tvbuffs:
- Essentially no changes from current dissector de facto tvbuff usage;
- Do away with 'usage_counts' and with 'used_in' GSLists;
- Manage tvb chains via a simple doubly linked list.
- API changes:
  a. tvb_increment_usage_count() and tvb_decrement_usage_count() no
     longer exist;
  b. tvb_free_chain() can only be called for the 'top-level' (initial)
     tvb of a chain) or for a tvb not in a chain.
  c. tvb_free() now just calls tvb_free_chain() [should have no impact
     on existing  dissectors].

svn path=/trunk/; revision=40264
2011-12-21 17:39:02 +00:00
Alexis La Goutte ff30e7df57 From jingzhang via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6590
Make wireshark to support SKINNY new version

Current wireshark version can not support the new skinny packets when the header version == "14 00 00 00". It should be the same handling process with "12 00 00 00"(CM7_MSG_TYPE_B), So we added the same function to support CM7_MSG_TYPE_C(we defined it by ourselves, just want to keep the consistency with CM7_MSG_TYPE_B).

From me :
Fix encoding attribut (via fix-encoding.args.pl)

svn path=/trunk/; revision=40263
2011-12-21 15:03:39 +00:00
Alexis La Goutte c2dbdb6f42 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=40262
2011-12-21 14:58:07 +00:00
Alexis La Goutte 86e2ba54d4 From Alexander Koeppe via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6689
Avoid string.h in packet-mpls.c

svn path=/trunk/; revision=40261
2011-12-21 14:28:51 +00:00
Alexis La Goutte 9746da77ee From Jelmer Vernooij via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6686
Dissector for the bzr smart server protocol

The attached patch adds basic support for dissecting the bzr smart server protocol ( http://wiki.wireshark.org/Bazaar ).

svn path=/trunk/; revision=40260
2011-12-21 14:21:17 +00:00
Alexis La Goutte 9c0692b343 From Jelmer Vernooij via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6686
Dissector for the bzr smart server protocol

The attached patch adds basic support for dissecting the bzr smart server protocol ( http://wiki.wireshark.org/Bazaar ).

svn path=/trunk/; revision=40259
2011-12-21 14:20:34 +00:00
Alexis La Goutte 0a8ea997e1 Fix indent and add modelines information
svn path=/trunk/; revision=40258
2011-12-21 14:18:28 +00:00
Bill Meier dda0d791c9 Use correct reported_length for a tvb_new_subset() (not that it makes a difference in this case).
svn path=/trunk/; revision=40257
2011-12-21 03:44:23 +00:00
Stephen Fisher 4af334a549 Improve this error message (example output based on attachment in bug #6665):
OOPS: ',' in 'tpncp.fxs_ana,og_voltage_beading'

Now:

    Invalid character ',' in filter name 'tpncp.fxs_ana,og_voltage_beading'


svn path=/trunk/; revision=40256
2011-12-20 21:53:50 +00:00
Anders Broman 0214486008 Avoid dupliacte entries in col_proto
svn path=/trunk/; revision=40255
2011-12-20 19:34:52 +00:00
Chris Maynard 6705890aa1 Add some additional links to more up to date specfications.
svn path=/trunk/; revision=40254
2011-12-20 18:18:08 +00:00
Chris Maynard 41d2fdaefc For a DNSSL lifetime of 0, add some useful text.
svn path=/trunk/; revision=40253
2011-12-20 18:15:52 +00:00
Chris Maynard 44a81d13b6 Checking scmUDID for NULL is pointless since the pointer has already been dereferenced. If g_byte_array_new() can return NULL, then the code should be modified to protect against deferencing the NULL pointer much sooner than this.
svn path=/trunk/; revision=40251
2011-12-20 17:59:51 +00:00
Chris Maynard e4733909c1 Correct a few typos.
svn path=/trunk/; revision=40250
2011-12-20 17:53:44 +00:00
Chris Maynard faf9175665 Add support for dissecting AT commands in USB URB_CONTROL packets. Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6037
svn path=/trunk/; revision=40247
2011-12-19 23:44:01 +00:00
Chris Maynard 0a9fb81be6 Tighten up conversation port matching once the 2nd port is known. Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5727
svn path=/trunk/; revision=40245
2011-12-19 17:59:34 +00:00
Anders Broman 6aef22ffd9 Updates from David Wei.
svn path=/trunk/; revision=40244
2011-12-19 16:57:17 +00:00
Bill Meier a0731cfeb8 Create "Dehunked Entity Body" with O(N) rather than O(N^2) efffort.
[Actually 1 g_malloc() + N tvb_memcpy() instead of
~ N g_malloc()/g_free() + N*(N+1)/2 tvb_memcpy() where N = number of chunks].

svn path=/trunk/; revision=40242
2011-12-18 18:31:30 +00:00
Chris Maynard ec24a7f89b Fix Coverity CID's 1339 and 1340: UNUSED_VALUE.
svn path=/trunk/; revision=40241
2011-12-18 16:38:31 +00:00
Gerald Combs e452b3a12c [Automatic manuf, services and enterprise-numbers update for 2011-12-18]
svn path=/trunk/; revision=40238
2011-12-18 15:03:29 +00:00
Alexis La Goutte 47de3fec68 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=40237
2011-12-17 14:26:57 +00:00
Anders Broman e919ece04c The author Holger Pfrommer preferes not to show the bits making up the port and length.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6082

svn path=/trunk/; revision=40236
2011-12-17 12:21:04 +00:00
Alexis La Goutte ccb7bfd718 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=40235
2011-12-17 10:06:38 +00:00
Alexis La Goutte 656679b5f6 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=40234
2011-12-17 10:05:47 +00:00
Alexis La Goutte 99f11112f9 Update IKEv2 to last IANA Parameters (2011-11-09)
Add RFC-kivinen-ipsecme-secure-password-framework-03

svn path=/trunk/; revision=40233
2011-12-17 09:57:35 +00:00
Bill Meier 799be66d9f Add (what I think are) missing add_new_data_source() calls;
svn path=/trunk/; revision=40231
2011-12-16 19:15:17 +00:00
Bill Meier 4756f41771 Fix tvb memory leak; Also: For a "packet-lifetime" tvb use ep_alloc'd (not se_alloc'd) memory.
svn path=/trunk/; revision=40230
2011-12-16 17:33:09 +00:00
Anders Broman ade7628d67 Add application ids
svn path=/trunk/; revision=40229
2011-12-16 16:32:02 +00:00
Bill Meier 36840e68de Update the "How to handle transformed data" section to reflect current practice.
svn path=/trunk/; revision=40228
2011-12-16 15:58:10 +00:00
Ronnie Sahlberg 4f052c3cd6 PAC: S4U update, decode the full S4U Delegation Info blob with correct names
svn path=/trunk/; revision=40227
2011-12-16 03:54:46 +00:00
Ronnie Sahlberg bd83ae6dbb DCE/RPC: When printing counted strings to the tree, we divided the number of bytes by 2 and thus truncating the string in half for the presentation.
svn path=/trunk/; revision=40226
2011-12-16 03:44:43 +00:00
Ronnie Sahlberg d745d83b3c PAC: rename CONSTRAINED_DELEGATION to S4U_DELEGATION_INFO
svn path=/trunk/; revision=40225
2011-12-16 03:41:14 +00:00