Commit Graph

45183 Commits

Author SHA1 Message Date
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
Martin Kaiser 7126d3a56b add wsutil/wsgcrypt.h as a wrapper around libgcrypt's gcrypt.h
(not used for now)

svn path=/trunk/; revision=47801
2013-02-21 18:09:18 +00:00
Alexis La Goutte b9a0eaedae Fix indent (Tab => 4 Spaces) Remove whitespace And Modelines info
svn path=/trunk/; revision=47800
2013-02-21 15:32:29 +00:00
Alexis La Goutte 38655fbd2f Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=47799
2013-02-21 15:32:15 +00:00
Alexis La Goutte 84e31e29b7 Replace proto_tree_add_text/uint/boolean by proto_tree_add_item Use bitmask (remove tvb_get_bits(..))
svn path=/trunk/; revision=47798
2013-02-21 15:32:07 +00:00
Alexis La Goutte 964d9adf42 Fix indent (Tab => 4 Spaces) and Add Modelines
svn path=/trunk/; revision=47797
2013-02-21 15:31:58 +00:00
Alexis La Goutte 7523dc8af7 Fix Modelines
svn path=/trunk/; revision=47796
2013-02-21 15:31:50 +00:00
Alexis La Goutte 95e415ea5a From report of Jim Young via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8345 Malformed IEEE80211 frame triggers DISSECTOR_ASSERT
In some cases these malformed frames trigger a DISSECTOR_ASSERT() in proto.c's proto_item_set_len().  This happens when packet-ieee80211.c's dissect_ieee80211_mgt() calls packet-ieee80211.c's get_tagged_parameter_tree() with a "size" parameter value of -1.

From me:
Replace by proto_tree_add_item with -1 length (and use FT_NONE ftype)

svn path=/trunk/; revision=47795
2013-02-21 15:20:25 +00:00
Alexis La Goutte fbbe22d170 Fix CheckAPI about trailing space
svn path=/trunk/; revision=47794
2013-02-21 12:31:16 +00:00
Alexis La Goutte d2b0c28f71 From Paul via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8319 CAPWAP Header dissector returns invalid length
The problem is when Wireshark dissect CAPWAP packets from Cisco without preference "Cisco Wireless Controller Support"

In this case the whole packet decoded wrong, not only Wireless Specific Information field in CAPWAP header

I suggest following patch to dissect_capwap_header function to always return correct length of CAPWAP header based on HLEN header field

From me:
Add expert info to display a warning about Calculate length and Header length are different (and suggest to activate Cisco Wireless Controller Support Preference)

svn path=/trunk/; revision=47793
2013-02-21 10:50:28 +00:00
Pascal Quantin a7b6cf24e7 From Harald Welte via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8365 :
Add GSMTAP support for UMTS RRC captures

svn path=/trunk/; revision=47792
2013-02-21 10:08:53 +00:00
Jaap Keuter f5791fbd2d I'm pretty sure that reassembled IPv6 data does not fit in a uint32.
svn path=/trunk/; revision=47791
2013-02-21 07:37:10 +00:00
Chris Maynard f1aaac47c0 Misc. fixes while looking at bug 8364 (which this patch does NOT address):
1) hf_reload_dmflags is 8 bytes, not 64 bytes.
2) Swap dissection order of dmflags and length.
3) Register ett_reload_self_tuning_data and ett_reload_diagnosticrequest.
#BACKPORT(1.8)

svn path=/trunk/; revision=47789
2013-02-21 03:54:17 +00:00
Gerald Combs c1963df0a7 Remove vcredist_??.exe when we're done with it.
svn path=/trunk/; revision=47788
2013-02-21 01:03:47 +00:00
Gerald Combs b0d958c4ed Don't yell at the user quite so much. Remove exclamation points from
some error messages and rephrase some others.

svn path=/trunk/; revision=47787
2013-02-21 01:00:44 +00:00
Gerald Combs 63ef23bf5f Pop into the correct variable.
svn path=/trunk/; revision=47786
2013-02-21 00:55:25 +00:00
Gerald Combs ab79e59866 Move the Wireshark-is-running check to a common macro and call it in
both the installer and uninstaller. Roll the .exe removal code into a
loop and add missing executables.

Add modelines and adjust accordingly.

svn path=/trunk/; revision=47785
2013-02-20 23:59:49 +00:00
Evan Huus ceb5b89c84 Add modelines, fix indentation to be a consistent 4-spaces throughout.
svn path=/trunk/; revision=47784
2013-02-20 23:49:06 +00:00
Evan Huus fb88b48088 From Hadrien Kaplan via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8357
Fix the Lua tostring() method on FieldInfo objects such that it always returns
a string, although the string might be '(unknown)', '(none)', or '(n/a)'. This
is more conformant to Lua's API style.

Also create a new 'FieldInfo.display' accessor table member, which Lua
scripts can use instead of tostring() to get what the GUI displays.

From me:
Misc indentation fixes, remove redundant 'return' statement.

svn path=/trunk/; revision=47783
2013-02-20 23:40:24 +00:00
Martin Kaiser 642478b43a fix dead assignment
http://www.wireshark.org/download/automated/analysis/scan-build-2013-02-20-2/report-OsH7hZ.html#EndPath

svn path=/trunk/; revision=47782
2013-02-20 22:56:29 +00:00