Commit Graph

45202 Commits

Author SHA1 Message Date
Jakub Zawadzki 347232ea90 Fix bug #8101: tshark -2 -r fragments.pcap -R snmp -w out.pcap segmentation fault
When doing second pass tshark, packet data is read to cf->pd (and not already freed cf->wth buffer).
Writting files with two pass analysis never worked, buggy since introducing two pass analysis in r30076.

svn path=/trunk/; revision=47851
2013-02-24 14:39:56 +00:00
Jakub Zawadzki 26c04f86b0 Use AF_ defines from <epan/aftypes.h>
svn path=/trunk/; revision=47850
2013-02-24 09:38:22 +00:00
Jakub Zawadzki aeebbe9af8 Fix bug #8160, one case left where delta of previously captured frame is incorrectly calculated:
two passes wireshark && previously captured frame hasn't pass filter

svn path=/trunk/; revision=47849
2013-02-24 00:45:59 +00:00
Balint Reczey 7f0ee327ca Set library versions in CMake builds
svn path=/trunk/; revision=47848
2013-02-23 22:54:36 +00:00
Balint Reczey 3c023a61b7 CMake build works fine on Debian Wheezy
svn path=/trunk/; revision=47847
2013-02-23 22:54:26 +00:00
Balint Reczey daf3d97b5e Note that CMake honors umask for creating directories
svn path=/trunk/; revision=47846
2013-02-23 22:54:17 +00:00
Bill Meier 81428ccc0f Use consistent indentation & formatting style.
(Re-commit since the previous commit for this was reverted).

svn path=/trunk/; revision=47845
2013-02-23 22:37:52 +00:00
Pascal Quantin 622bd16abf Add dissection of uncompressed IP-ID
svn path=/trunk/; revision=47844
2013-02-23 22:26:29 +00:00
Evan Huus 48e188b560 Remove blocks from the free list when gc'ing them in wmem's block allocator.
Thanks to Jakub Zawadzki for catching this one.

svn path=/trunk/; revision=47843
2013-02-23 22:26:18 +00:00
Bill Meier 90158ee38e (version 2); Implement proto_tree_write_fields without using ep_strbufs.
- Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8348:
   "tshark -T fields can't print the full value of fields where the value,
    as a text string, is longer than 65535 bytes"
- Reduces ep memory allocation & string copies;

svn path=/trunk/; revision=47842
2013-02-23 22:04:12 +00:00
Martin Kaiser 09143deee5 add instruction byte for "get challenge"
svn path=/trunk/; revision=47841
2013-02-23 19:02:12 +00:00
Pascal Quantin 3d854528ce Enhance dissection of uncompressed profile and type 0 packets.
Always restore saved private data when returning from dissector.

svn path=/trunk/; revision=47840
2013-02-23 18:45:14 +00:00
Evan Huus 4c4abaf771 Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8382
Don't pass a length longer than the strlen of the string into
format_text(). This can happen if the length we ask for from the
tvb overflows, for example.

svn path=/trunk/; revision=47839
2013-02-23 15:22:40 +00:00
Alexis La Goutte cafb554d29 From 802.11k-2008 : Amendment 1: Radio Resource Measurement of Wireless LANs Add Radio Measurement flag from Capability Information Field
svn path=/trunk/; revision=47838
2013-02-23 11:21:29 +00:00
Alexis La Goutte d336579317 Update x11-dissectors with last mesa trunk ( snb-magic-14719-g2fa9e4c ) and xcbproto trunk ( 1.8-2-gc0d65da )
svn path=/trunk/; revision=47837
2013-02-23 11:21:20 +00:00
Alexis La Goutte 491104bf68 Update README.qt with last change in qtshark build
svn path=/trunk/; revision=47836
2013-02-23 11:21:11 +00:00
Alexis La Goutte 0885b65773 Replace by proto_tree_add_item and use FT_NONE type for fixed parameters
svn path=/trunk/; revision=47835
2013-02-23 11:21:02 +00:00
Alexis La Goutte 0e79e12e55 Update .gitignore Add ignore mesa / xcbproto folder when using x11-dissector Add ignore wireshark-qt* folder when using Qtshark in Windows
svn path=/trunk/; revision=47834
2013-02-23 11:20:53 +00:00
Alexis La Goutte 7dcc02efac Fix Build of PortableAPPs with Qtshark
svn path=/trunk/; revision=47833
2013-02-23 09:58:46 +00:00
Michael Mann 5a781022bc Convert proto_tree_add_text to proto_tree_add_item and expert_info.
svn path=/trunk/; revision=47832
2013-02-23 03:48:04 +00:00
Chris Maynard 3520b5dfac Trivial: Fix some typos.
svn path=/trunk/; revision=47831
2013-02-23 01:57:15 +00:00
Chris Maynard 0f93d115e6 Fix Coverity CID 986498: Unused pointer value.
svn path=/trunk/; revision=47830
2013-02-23 00:45:05 +00:00
Evan Huus 7bfb66f02f Invert the if statement into the common form:
if (error) return error;

do normal things;

svn path=/trunk/; revision=47829
2013-02-23 00:09:08 +00:00
Evan Huus f62c7e0b42 Add a return statement accidentally removed in r47783 and tweak the
brace placement so it's more obvious why the return is needed.

