metze/wireshark/wip.git
11 years agoDissect more feedback options
Pascal Quantin [Mon, 25 Feb 2013 22:36:24 +0000 (22:36 -0000)]
Dissect more feedback options

svn path=/trunk/; revision=47887

11 years agoFrom Alex Badea via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8395
Evan Huus [Mon, 25 Feb 2013 22:19:15 +0000 (22:19 -0000)]
From Alex Badea via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8395

Support AES-GCM ipsec encryption using CTR (since libgcrypt doesn't support
GCM). Using CTR instead gets us decryption, but does not verify authentication.

svn path=/trunk/; revision=47886

11 years agoFix typos/errors and make Lua API more consistent.
Michael Mann [Mon, 25 Feb 2013 22:05:28 +0000 (22:05 -0000)]
Fix typos/errors and make Lua API more consistent.

From Hadriel Kaplan, bug 8393 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8393)

svn path=/trunk/; revision=47885

11 years agoMake compare-abs.sh work on CMake builds
Balint Reczey [Mon, 25 Feb 2013 21:27:16 +0000 (21:27 -0000)]
Make compare-abs.sh work on CMake builds

svn path=/trunk/; revision=47884

11 years agoABI dumps don't have to depend on config.h directly
Balint Reczey [Mon, 25 Feb 2013 21:27:07 +0000 (21:27 -0000)]
ABI dumps don't have to depend on config.h directly

They depend on libs which need config.h already.

svn path=/trunk/; revision=47883

11 years agoLUA API improvements
Michael Mann [Mon, 25 Feb 2013 20:43:06 +0000 (20:43 -0000)]
LUA API improvements

1. Add col_set_fence() equivalent
2. Update __tostring function to actually return column text

From Hadriel Kaplan, bug 8295 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8295)

svn path=/trunk/; revision=47882

11 years agoFix Coverity CID 986569: Unused pointer value.
Chris Maynard [Mon, 25 Feb 2013 19:28:24 +0000 (19:28 -0000)]
Fix Coverity CID 986569: Unused pointer value.

svn path=/trunk/; revision=47881

11 years agoAdd a few comments to CMake TODO items
Balint Reczey [Mon, 25 Feb 2013 18:12:28 +0000 (18:12 -0000)]
Add a few comments to CMake TODO items

svn path=/trunk/; revision=47880

11 years agoAdd dumpabi targets to CMake builds
Balint Reczey [Mon, 25 Feb 2013 18:12:20 +0000 (18:12 -0000)]
Add dumpabi targets to CMake builds

Also update automake generated targets to match CMake generated ones

svn path=/trunk/; revision=47879

11 years agoFrom Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8396
Evan Huus [Mon, 25 Feb 2013 17:55:32 +0000 (17:55 -0000)]
From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8396

Add Bluetooth HCRP dissector.

From me: rename a preference to be a bit clearer.

svn path=/trunk/; revision=47878

11 years agoBugfix Lua pinfo.cols.protocol not holding value in postdissector
Michael Mann [Mon, 25 Feb 2013 17:32:25 +0000 (17:32 -0000)]
Bugfix Lua pinfo.cols.protocol not holding value in postdissector

From Hadriel Kaplan, bug 6020 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6020)

svn path=/trunk/; revision=47877

11 years agoFix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8397 :
Pascal Quantin [Mon, 25 Feb 2013 16:39:43 +0000 (16:39 -0000)]
Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8397 :
Prevent an out of bounds access when trying to call RRC sub dissectors and fallback to DATA dissector

svn path=/trunk/; revision=47876

11 years agoAdd README for Lua
Michael Mann [Mon, 25 Feb 2013 16:37:34 +0000 (16:37 -0000)]
Add README for Lua

From Hadriel Kaplan, part of bug 8393 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8393)

svn path=/trunk/; revision=47875

11 years agoFix Lua 5.2 panic problems.
Michael Mann [Mon, 25 Feb 2013 16:20:27 +0000 (16:20 -0000)]
Fix Lua 5.2 panic problems.

From Hadriel Kaplan, bug 7400 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7400)

svn path=/trunk/; revision=47874

11 years agoFix some typos.
Chris Maynard [Mon, 25 Feb 2013 16:19:15 +0000 (16:19 -0000)]
Fix some typos.

svn path=/trunk/; revision=47873

11 years agoFix for bug 7939:
Jaap Keuter [Mon, 25 Feb 2013 06:48:35 +0000 (06:48 -0000)]
Fix for bug 7939:
Register application/json-rpc and application/jsonrequest media types for JSON.

svn path=/trunk/; revision=47872

11 years agoThe IEEE may not care what's in an SSID but Pango is much more picky.
Gerald Combs [Mon, 25 Feb 2013 04:16:37 +0000 (04:16 -0000)]
The IEEE may not care what's in an SSID but Pango is much more picky.
If the SSID isn't valid UTF-8 truncate it and indicate that we did so.
(As bug 5738 points out this is part of a more general problem but in
the meantime this keeps us from crashing.)

Don't try to decrypt too-long SSIDs.

I feel compelled to change my SSID at home to a series of carriage
returns, linefeeds, and SNOWMAN (U+2603).

svn path=/trunk/; revision=47871

11 years agoFix display type
Pascal Quantin [Sun, 24 Feb 2013 22:39:46 +0000 (22:39 -0000)]
Fix display type

svn path=/trunk/; revision=47870

11 years agoVarious enhancements to ROHC dissector:
Pascal Quantin [Sun, 24 Feb 2013 22:06:53 +0000 (22:06 -0000)]
Various enhancements to ROHC dissector:
- fix dissection of type 0 packets with large CID
- add dissection of type 1 and 2 packets (extension 3 dissection to be done)
- add dissection of UDP checksum

svn path=/trunk/; revision=47869

11 years agocompute_offset_length(), check_offset_length_no_exception(), and
Guy Harris [Sun, 24 Feb 2013 21:45:09 +0000 (21:45 -0000)]
compute_offset_length(), check_offset_length_no_exception(), and
check_offset_length() are always passed the captured length and reported
length of a tvbuff; just pass a pointer to the tvbuff, instead.

Eliminate some extra blank lines.

svn path=/trunk/; revision=47868

11 years agotvb_set_subset_no_exceptions() is called immediately after all calls to
Guy Harris [Sun, 24 Feb 2013 21:30:00 +0000 (21:30 -0000)]
tvb_set_subset_no_exceptions() is called immediately after all calls to
tvb_new_with_subset(), and is not called anywhere other than immediately
after calls to tvb_new_with_subset(); absorb it into tvb_new_with_subset().

svn path=/trunk/; revision=47867

11 years agoMove some routines around, in preparation for some other code
Guy Harris [Sun, 24 Feb 2013 21:18:45 +0000 (21:18 -0000)]
Move some routines around, in preparation for some other code
reorganization.

svn path=/trunk/; revision=47866

11 years agoGenerate abi-descriptor.xml-s in CMake builds
Balint Reczey [Sun, 24 Feb 2013 21:14:17 +0000 (21:14 -0000)]
Generate abi-descriptor.xml-s in CMake builds

svn path=/trunk/; revision=47865

11 years agoAdd application/x-tia-p25-issi and application/x-tia-p25-sndcp
Anders Broman [Sun, 24 Feb 2013 19:51:23 +0000 (19:51 -0000)]
Add application/x-tia-p25-issi and application/x-tia-p25-sndcp
fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6248

svn path=/trunk/; revision=47864

11 years agoFrom Peter Hatina: test GDK_WINDOW_STATE_MAXIMIZED as a bit flag
Bill Meier [Sun, 24 Feb 2013 19:35:32 +0000 (19:35 -0000)]
From  Peter Hatina: test GDK_WINDOW_STATE_MAXIMIZED as a bit flag