svn path=/trunk/; revision=47828
2013-02-23 00:06:30 +00:00
Jakub Zawadzki ac463593c4 No need for static dissector_handle_t.
svn path=/trunk/; revision=47827
2013-02-22 23:53:08 +00:00
Pascal Quantin 13729e9c11 When dissecting a feedback, if no context info is present use private data if available
svn path=/trunk/; revision=47826
2013-02-22 17:34:56 +00:00
Alexis La Goutte c4851a88ac Add QtShark stuff to PortableApps
svn path=/trunk/; revision=47825
2013-02-22 16:51:43 +00:00
Alexis La Goutte 2fda9a32c2 Enhance dissection of A-MSDU Frame (Make length filterable...)
svn path=/trunk/; revision=47824
2013-02-22 16:51:33 +00:00
Alexis La Goutte 2bdc84cfc5 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=47823
2013-02-22 16:51:24 +00:00
Alexis La Goutte 5416f1093e Add 802.11 BSS Available Admission Capacity (67)
svn path=/trunk/; revision=47822
2013-02-22 16:51:15 +00:00
Alexis La Goutte 61f4e1f932 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=47821
2013-02-22 16:51:06 +00:00
Alexis La Goutte 1f323f1f4c Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=47820
2013-02-22 16:50:58 +00:00
Alexis La Goutte 0157943ca1 Enhance 802.11 dissector when IE Tag is unknown (Add also a Expert info)
svn path=/trunk/; revision=47819
2013-02-22 16:50:49 +00:00
Alexis La Goutte 00adc6c0a2 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=47818
2013-02-22 16:50:40 +00:00
Alexis La Goutte 0b8125d9cb From 802.11-2012.pdf Update Information Element (IE Tag) List
svn path=/trunk/; revision=47817
2013-02-22 16:50:08 +00:00
Evan Huus 9b45e7ad74 Fix an *extraordinarily* embarassing copy-paste error. Much thanks to Bill
Meier for finding it before it made it into a stable release!

svn path=/trunk/; revision=47816
2013-02-22 16:41:41 +00:00
Evan Huus 3b5017cc0e Validate that the pointer passed to wmem_free is valid when using the
simple allocator. Thanks to Bill Meier for suggesting this.

svn path=/trunk/; revision=47815
2013-02-22 16:38:22 +00:00
Chris Maynard 2f791fb573 From Edwin Groothuis via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8375 : Move packet-pres.c from DISSECTOR_SRC to ASN1_DISSECTOR_SRC.
svn path=/trunk/; revision=47814
2013-02-22 01:45:10 +00:00
Chris Maynard 2aac1e8390 From Edwin Groothuis via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8376 : #include "config.h".
svn path=/trunk/; revision=47813
2013-02-22 01:34:53 +00:00
Martin Kaiser 29de8baed5 mention gcrypt wrapper in README.developer
svn path=/trunk/; revision=47812
2013-02-21 22:24:43 +00:00
Evan Huus 91b9ecd0a0 Trivial cleanups:
- use a gboolean instead of an int where appropriate
- comment out an unnecessary variable assignment
- move some other assignments to before the address of the variable is taken;
  this makes the data flow more natural and cleans up some cppcheck warnings

svn path=/trunk/; revision=47811
2013-02-21 22:24:06 +00:00
Michael Mann e094c21301 Minor Bluetooth fixes
1. Allow to DecodeBy payload over AVCTP
2. Fix L2CAP CID payload recognize after disc
3. Removed unneeded _U_
4. Fall back to control channel in AVRCP
5. Fix time-tracking for passthrough and capability AVRCP commands

From Michal Labedzki, bug 8367 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8367)

svn path=/trunk/; revision=47810
2013-02-21 22:00:32 +00:00
Michael Mann bfeeba6f5e Fix AVCTP, AVRCP, HCI AVL and L2CP for multiple interfaces/adapters
From Michal Labedzki, bug 8367 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8367)

svn path=/trunk/; revision=47809
2013-02-21 21:35:19 +00:00
Evan Huus b58c95cf10 Fix some issues potentially similar in nature to the one found in
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8364

There are probably some still left.

svn path=/trunk/; revision=47808
2013-02-21 21:18:46 +00:00
Jakub Zawadzki c5a71b1006 String passed to val_to_str() must have int format specifier (%u, %d, %x, and so on...).
Fix some cases (easy to grep) by call to val_to_str_const().

svn path=/trunk/; revision=47807
2013-02-21 21:04:59 +00:00
Pascal Quantin a3fca22472 Dissect Feedback type 1/2 packets for UDP and Uncompressed profiles
svn path=/trunk/; revision=47806
2013-02-21 19:18:29 +00:00
Evan Huus df5e22e57a From Chris Maynard via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8364
Pacify the fuzz-bots for now, though a better fix is needed.

svn path=/trunk/; revision=47805
2013-02-21 18:53:18 +00:00
Evan Huus c1f3dd7242 From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8366
Add support for bluetooth MCAP Protocol.

svn path=/trunk/; revision=47804
2013-02-21 18:43:26 +00:00
Martin Kaiser b057717767 use pragma GCC diagnostic to work around gcrypt.h warnings
distinguish between different gcc versions

this should allow a clean build with libgcrypt 1.5.0

svn path=/trunk/; revision=47803
2013-02-21 18:40:48 +00:00
Martin Kaiser 38a73a32f3 include the wsutil/wsgcrypt.h instead of including gcrypt.h directly
svn path=/trunk/; revision=47802
2013-02-21 18:23:29 +00:00