(One small part of a suggested patch in Bug #8315).

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

svn path=/trunk/; revision=47863

11 years agoFix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
Alexis La Goutte [Sun, 24 Feb 2013 19:13:46 +0000 (19:13 -0000)]
Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang

svn path=/trunk/; revision=47862

11 years agoFix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
Alexis La Goutte [Sun, 24 Feb 2013 19:13:36 +0000 (19:13 -0000)]
Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang

svn path=/trunk/; revision=47861

11 years agoFix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
Alexis La Goutte [Sun, 24 Feb 2013 19:13:27 +0000 (19:13 -0000)]
Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang

svn path=/trunk/; revision=47860

11 years agoFix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
Alexis La Goutte [Sun, 24 Feb 2013 19:13:18 +0000 (19:13 -0000)]
Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang

svn path=/trunk/; revision=47859

11 years agoFrom Mark Phillips via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8368
Alexis La Goutte [Sun, 24 Feb 2013 19:10:11 +0000 (19:10 -0000)]
From Mark Phillips via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8368
Minor corrections to the VHT IE decode

* Correct the Rx, Tx and Basic MCS map decodes. The number of Spatial streams should run from 1-8 (not 0-7).
* Change Several misstyped Mhz into MHz

From me:
Remove comma for big number (use space)
Add Octets unit in some hf description

svn path=/trunk/; revision=47858

11 years agoFix AP / Sta CF Pollable value_string (the value is shifted !)
Alexis La Goutte [Sun, 24 Feb 2013 19:09:55 +0000 (19:09 -0000)]
Fix AP / Sta CF Pollable value_string (the value is shifted !)

svn path=/trunk/; revision=47857

11 years agoRemove some "duplicate" TFS in 802.11 field capability Add in use / not in use in...
Alexis La Goutte [Sun, 24 Feb 2013 19:09:04 +0000 (19:09 -0000)]
Remove some "duplicate" TFS in 802.11 field capability Add in use / not in use in common TFS

svn path=/trunk/; revision=47856

11 years agoFrom "beroset":
Anders Broman [Sun, 24 Feb 2013 15:03:26 +0000 (15:03 -0000)]
From "beroset":
updated Windows build instructions to include 64-bit builds.

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

svn path=/trunk/; revision=47853

11 years ago[Automatic manuf, services and enterprise-numbers update for 2013-02-24]
Gerald Combs [Sun, 24 Feb 2013 15:03:25 +0000 (15:03 -0000)]
[Automatic manuf, services and enterprise-numbers update for 2013-02-24]

svn path=/trunk/; revision=47852

11 years agoFix bug #8101: tshark -2 -r fragments.pcap -R snmp -w out.pcap segmentation fault
Jakub Zawadzki [Sun, 24 Feb 2013 14:39:56 +0000 (14:39 -0000)]
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

11 years agoUse AF_ defines from <epan/aftypes.h>
Jakub Zawadzki [Sun, 24 Feb 2013 09:38:22 +0000 (09:38 -0000)]
Use AF_ defines from <epan/aftypes.h>

svn path=/trunk/; revision=47850

11 years agoFix bug #8160, one case left where delta of previously captured frame is incorrectly...
Jakub Zawadzki [Sun, 24 Feb 2013 00:45:59 +0000 (00:45 -0000)]
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

11 years agoSet library versions in CMake builds
Balint Reczey [Sat, 23 Feb 2013 22:54:36 +0000 (22:54 -0000)]
Set library versions in CMake builds

svn path=/trunk/; revision=47848

11 years agoCMake build works fine on Debian Wheezy
Balint Reczey [Sat, 23 Feb 2013 22:54:26 +0000 (22:54 -0000)]
CMake build works fine on Debian Wheezy

svn path=/trunk/; revision=47847

11 years agoNote that CMake honors umask for creating directories
Balint Reczey [Sat, 23 Feb 2013 22:54:17 +0000 (22:54 -0000)]
Note that CMake honors umask for creating directories

svn path=/trunk/; revision=47846

11 years agoUse consistent indentation & formatting style.
Bill Meier [Sat, 23 Feb 2013 22:37:52 +0000 (22:37 -0000)]
Use consistent indentation & formatting style.
(Re-commit since the previous commit for this was reverted).

svn path=/trunk/; revision=47845

11 years agoAdd dissection of uncompressed IP-ID
Pascal Quantin [Sat, 23 Feb 2013 22:26:29 +0000 (22:26 -0000)]
Add dissection of uncompressed IP-ID

svn path=/trunk/; revision=47844

11 years agoRemove blocks from the free list when gc'ing them in wmem's block allocator.
Evan Huus [Sat, 23 Feb 2013 22:26:18 +0000 (22:26 -0000)]
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

11 years ago(version 2); Implement proto_tree_write_fields without using ep_strbufs.
Bill Meier [Sat, 23 Feb 2013 22:04:12 +0000 (22:04 -0000)]
(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

11 years agoadd instruction byte for "get challenge"
Martin Kaiser [Sat, 23 Feb 2013 19:02:12 +0000 (19:02 -0000)]
add instruction byte for "get challenge"

svn path=/trunk/; revision=47841

11 years agoEnhance dissection of uncompressed profile and type 0 packets.
Pascal Quantin [Sat, 23 Feb 2013 18:45:14 +0000 (18:45 -0000)]
Enhance dissection of uncompressed profile and type 0 packets.
Always restore saved private data when returning from dissector.

svn path=/trunk/; revision=47840

11 years agoFix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8382
Evan Huus [Sat, 23 Feb 2013 15:22:40 +0000 (15:22 -0000)]
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

11 years agoFrom 802.11k-2008 : Amendment 1: Radio Resource Measurement of Wireless LANs Add...
Alexis La Goutte [Sat, 23 Feb 2013 11:21:29 +0000 (11:21 -0000)]
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

11 years agoUpdate x11-dissectors with last mesa trunk ( snb-magic-14719-g2fa9e4c ) and xcbproto...
Alexis La Goutte [Sat, 23 Feb 2013 11:21:20 +0000 (11:21 -0000)]
Update x11-dissectors with last mesa trunk ( snb-magic-14719-g2fa9e4c ) and xcbproto trunk ( 1.8-2-gc0d65da )

svn path=/trunk/; revision=47837

11 years agoUpdate README.qt with last change in qtshark build
Alexis La Goutte [Sat, 23 Feb 2013 11:21:11 +0000 (11:21 -0000)]
Update README.qt with last change in qtshark build

svn path=/trunk/; revision=47836

11 years agoReplace by proto_tree_add_item and use FT_NONE type for fixed parameters
Alexis La Goutte [Sat, 23 Feb 2013 11:21:02 +0000 (11:21 -0000)]
Replace by proto_tree_add_item and use FT_NONE type for fixed parameters

svn path=/trunk/; revision=47835

11 years agoUpdate .gitignore Add ignore mesa / xcbproto folder when using x11-dissector Add...
Alexis La Goutte [Sat, 23 Feb 2013 11:20:53 +0000 (11:20 -0000)]
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

11 years agoFix Build of PortableAPPs with Qtshark
Alexis La Goutte [Sat, 23 Feb 2013 09:58:46 +0000 (09:58 -0000)]
Fix Build of PortableAPPs with Qtshark

svn path=/trunk/; revision=47833

11 years agoConvert proto_tree_add_text to proto_tree_add_item and expert_info.
Michael Mann [Sat, 23 Feb 2013 03:48:04 +0000 (03:48 -0000)]
Convert proto_tree_add_text to proto_tree_add_item and expert_info.

svn path=/trunk/; revision=47832

11 years agoTrivial: Fix some typos.
Chris Maynard [Sat, 23 Feb 2013 01:57:15 +0000 (01:57 -0000)]
Trivial: Fix some typos.

svn path=/trunk/; revision=47831

11 years agoFix Coverity CID 986498: Unused pointer value.
Chris Maynard [Sat, 23 Feb 2013 00:45:05 +0000 (00:45 -0000)]
Fix Coverity CID 986498: Unused pointer value.

svn path=/trunk/; revision=47830

11 years agoInvert the if statement into the common form:
Evan Huus [Sat, 23 Feb 2013 00:09:08 +0000 (00:09 -0000)]
Invert the if statement into the common form:

if (error) return error;

do normal things;

svn path=/trunk/; revision=47829

11 years agoAdd a return statement accidentally removed in r47783 and tweak the
Evan Huus [Sat, 23 Feb 2013 00:06:30 +0000 (00:06 -0000)]
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

11 years agoNo need for static dissector_handle_t.
Jakub Zawadzki [Fri, 22 Feb 2013 23:53:08 +0000 (23:53 -0000)]
No need for static dissector_handle_t.

svn path=/trunk/; revision=47827

11 years agoWhen dissecting a feedback, if no context info is present use private data if available
Pascal Quantin [Fri, 22 Feb 2013 17:34:56 +0000 (17:34 -0000)]
When dissecting a feedback, if no context info is present use private data if available

svn path=/trunk/; revision=47826

11 years agoAdd QtShark stuff to PortableApps
Alexis La Goutte [Fri, 22 Feb 2013 16:51:43 +0000 (16:51 -0000)]
Add QtShark stuff to PortableApps

svn path=/trunk/; revision=47825

11 years agoEnhance dissection of A-MSDU Frame (Make length filterable...)
Alexis La Goutte [Fri, 22 Feb 2013 16:51:33 +0000 (16:51 -0000)]
Enhance dissection of A-MSDU Frame (Make length filterable...)

svn path=/trunk/; revision=47824

11 years agoFix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
Alexis La Goutte [Fri, 22 Feb 2013 16:51:24 +0000 (16:51 -0000)]
Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang

svn path=/trunk/; revision=47823

11 years agoAdd 802.11 BSS Available Admission Capacity (67)
Alexis La Goutte [Fri, 22 Feb 2013 16:51:15 +0000 (16:51 -0000)]
Add 802.11 BSS Available Admission Capacity (67)

svn path=/trunk/; revision=47822

11 years agoFix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
Alexis La Goutte [Fri, 22 Feb 2013 16:51:06 +0000 (16:51 -0000)]
Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang

svn path=/trunk/; revision=47821

11 years agoFix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
Alexis La Goutte [Fri, 22 Feb 2013 16:50:58 +0000 (16:50 -0000)]
Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang

svn path=/trunk/; revision=47820

11 years agoEnhance 802.11 dissector when IE Tag is unknown (Add also a Expert info)
Alexis La Goutte [Fri, 22 Feb 2013 16:50:49 +0000 (16:50 -0000)]
Enhance 802.11 dissector when IE Tag is unknown (Add also a Expert info)

svn path=/trunk/; revision=47819

11 years agoFix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
Alexis La Goutte [Fri, 22 Feb 2013 16:50:40 +0000 (16:50 -0000)]
Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang

svn path=/trunk/; revision=47818

11 years agoFrom 802.11-2012.pdf Update Information Element (IE Tag) List
Alexis La Goutte [Fri, 22 Feb 2013 16:50:08 +0000 (16:50 -0000)]
From 802.11-2012.pdf Update Information Element (IE Tag) List

svn path=/trunk/; revision=47817

11 years agoFix an *extraordinarily* embarassing copy-paste error. Much thanks to Bill
Evan Huus [Fri, 22 Feb 2013 16:41:41 +0000 (16:41 -0000)]
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

11 years agoValidate that the pointer passed to wmem_free is valid when using the
Evan Huus [Fri, 22 Feb 2013 16:38:22 +0000 (16:38 -0000)]
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

11 years agoFrom Edwin Groothuis via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8375...
Chris Maynard [Fri, 22 Feb 2013 01:45:10 +0000 (01:45 -0000)]
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

11 years agoFrom Edwin Groothuis via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8376...
Chris Maynard [Fri, 22 Feb 2013 01:34:53 +0000 (01:34 -0000)]
From Edwin Groothuis via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8376 : #include "config.h".

svn path=/trunk/; revision=47813

11 years agomention gcrypt wrapper in README.developer
Martin Kaiser [Thu, 21 Feb 2013 22:24:43 +0000 (22:24 -0000)]
mention gcrypt wrapper in README.developer

svn path=/trunk/; revision=47812

11 years agoTrivial cleanups:
Evan Huus [Thu, 21 Feb 2013 22:24:06 +0000 (22:24 -0000)]
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

11 years agoMinor Bluetooth fixes
Michael Mann [Thu, 21 Feb 2013 22:00:32 +0000 (22:00 -0000)]
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

11 years agoFix AVCTP, AVRCP, HCI AVL and L2CP for multiple interfaces/adapters
Michael Mann [Thu, 21 Feb 2013 21:35:19 +0000 (21:35 -0000)]
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

11 years agoFix some issues potentially similar in nature to the one found in
Evan Huus [Thu, 21 Feb 2013 21:18:46 +0000 (21:18 -0000)]
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

11 years agoString passed to val_to_str() must have int format specifier (%u, %d, %x, and so...
Jakub Zawadzki [Thu, 21 Feb 2013 21:04:59 +0000 (21:04 -0000)]
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

11 years agoDissect Feedback type 1/2 packets for UDP and Uncompressed profiles
Pascal Quantin [Thu, 21 Feb 2013 19:18:29 +0000 (19:18 -0000)]
Dissect Feedback type 1/2 packets for UDP and Uncompressed profiles

svn path=/trunk/; revision=47806

11 years agoFrom Chris Maynard via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8364
Evan Huus [Thu, 21 Feb 2013 18:53:18 +0000 (18:53 -0000)]
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

11 years agoFrom Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8366
Evan Huus [Thu, 21 Feb 2013 18:43:26 +0000 (18:43 -0000)]
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

11 years agouse pragma GCC diagnostic to work around gcrypt.h warnings
Martin Kaiser [Thu, 21 Feb 2013 18:40:48 +0000 (18:40 -0000)]
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

11 years agoinclude the wsutil/wsgcrypt.h instead of including gcrypt.h directly
Martin Kaiser [Thu, 21 Feb 2013 18:23:29 +0000 (18:23 -0000)]
include the wsutil/wsgcrypt.h instead of including gcrypt.h directly

svn path=/trunk/; revision=47802

11 years agoadd wsutil/wsgcrypt.h as a wrapper around libgcrypt's gcrypt.h
Martin Kaiser [Thu, 21 Feb 2013 18:09:18 +0000 (18:09 -0000)]
add wsutil/wsgcrypt.h as a wrapper around libgcrypt's gcrypt.h
(not used for now)

svn path=/trunk/; revision=47801

11 years agoFix indent (Tab => 4 Spaces) Remove whitespace And Modelines info
Alexis La Goutte [Thu, 21 Feb 2013 15:32:29 +0000 (15:32 -0000)]
Fix indent (Tab => 4 Spaces) Remove whitespace And Modelines info

svn path=/trunk/; revision=47800

11 years agoFix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
Alexis La Goutte [Thu, 21 Feb 2013 15:32:15 +0000 (15:32 -0000)]
Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang

svn path=/trunk/; revision=47799

11 years agoReplace proto_tree_add_text/uint/boolean by proto_tree_add_item Use bitmask (remove...
Alexis La Goutte [Thu, 21 Feb 2013 15:32:07 +0000 (15:32 -0000)]
Replace proto_tree_add_text/uint/boolean by proto_tree_add_item Use bitmask (remove tvb_get_bits(..))

svn path=/trunk/; revision=47798

11 years agoFix indent (Tab => 4 Spaces) and Add Modelines
Alexis La Goutte [Thu, 21 Feb 2013 15:31:58 +0000 (15:31 -0000)]
Fix indent (Tab => 4 Spaces) and Add Modelines

svn path=/trunk/; revision=47797

11 years agoFix Modelines
Alexis La Goutte [Thu, 21 Feb 2013 15:31:50 +0000 (15:31 -0000)]
Fix Modelines

svn path=/trunk/; revision=47796

11 years agoFrom report of Jim Young via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id...
Alexis La Goutte [Thu, 21 Feb 2013 15:20:25 +0000 (15:20 -0000)]
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

11 years agoFix CheckAPI about trailing space
Alexis La Goutte [Thu, 21 Feb 2013 12:31:16 +0000 (12:31 -0000)]
Fix CheckAPI about trailing space

svn path=/trunk/; revision=47794

11 years agoFrom Paul via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8319 CAPWAP Header...
Alexis La Goutte [Thu, 21 Feb 2013 10:50:28 +0000 (10:50 -0000)]
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

11 years agoFrom Harald Welte via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8365 :
Pascal Quantin [Thu, 21 Feb 2013 10:08:53 +0000 (10:08 -0000)]
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

11 years agoI'm pretty sure that reassembled IPv6 data does not fit in a uint32.
Jaap Keuter [Thu, 21 Feb 2013 07:37:10 +0000 (07:37 -0000)]
I'm pretty sure that reassembled IPv6 data does not fit in a uint32.

svn path=/trunk/; revision=47791

11 years agoMisc. fixes while looking at bug 8364 (which this patch does NOT address):
Chris Maynard [Thu, 21 Feb 2013 03:54:17 +0000 (03:54 -0000)]
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

11 years agoRemove vcredist_??.exe when we're done with it.
Gerald Combs [Thu, 21 Feb 2013 01:03:47 +0000 (01:03 -0000)]
Remove vcredist_??.exe when we're done with it.

svn path=/trunk/; revision=47788

11 years agoDon't yell at the user quite so much. Remove exclamation points from
Gerald Combs [Thu, 21 Feb 2013 01:00:44 +0000 (01:00 -0000)]
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

11 years agoPop into the correct variable.
Gerald Combs [Thu, 21 Feb 2013 00:55:25 +0000 (00:55 -0000)]
Pop into the correct variable.

svn path=/trunk/; revision=47786

11 years agoMove the Wireshark-is-running check to a common macro and call it in
Gerald Combs [Wed, 20 Feb 2013 23:59:49 +0000 (23:59 -0000)]
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