metze/wireshark/wip.git
9 years agoHave a common routine to convert FILETIME to nstime_t.
Guy Harris [Mon, 20 Apr 2015 20:41:07 +0000 (13:41 -0700)]
Have a common routine to convert FILETIME to nstime_t.

We had several copies of that code; put it into a filetime_to_nstime()
routine in wsutil, and call that common routine instead.

Change-Id: I1eb5579c36c129ff8d23f9212285ab3f63be0f43
Reviewed-on: https://code.wireshark.org/review/8142
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoCMake minor updates
Graham Bloice [Mon, 20 Apr 2015 15:36:06 +0000 (16:36 +0100)]
CMake minor updates

Fix up generation messages for Windows build
Remove some superfluous Lua messages

Change-Id: I405e7edfcb043fc842fe4f0cca8d23d5755527f9
Reviewed-on: https://code.wireshark.org/review/8138
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
9 years agoOpenSafety: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
Alexis La Goutte [Mon, 20 Apr 2015 11:34:22 +0000 (13:34 +0200)]
OpenSafety: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang

Change-Id: Iccd80450835946abbe68d66fb4ccbc1c799e6065
Reviewed-on: https://code.wireshark.org/review/8137
Reviewed-by: Roland Knall <rknall@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
9 years agosv: remove #if0'd code
Evan Huus [Sun, 19 Apr 2015 19:32:42 +0000 (15:32 -0400)]
sv: remove #if0'd code

we can always get it back from git if we want

Change-Id: I61911628541cf4ed4be20e736e41fbaa58978d75
Reviewed-on: https://code.wireshark.org/review/8124
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
9 years agoMake offset unsigned int.
anilkumar911 [Tue, 14 Apr 2015 06:13:54 +0000 (11:43 +0530)]
Make offset unsigned int.

Change-Id: Ieb7f8a7735b8dd73f180a385294c3b8ca7ceaefb
Reviewed-on: https://code.wireshark.org/review/8060
Reviewed-by: Anders Broman <a.broman58@gmail.com>
9 years agoMake various structure members the right size for time-in-seconds.
Guy Harris [Mon, 20 Apr 2015 07:48:02 +0000 (00:48 -0700)]
Make various structure members the right size for time-in-seconds.

I.e., make them time_t's.

Change-Id: I102e9f585ae2798927757fe7f0f7a5a3fa251ec2
Reviewed-on: https://code.wireshark.org/review/8134
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoVisual Networks captures have only millisecond resolution.
Guy Harris [Mon, 20 Apr 2015 07:20:12 +0000 (00:20 -0700)]
Visual Networks captures have only millisecond resolution.

Change-Id: I59d7a6b5e29a068fd820075c913ac3c546593b9e
Reviewed-on: https://code.wireshark.org/review/8133
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoSimplify the calculation of the time stamp.
Guy Harris [Mon, 20 Apr 2015 07:13:55 +0000 (00:13 -0700)]
Simplify the calculation of the time stamp.

The time is calculated based on a 32-bit "seconds since the Epoch" value
for the start time and a 32-bit delta from that time, in milliseconds.
We can just split that delta into seconds and milliseconds, add the
seconds to the start time to get the seconds part of the time stamp, and
multiply the milliseconds by 1,000,000 to get the nanoseconds part of
the time stamp.  The only 64-bit arithmetic needed is adding the seconds
to a 64-bit version of the start time (just in case seconds+start time
goes past Y2.038K).

Change-Id: Id7c4c6255870627f81fc99dae919abaf47efc710
Reviewed-on: https://code.wireshark.org/review/8132
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoThe previous change doesn't work; do it right.
Guy Harris [Mon, 20 Apr 2015 07:05:13 +0000 (00:05 -0700)]
The previous change doesn't work; do it right.

The correct bit has to be set in the value passed in; create a
proto_tree_add_boolean64() that takes a 64-bit argument and use that.

Change-Id: I28eaab38308baa908bdc1b043b2f0b87a17afe0d
Reviewed-on: https://code.wireshark.org/review/8131
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoAdd Tekelec (now Oracle) AVPs.
Jeff Morriss [Fri, 17 Apr 2015 18:19:00 +0000 (14:19 -0400)]
Add Tekelec (now Oracle) AVPs.

Untested; taken from the document 910-6828-001 Revision A (found on the web).

Change-Id: Ibf312a0a15c5c64ec16e636814febb0e996fe5f2
Reviewed-on: https://code.wireshark.org/review/8110
Reviewed-by: Anders Broman <a.broman58@gmail.com>
9 years agowimax: replace deprecated tvb_length calls
Evan Huus [Sun, 19 Apr 2015 19:28:23 +0000 (15:28 -0400)]
wimax: replace deprecated tvb_length calls

Change-Id: I9db1051e065762b826973ecbc2dba460a7f89013
Reviewed-on: https://code.wireshark.org/review/8123
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
9 years agoreplace some deprecated tvb_length calls
Evan Huus [Sun, 19 Apr 2015 19:39:40 +0000 (15:39 -0400)]
replace some deprecated tvb_length calls

Change-Id: I18152e75aec2eedccad4d393c1b4b493cd7b406d
Reviewed-on: https://code.wireshark.org/review/8125
Reviewed-by: Evan Huus <eapache@gmail.com>
Petri-Dish: Evan Huus <eapache@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
9 years agoMake sure we handle Booleans even with the upper 32 bits set.
Guy Harris [Mon, 20 Apr 2015 01:51:39 +0000 (18:51 -0700)]
Make sure we handle Booleans even with the upper 32 bits set.

Just pass 1 or 0 to proto_tree_add_boolean() depending on whether the
64-bit value is non-zero or zero.

Change-Id: I5b55c9aff4e559fb8e62bd96ae2b0b34e45189fa
Reviewed-on: https://code.wireshark.org/review/8129
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoDon't use proto_tree_add_uint() to add FT_BOOLEAN values.
Guy Harris [Sun, 19 Apr 2015 21:26:54 +0000 (14:26 -0700)]
Don't use proto_tree_add_uint() to add FT_BOOLEAN values.

In proto_item_add_bitmask_tree(), if use_value is true, base the routine
we use to add the item to the tree on the type of the field being added.

Also, use DISSECTOR_ASSERT_NOT_REACHED(), not g_assert_not_reached(), to
catch types that aren't integral or Boolean.

Change-Id: I6ff9867bddcae16ddf8b689b48fdc93c6f949105
Reviewed-on: https://code.wireshark.org/review/8127
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoUse 64-bit fixed point to calculate time stamps.
Guy Harris [Sun, 19 Apr 2015 21:06:02 +0000 (14:06 -0700)]
Use 64-bit fixed point to calculate time stamps.

Change-Id: I77c470937366dbaf50adbf174569ef0676ae3658
Reviewed-on: https://code.wireshark.org/review/8126
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agozbee: add support to ZigBee power configuration cluster
Julien STAUB [Sun, 12 Apr 2015 16:15:39 +0000 (18:15 +0200)]
zbee: add support to ZigBee power configuration cluster

Implemented full power configuration cluster according to
07-5123-04 ZigBee cluster library

Change-Id: Ic9cb9894c2153ce53e2a2762967dbdc6a4a060c2
Reviewed-on: https://code.wireshark.org/review/8032
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Julien STAUB <atsju2@yahoo.fr>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
9 years agortcp.psfb.fmt DissectorTable does not work in Lua plugin
Peng Li [Sun, 19 Apr 2015 09:15:11 +0000 (17:15 +0800)]
rtcp.psfb.fmt DissectorTable does not work in Lua plugin

Change-Id: I4e26ee5e4d9c1556d62ce01720e40848047c23e0
Reviewed-on: https://code.wireshark.org/review/8119
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
9 years ago[Automatic update for 2015-04-19]
Gerald Combs [Sun, 19 Apr 2015 15:07:55 +0000 (08:07 -0700)]
[Automatic update for 2015-04-19]

Update manuf, services enterprise-numbers, translations, and other items.

Change-Id: Id9886f878c4d7422b779f1361fd9f7fcfb315982
Reviewed-on: https://code.wireshark.org/review/8120
Reviewed-by: Gerald Combs <gerald@wireshark.org>
9 years agoIxiatrailer: Requires at least 15 bytes so change test in heuristic.
Martin Mathieson [Sun, 19 Apr 2015 07:58:43 +0000 (08:58 +0100)]
Ixiatrailer:  Requires at least 15 bytes so change test in heuristic.

Change-Id: I00415fc77d2493eccdb3f0511f0a49d670e26d9d
Reviewed-on: https://code.wireshark.org/review/8118
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
9 years agoQCustomPlot: fix division(or modulo) by zero found by Clang and Coverity (CID 1159170...
Alexis La Goutte [Sat, 18 Apr 2015 14:04:19 +0000 (16:04 +0200)]
QCustomPlot: fix division(or modulo) by zero found by Clang and Coverity (CID 1159170 & 1159171)

Change-Id: Iba9317436983bb4b3730be8b80e7b9c107ffc3a9
Reviewed-on: https://code.wireshark.org/review/8112
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
9 years agoopenSAFETY: Implementing a tap interface
Roland Knall [Fri, 20 Feb 2015 14:16:30 +0000 (15:16 +0100)]
openSAFETY: Implementing a tap interface

 Implementing a tap interface as well as a packet structure
 which contains all necessary information from a single
 openSAFETY frame.

 This structure is located in a separate packet-opensafety.h so
 that plugins and other programs, which want to utilize the tap
 interface, may benefit from the same defines

 The 40bit calculation was implemented in a wrong fashion,
 so that it never calculated the correct UDID

Change-Id: I62895f91d0a255a5489b9bf397a40d824a27383f
Reviewed-on: https://code.wireshark.org/review/7275
Reviewed-by: Roland Knall <rknall@gmail.com>
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
9 years agoBluetooth: OBEX: Dissect HeaderID
Michal Labedzki [Fri, 20 Mar 2015 14:37:59 +0000 (15:37 +0100)]
Bluetooth: OBEX: Dissect HeaderID

HeaderID is bitfield in real. There is information about
length-information in value part.

Change-Id: Ib861f658c7b56e16df8a6514de69215138a1740d
Reviewed-on: https://code.wireshark.org/review/8039
Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
9 years agoConvert proto_tree_add_boolean to proto_tree_add_bitmask_[value|value_with_flags...
Michael Mann [Fri, 17 Apr 2015 02:40:34 +0000 (22:40 -0400)]
Convert proto_tree_add_boolean to proto_tree_add_bitmask_[value|value_with_flags|list]

Part 1 of a few

Change-Id: I413f23dfa92da5488ca8a7f62ca0738b25004635
Reviewed-on: https://code.wireshark.org/review/8117
Reviewed-by: Michael Mann <mmann78@netscape.net>
9 years agoBluetooth: OBEX: Add DecodeAs for profile-based Application Parameters
Michal Labedzki [Mon, 25 Aug 2014 13:46:54 +0000 (15:46 +0200)]
Bluetooth: OBEX: Add DecodeAs for profile-based Application Parameters

Application Parameters are defined in profile specification.
If there is not enough infgormation to recognize profile user must have
ability to do that manually.

Also add expert info that packet is manually "Decoded As".

Change-Id: I8a735d46d365d712995cd8cc00b2f46849c8afb4
Reviewed-on: https://code.wireshark.org/review/8044
Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
9 years agoMIME: Allow to dissect big files
Michal Labedzki [Tue, 21 Oct 2014 09:57:11 +0000 (11:57 +0200)]
MIME: Allow to dissect big files

Increase file size limit for mime files that can be
loaded by Wireshark to AddressSpace/2. On 32bit machines the limit can be
2 GiB.

Change-Id: I5b38b3ebe401077f4e1e873cff4b37da560d592f
Reviewed-on: https://code.wireshark.org/review/4907
Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Michal Labedzki <michal.labedzki@tieto.com>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
9 years agoZigBee: commissioning dissection
Alexis La Goutte [Thu, 16 Apr 2015 18:21:59 +0000 (20:21 +0200)]
ZigBee: commissioning dissection

Miscellaneous corrections in ZigBee Green Power commissioning cluster dissection.

Change-Id: I6aaf5f2c1ad5c70d1961709c0e94ab5c5af81ec7
Reviewed-on: https://code.wireshark.org/review/8094
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
9 years agoGIOP: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
Alexis La Goutte [Sat, 18 Apr 2015 13:56:58 +0000 (15:56 +0200)]
GIOP: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang

Change-Id: I5cd8fe72e6288578d4fa316096dfa606bf3e7aea
Reviewed-on: https://code.wireshark.org/review/8116
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
9 years agoGIAS: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
Alexis La Goutte [Sat, 18 Apr 2015 13:56:14 +0000 (15:56 +0200)]
GIAS: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang

Change-Id: I430e044d838b0d81bda15d3f8012b81f7247080e
Reviewed-on: https://code.wireshark.org/review/8115
Reviewed-by: Anders Broman <a.broman58@gmail.com>
9 years agoBluetooth: OBEX: Fix Dead Store (Dead assignement/Dead increment) warning found by...
Alexis La Goutte [Sat, 18 Apr 2015 13:55:42 +0000 (15:55 +0200)]
Bluetooth: OBEX: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang

Change-Id: I5c260b6af14786119a324c3fed98178ddad01c6d
Reviewed-on: https://code.wireshark.org/review/8114
Reviewed-by: Anders Broman <a.broman58@gmail.com>
9 years agoBluetooth: HFP: Fix Dead Store (Dead assignement/Dead increment) warning found by...
Alexis La Goutte [Sat, 18 Apr 2015 13:54:07 +0000 (15:54 +0200)]
Bluetooth: HFP: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang

Change-Id: I1509a9ee9b136c15b5da8ff88fa6eadab3dd7f99
Reviewed-on: https://code.wireshark.org/review/8113
Reviewed-by: Anders Broman <a.broman58@gmail.com>
9 years ago802.11 fix unchecked return value (CID 1293628)
Alexis La Goutte [Thu, 16 Apr 2015 06:09:51 +0000 (08:09 +0200)]
802.11 fix unchecked return value (CID 1293628)

following ge243b0041 check the last add_tagged_field for avoid a Coverity warning
(Yes the code is already safe..)

Ping-Bug: 11110
Change-Id: Iaceb8cf9c91de426bc5e5408b4271091cab57862
Reviewed-on: https://code.wireshark.org/review/8084
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
9 years agoproto(.h): fix '@return' command used in a comment that is attached to a function...
Alexis La Goutte [Fri, 17 Apr 2015 13:33:08 +0000 (15:33 +0200)]
proto(.h): fix '@return' command used in a comment that is attached to a function returning void [-Wdocumentation]

Change-Id: Ice88ddf2d35293f23be2d5a61a6ae77ed540f886
Reviewed-on: https://code.wireshark.org/review/8107
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
9 years agoMake androiddump loadable on OS X.
Gerald Combs [Thu, 16 Apr 2015 18:38:04 +0000 (11:38 -0700)]
Make androiddump loadable on OS X.

Make sure the target location for extcap executables and extcap_dir
match on OS X.

Set the extcap directory to Contents/MacOS/extcap. The Mac Developer
Library documentation doesn't explicitly define "Resources", but
examples include data files and not executables. It does state that
executables shouldn't go into PlugIns.

Make sure we rpathify androiddump.

Change-Id: If36c762e2a1991c26e5c01a870deaf191bcf9f94
Reviewed-on: https://code.wireshark.org/review/8093
Reviewed-by: Gerald Combs <gerald@wireshark.org>
9 years agoConsistently used (derived) type Enumerated (rather than Unsigned32 or
Jeff Morriss [Fri, 17 Apr 2015 17:45:43 +0000 (13:45 -0400)]
Consistently used (derived) type Enumerated (rather than Unsigned32 or
Integer32) when the AVP is of type Enumerated.

Just for correctness.

Change-Id: Ia485d6e06ca16d6da82aa5d1b60025120e45242f
Reviewed-on: https://code.wireshark.org/review/8109
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
9 years agoFix up some indentation/white space issues.
Jeff Morriss [Fri, 17 Apr 2015 17:32:51 +0000 (13:32 -0400)]
Fix up some indentation/white space issues.

Change-Id: I73a1a1dd567970f99df769d5976cc82a7e5b9a60
Reviewed-on: https://code.wireshark.org/review/8108
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
9 years agoRetire git_version.xml.
Gerald Combs [Fri, 17 Apr 2015 02:41:51 +0000 (19:41 -0700)]
Retire git_version.xml.

Remove check_git_version.sh and its associated targets. We haven't used
git_version.xml since the AsciiDoc conversion.

Change-Id: I480f0094c4355d71201f2dd285198581bbbfc415
Reviewed-on: https://code.wireshark.org/review/8104
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
9 years agoFix CMake warnings
Graham Bloice [Tue, 7 Apr 2015 20:41:34 +0000 (21:41 +0100)]
Fix CMake warnings

Newer versions of CMake generate warnings about the use of
@variable@ references, replace @CPACK_PACKAGE_NAME@ with
${CPACK_PACKAGE_NAME}

Set the policy for CMP0026 to be old to squelch warnings about the
use of target LOCATION

Change-Id: I424083260c51875dde80f98a23d6528c31ff0aec
Reviewed-on: https://code.wireshark.org/review/7977
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
9 years agoandroiddump: Fix build on onther than Win platforms
Michal Labedzki [Thu, 16 Apr 2015 06:04:58 +0000 (08:04 +0200)]
androiddump: Fix build on onther than Win platforms

androiddump should be put in extcat directory.

Change-Id: I360eef2d5a68178c73181949b0fe3346585f5190
Reviewed-on: https://code.wireshark.org/review/8083
Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
9 years agoAdd a few items to the Release Notes.
Jeff Morriss [Thu, 16 Apr 2015 14:47:31 +0000 (10:47 -0400)]
Add a few items to the Release Notes.

- GIAS dissector
- Netscaler 3.5 support
- GUI menu API for plugins

Change-Id: I88f52a73e1149de6fe0588c1316b27fac9af59ce
Reviewed-on: https://code.wireshark.org/review/8090
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
9 years agoCMake: Set WIN32 for GUI executables.
Gerald Combs [Thu, 16 Apr 2015 16:39:51 +0000 (09:39 -0700)]
CMake: Set WIN32 for GUI executables.

Pass WIN32 to add_executable where needed. Require CMake 2.8.11
on Windows.

Change-Id: I6a119bbb0f16f9e21f2e7378bae7ed52b8abb2dc
Reviewed-on: https://code.wireshark.org/review/8091
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
9 years agoDo not package debug files when building PortableApps.com installer with (the soon...
Pascal Quantin [Fri, 17 Apr 2015 08:32:26 +0000 (10:32 +0200)]
Do not package debug files when building PortableApps.com installer with (the soon to be dead) nmake

Change-Id: Ifd6fc71cebe6db06923e2d764cb415bf5b2ed025
Reviewed-on: https://code.wireshark.org/review/8106
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
9 years agoDownload the Qt dmg and just do a binary installation.
Guy Harris [Fri, 17 Apr 2015 06:18:57 +0000 (23:18 -0700)]
Download the Qt dmg and just do a binary installation.

That's a *lot* faster than building from source.

That means we should suggest adding the Qt pkg-config directory to
PKG_CONFIG_PATH; do so.

Change-Id: I9a70ea73fbace1f736cad8a4da11b62df8e5818e
Reviewed-on: https://code.wireshark.org/review/8105
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoMount the CMake dmg we downloaded, don't download it again.
Guy Harris [Fri, 17 Apr 2015 01:58:14 +0000 (18:58 -0700)]
Mount the CMake dmg we downloaded, don't download it again.

Amazingly, "hdiutil attach" can take a URL as an argument; it will
attempt to download the file in question and mount it.  We've already
downloaded the file, so there's no point in downloading it again
(especially not with a URL with "v2.8" coded in).

Change-Id: I106fc0c32a378aeead66ed32bceb454d23efa297
Reviewed-on: https://code.wireshark.org/review/8103
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoFix spelling error.
Guy Harris [Thu, 16 Apr 2015 23:16:32 +0000 (16:16 -0700)]
Fix spelling error.

Also clean up alignment.

Change-Id: Ib1efb5f642489ea2ddfe2d129c083eda72551bad
Reviewed-on: https://code.wireshark.org/review/8100
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoZigBee: dissection of commissioning frame
Alexis La Goutte [Thu, 16 Apr 2015 19:01:15 +0000 (21:01 +0200)]
ZigBee: dissection of commissioning frame

Fix miscelleanous errors in ZigBee Green Power

Change-Id: Ie5d379228a755ea09821148dc508108c6293da81
Reviewed-on: https://code.wireshark.org/review/8095
Reviewed-by: Evan Huus <eapache@gmail.com>
9 years agogiop: replace glib with wmem
Evan Huus [Thu, 16 Apr 2015 11:45:39 +0000 (07:45 -0400)]
giop: replace glib with wmem

One structure and one hash table with very simple uses. Fixes a memory leak.

Change-Id: I727b7d5b0b17c2fcfaaad57797d11090e392253b
Ping-Bug: 11123
Reviewed-on: https://code.wireshark.org/review/8088
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Evan Huus <eapache@gmail.com>
9 years agogiop: fix uninitialized use of request id
Evan Huus [Thu, 16 Apr 2015 11:36:46 +0000 (07:36 -0400)]
giop: fix uninitialized use of request id

Move the req_id field to the "message-dependent data" section of the header
struct, since in the spec I found it is not specified in the common GIOP header
(even though it appears to be present in all message types). Regardless, this
better reflects the fact that it is not initialized by the primary tvb_memcpy,
only the independent fields are.

Initialize it and use it rather than creating a local for no reason; fixes the
possibility of using it uninitialized.

Bug: 11123
Change-Id: I3bae1df5123fbb1f2b86f7c42cee392b5b045c4f
Reviewed-on: https://code.wireshark.org/review/8087
Reviewed-by: Evan Huus <eapache@gmail.com>
9 years agoExtcap: fix logically dead code (CID 1232344)
Alexis La Goutte [Thu, 16 Apr 2015 19:27:40 +0000 (21:27 +0200)]
Extcap: fix logically dead code (CID 1232344)

Change-Id: Ia6c178a9a5ec413004107f63c8dcaa38c19690b9
Reviewed-on: https://code.wireshark.org/review/8096
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Evan Huus <eapache@gmail.com>
9 years agoMinor Win32 console fix.
Gerald Combs [Thu, 16 Apr 2015 21:31:58 +0000 (14:31 -0700)]
Minor Win32 console fix.

Fix a no-op in set_has_console. Mark it and set_console_wait GTK+ only.

Change-Id: Ifc6540b30edc0296c4a47c004a397cc309e71d2b
Reviewed-on: https://code.wireshark.org/review/8099
Reviewed-by: Gerald Combs <gerald@wireshark.org>
9 years agoFix copy-and-pasteo.
Guy Harris [Thu, 16 Apr 2015 21:21:00 +0000 (14:21 -0700)]
Fix copy-and-pasteo.

"Recursion(n).  See "recursion"."

Change-Id: Ic0acab13a6da8e0e00ead32653498d13edf212ac
Reviewed-on: https://code.wireshark.org/review/8098
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoUpdate README.cmake.
Gerald Combs [Thu, 16 Apr 2015 19:42:57 +0000 (12:42 -0700)]
Update README.cmake.

Change-Id: I2aaae7936639dc2775a8f7fdb1d4276893c8a6dc
Reviewed-on: https://code.wireshark.org/review/8097
Reviewed-by: Gerald Combs <gerald@wireshark.org>
9 years agoRADIUS: fix test suite by comment new rfc dicto
Alexis La Goutte [Thu, 16 Apr 2015 17:59:32 +0000 (19:59 +0200)]
RADIUS: fix test suite by comment new rfc dicto

tshark: radius: Vendor: 'integer', does not exist in /home/wireshark/builders/wireshark-master/ubuntu-14.04-x64/build/radius/dictionary.rfc7499:10
Vendor: 'integer', does not exist in /home/wireshark/builders/wireshark-master/ubuntu-14.04-x64/build/radius/dictionary.rfc7499:11

Change-Id: I2852658235b7025e429e891401088de91c542424
Reviewed-on: https://code.wireshark.org/review/8092
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
9 years agoRemove deprecated tvb_lengt APIs
AndersBroman [Thu, 16 Apr 2015 13:58:53 +0000 (15:58 +0200)]
Remove deprecated tvb_lengt APIs

Change-Id: Ic3c364384dcc1d87089d646665f5900081de13df
Reviewed-on: https://code.wireshark.org/review/8089
Reviewed-by: Anders Broman <a.broman58@gmail.com>
9 years agoRADIUS: Sync with FreeRADIUS Master
Alexis La Goutte [Tue, 7 Apr 2015 16:01:28 +0000 (18:01 +0200)]
RADIUS: Sync with FreeRADIUS Master

commit dec7ff66f34d773d25dee412fe218b4e108d7680
Author: Alan T. DeKok <aland@freeradius.org>
Date:   Wed Apr 1 13:49:22 2015 -0400

    added VALUEs

commit 634bdb7b29089ed9fd9548a4ed033bfca82832d2
Author: Alan T. DeKok <aland@freeradius.org>
Date:   Wed Apr 1 13:34:19 2015 -0400

    Added from RFC which has numbers assigned

commit 005437d9f260c233f165e5f1a8a0e00ab48d6456
Author: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date:   Thu Mar 26 09:09:13 2015 -0400

    Hyphens

commit 88332d8e5dc6bae25270500902cdcb511e0e08a6
Author: Nikolai Kondrashov <Nikolai.Kondrashov@redhat.com>
Date:   Thu Mar 26 12:13:39 2015 +0200

    Update dictionary.mikrotik

    Update dictionary.mikrotik to have new attributes and values mentioned
    in Mikrotik wiki:

    http://wiki.mikrotik.com/index.php?title=Manual:RADIUS_Client/vendor_dictionary

commit 849336c73dda97ac2a1185f19e21fd2d4d086180
Author: Alan T. DeKok <aland@freeradius.org>
Date:   Wed Mar 25 15:40:02 2015 -0500

    Motorola error message

Change-Id: I03ab7666dd64cef75e8ebf088766b6b28497817c
Reviewed-on: https://code.wireshark.org/review/7974
Reviewed-by: Anders Broman <a.broman58@gmail.com>
9 years agoReplace deprecated tvb_length APIs
AndersBroman [Thu, 16 Apr 2015 11:31:57 +0000 (13:31 +0200)]
Replace deprecated tvb_length APIs

Change-Id: Idfd3bed012e823de544fe4de483c8f095fc7c65d
Reviewed-on: https://code.wireshark.org/review/8086
Reviewed-by: Anders Broman <a.broman58@gmail.com>
9 years agoFix wireshark.pc when CMAKE_INSTALL_LIBDIR is absolute
Balint Reczey [Thu, 9 Apr 2015 23:58:42 +0000 (01:58 +0200)]
Fix wireshark.pc when CMAKE_INSTALL_LIBDIR is absolute

Change-Id: I9667660329c0888f35e1ac332537eda995509a85
Reviewed-on: https://code.wireshark.org/review/8010
Reviewed-by: Balint Reczey <balint@balintreczey.hu>
9 years agoFix misspellings in German debconf translation
Arnd Hannemann [Thu, 9 Apr 2015 23:24:35 +0000 (01:24 +0200)]
Fix misspellings in German debconf translation

Change-Id: I6cd3ce90dd3ffe5ebdf5f39f14cb3dabb38c62e9
Reviewed-on: https://code.wireshark.org/review/8009
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
9 years agoandroiddump: stop recompiling systematically androiddump.c with nmake
Pascal Quantin [Tue, 14 Apr 2015 16:47:36 +0000 (18:47 +0200)]
androiddump: stop recompiling systematically androiddump.c with nmake

Our default rules are confused because source file is in a subfolder of the nmake makefile

Change-Id: If3dee4cd5b3be493abfe8c696383fb170952260b
Reviewed-on: https://code.wireshark.org/review/8068
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
9 years agoCMake: Try not to clobber our gspawn exes.
Gerald Combs [Wed, 15 Apr 2015 23:23:56 +0000 (16:23 -0700)]
CMake: Try not to clobber our gspawn exes.

Try not to overwrite gspawn*.exe between signing them and packaging
them. (Second try.)

Change-Id: I717f5fca6dc6afbc146927d06e6f74ae6a0a87c8
Reviewed-on: https://code.wireshark.org/review/8082
Reviewed-by: Gerald Combs <gerald@wireshark.org>
9 years agoRevert "CMake: Try not to clobber our gspawn exes."
Gerald Combs [Wed, 15 Apr 2015 23:22:26 +0000 (23:22 +0000)]
Revert "CMake: Try not to clobber our gspawn exes."

This accidentally reverted code from g40ce324. Will try again shortly.

This reverts commit 8d9fdda9913a4773ebaf4fc34401ae8a24b729d7.

Change-Id: I0bf7f351b926f1ce4b0c9e19fe0367add1dfee1e
Reviewed-on: https://code.wireshark.org/review/8081
Reviewed-by: Gerald Combs <gerald@wireshark.org>
9 years agoCMake: Try not to clobber our gspawn exes.
Gerald Combs [Wed, 15 Apr 2015 21:34:58 +0000 (14:34 -0700)]
CMake: Try not to clobber our gspawn exes.

Try not to overwrite gspawn*.exe between signing them and packaging them.

Change-Id: I9f224b64537c3b0dd6f7f8b94a8837bd427ad2ca
Reviewed-on: https://code.wireshark.org/review/8080
Reviewed-by: Gerald Combs <gerald@wireshark.org>
9 years agoFix gsmtap signal and snr.
Anton Thomasson [Wed, 15 Apr 2015 13:50:34 +0000 (15:50 +0200)]
Fix gsmtap signal and snr.

-Correct parsrsing to get correct value (corect position in header).
-Rename hf_gsmtap_noise_dbm to hf_gsmtap_snr_db to reflect use and name in struct.
-Change order of decalaration/use of signal and snr to reflect position in struct.
-Change registered types to signed to reflect possible values and definition in struct.

Change-Id: I748bd19757c0dd87fe4ad0969dfcc8427b908aa2
Reviewed-on: https://code.wireshark.org/review/8077
Reviewed-by: Sylvain Munaut <246tnt@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
9 years agoAndroiddump: Fix Memory - corruptions (OVERRUN) (CID 1293632)
Alexis La Goutte [Wed, 15 Apr 2015 10:55:09 +0000 (12:55 +0200)]
Androiddump: Fix Memory - corruptions (OVERRUN) (CID 1293632)

Change-Id: Ifd0d5026d207f763e1726963049acfb5a77f4b39
Reviewed-on: https://code.wireshark.org/review/8075
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
9 years agoSet the extcap working directory on Windows.
Gerald Combs [Tue, 14 Apr 2015 00:11:15 +0000 (17:11 -0700)]
Set the extcap working directory on Windows.

On Windows, prepend the main program directory to %Path% when spawning
extcap processes. This lets us place androiddump in extcap while allowing
it to locate its DLLs.

Change-Id: I406c47ce71323266d5f14fb596931398464e452d
Reviewed-on: https://code.wireshark.org/review/8057
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
9 years agoReplcae deprecated API tvb_length with tvb_reported_length or tvb_captured
AndersBroman [Wed, 15 Apr 2015 15:20:35 +0000 (17:20 +0200)]
Replcae deprecated API tvb_length with tvb_reported_length or tvb_captured
length.

Change-Id: Id42f3409a32e202528d350f7afde7376e411fc51
Reviewed-on: https://code.wireshark.org/review/8076
Reviewed-by: Anders Broman <a.broman58@gmail.com>
9 years agoReplcae deprecated API tvb_length with tvb_reported_length or tvb_captured
AndersBroman [Wed, 15 Apr 2015 10:07:28 +0000 (12:07 +0200)]
Replcae deprecated API tvb_length with tvb_reported_length or tvb_captured
length.

Change-Id: Ia1235c49b28320b5651e284115639820f81cb747
Reviewed-on: https://code.wireshark.org/review/8074
Reviewed-by: Anders Broman <a.broman58@gmail.com>
9 years agoZigBee: fix IS_ANALOG_SUBTYPE macro
Julien STAUB [Tue, 14 Apr 2015 17:30:18 +0000 (19:30 +0200)]
ZigBee: fix IS_ANALOG_SUBTYPE macro

Modify IS_ANALOG_SUBTYPE macro according to 07-5123-04 zigbee cluster
library specification. It wasn't filtering out the 8-bit enums ans 16
bit enum (digital types).

Bug: 11120
Change-Id: I74f1c0e6671b33fa69e5045cfc283ada3a39d380
Reviewed-on: https://code.wireshark.org/review/8069
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
9 years agoCMake: Fix an NSIS dependency.
Gerald Combs [Tue, 14 Apr 2015 21:34:00 +0000 (14:34 -0700)]
CMake: Fix an NSIS dependency.

Change-Id: I514243727da1fed52c78a4cbd8c82c68bf724c8a
Reviewed-on: https://code.wireshark.org/review/8070
Reviewed-by: Gerald Combs <gerald@wireshark.org>
9 years agoCMake: Initial PortableApps targets.
Gerald Combs [Tue, 7 Apr 2015 19:55:42 +0000 (12:55 -0700)]
CMake: Initial PortableApps targets.

Add portableapps_app_dir and portableapps_package targets.

Change-Id: Ifea3d952eef0e267de6364999d45807236d99102
Reviewed-on: https://code.wireshark.org/review/8025
Reviewed-by: Gerald Combs <gerald@wireshark.org>
9 years agoStart moving win-setup to PowerShell.
Gerald Combs [Tue, 7 Apr 2015 21:05:52 +0000 (14:05 -0700)]
Start moving win-setup to PowerShell.

Add win-setup.ps1, which duplicates the following tasks performed by
config.nmake + Makefile.nmake + win-setup.sh:

- Create the windows library directory.
- Download files.
- Download and unpack zip files.
- Check and set current-tag.txt

Don't verify applications or libraries. CMakeLists.txt does that.

Update the Developer's Guide.

Have POWERSHELL_COMMAND use dot sourcing instead of "-File", which
appears to be a synonym for "-IgnoreTheExitStatusReturnedByThisScript".

This removes our dependencies on unzip and wget and reduces our dependency
on bash.

Change-Id: Ia9def24acbe183d81b9d477fa42e655e4a3a6614
Reviewed-on: https://code.wireshark.org/review/7990
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
9 years agoopenSAFETY: Replace deprecated API
Roland Knall [Tue, 14 Apr 2015 07:32:17 +0000 (09:32 +0200)]
openSAFETY: Replace deprecated API

 Replace deprecated API functions tvb_length and tvb_length_remaining

Change-Id: Ibf4c7b12a1a6ea3b1a750dce7faf2f4933b4c470
Reviewed-on: https://code.wireshark.org/review/8063
Reviewed-by: Roland Knall <rknall@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
9 years agoBluetooth: OBEX: Update to PBAP 1.2, GOEP 2.1, CTN 1.0 and GPP 1.0
Michal Labedzki [Tue, 24 Mar 2015 18:37:05 +0000 (19:37 +0100)]
Bluetooth: OBEX: Update to PBAP 1.2, GOEP 2.1, CTN 1.0 and GPP 1.0

Add a lot of fields.

Change-Id: If12a30b1840c0dbe934bc6af264a068935912832
Reviewed-on: https://code.wireshark.org/review/8043
Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
9 years agoOops, have to actually comment out the definition, not just the declaration.
Guy Harris [Tue, 14 Apr 2015 08:02:35 +0000 (01:02 -0700)]
Oops, have to actually comment out the definition, not just the declaration.

Change-Id: Iea588a07f4c559f4455d85d6bf99f9a3b631caed
Reviewed-on: https://code.wireshark.org/review/8066
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoCast away a (non-relevant) warning.
Guy Harris [Tue, 14 Apr 2015 07:52:01 +0000 (00:52 -0700)]
Cast away a (non-relevant) warning.

Change-Id: Iee5029dc685561491660a8f711e58a652893bc90
Reviewed-on: https://code.wireshark.org/review/8065
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoThat made some *other* routines unused; "#if 0" them out.
Guy Harris [Tue, 14 Apr 2015 07:37:29 +0000 (00:37 -0700)]
That made some *other* routines unused; "#if 0" them out.

Change-Id: I932765f724b6f38afafa8cba7bea6ee210c6b2e5
Reviewed-on: https://code.wireshark.org/review/8064
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years ago"#if 0" out some unused variables and functions.
Guy Harris [Tue, 14 Apr 2015 07:26:00 +0000 (00:26 -0700)]
"#if 0" out some unused variables and functions.

This should be checked - why are they being generated by idl2wrs?

Change-Id: I35956f95b3679fc06e2c63ddc1313733813e5f3f
Reviewed-on: https://code.wireshark.org/review/8062
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoGet rid of extra variable.
Guy Harris [Tue, 14 Apr 2015 07:14:07 +0000 (00:14 -0700)]
Get rid of extra variable.

That assigns all string members with a g_strdup-family function, making
the assignment of the name similar to the other assignments.

Change-Id: I5f2a4afbad5173b8428ba1bbe435f851e8cc1a19
Reviewed-on: https://code.wireshark.org/review/8061
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoChange deprecated API tvb_length -> tvb_reported_length
AndersBroman [Tue, 14 Apr 2015 06:55:47 +0000 (08:55 +0200)]
Change deprecated API tvb_length -> tvb_reported_length

Change-Id: I14577dccaed5aa5ed85e94b6810a94b4c8b2e437
Reviewed-on: https://code.wireshark.org/review/8059
Reviewed-by: Anders Broman <a.broman58@gmail.com>
9 years agoGIOP: Reassembly of fragments
gal [Thu, 2 Apr 2015 19:31:15 +0000 (20:31 +0100)]
GIOP: Reassembly of fragments

Support for the reassembly of GIOP Fragment message types.
A new bool preference (giop.reassemble) is introduced to control reassembly
and it is enabled by default.

Change-Id: I10ca51f745710dca3b57a03cc89126f7b1dc06b4
Reviewed-on: https://code.wireshark.org/review/7966
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
9 years agoGeospatial and Imagery Access Service (GIAS) Dissector
gal [Tue, 7 Apr 2015 08:35:16 +0000 (09:35 +0100)]
Geospatial and Imagery Access Service (GIAS) Dissector

A Corba (GIOP) based protocol for the exchange of Intelligence, Surveillance
and Reconnaissance (ISR) products.
Defined in STANAG 4559/AEDP-5 "NATO Standard ISR Library Interface (NSILI)"
See http://www.nato.int/structur/ac/224/standard/4559/4559.htm for more
information.
The dissector is generated using idl2wrs using the gias.idl, with some
manual corrections, as noted in README.gias.

Patch Set 4: Initialise uninitialised variables and no longer mark them as
unused.

Change-Id: Ieae93a135b30078f2d34e66f8c7b2e476438224e
Reviewed-on: https://code.wireshark.org/review/7965
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
9 years agoBluetooth: SDP: Update to MAP 1.2 and PBAP 1.2
Michal Labedzki [Mon, 23 Mar 2015 18:03:21 +0000 (19:03 +0100)]
Bluetooth: SDP: Update to MAP 1.2 and PBAP 1.2

There are some new attributes comparing MAP 1.1 to 1.2
and PBAP 1.1 to 1.2.

Change-Id: I4be2691e99d176c22676a00549aa550ea07e77e3
Reviewed-on: https://code.wireshark.org/review/8042
Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
9 years agoBluetooth: OBEX: Fix reassemble at transport layer
Michal Labedzki [Sun, 22 Mar 2015 17:36:35 +0000 (18:36 +0100)]
Bluetooth: OBEX: Fix reassemble at transport layer

Transport layer is RFCOMM. OBEX packet may be fragmented over RFCOMM.
If so then (Opcode + Final flag + ) Packet Length determines packet length,
but whole OBEX packet will be framented over parts/packet that first packet
has Packet Length and next packets are sequential parts of whole packet
(no header, etc.) Reassemble on this level is simple concatenation of all packet
up to Packet Length. Let threat packet shorted than 3 bytes as bad packet.

There is still no reasssemble on OBEX level (aka Final flag), so content send
over OBEX (vCards, files, XMLs) is still not reassembled.

Change-Id: I11882eb07480b34d274a4ca6e504e609dcf982c0
Reviewed-on: https://code.wireshark.org/review/8041
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
9 years agoBluetooth: OBEX: Add request/response tracking
Michal Labedzki [Sat, 21 Mar 2015 18:01:07 +0000 (19:01 +0100)]
Bluetooth: OBEX: Add request/response tracking

Change-Id: I691d8a89c222208afb3b1bcd924a2331ea58af5b
Reviewed-on: https://code.wireshark.org/review/8040
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
9 years agoBluetooth: GATT/L2CAP: Add support for 6LoWPAN
Michal Labedzki [Sat, 28 Mar 2015 11:58:17 +0000 (12:58 +0100)]
Bluetooth: GATT/L2CAP: Add support for 6LoWPAN

6LoWPAN is used by GATT level profile called IPSP.

Change-Id: Iff2e1a8d531072d9bba03e7d84b56db59110cb35
Reviewed-on: https://code.wireshark.org/review/8045
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
9 years agoBluetooth: HFP: Update to HFP 1.7
Michal Labedzki [Tue, 24 Mar 2015 07:56:54 +0000 (08:56 +0100)]
Bluetooth: HFP: Update to HFP 1.7

Update to latest Bluetooth specification: 1.7 (previously 1.6)
Add +BIND and +BIEV commands, also update +BRSF to support new features.
There is still some things to implement, but need more work to do it, like
request-response tracking.

Change-Id: I195380b9588f3a3e5b07628fbe9d5c66ed46fbfd
Reviewed-on: https://code.wireshark.org/review/8046
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
9 years agoJust use g_strdup_printf() to create a g_mallocated formatted string.
Guy Harris [Tue, 14 Apr 2015 05:04:40 +0000 (22:04 -0700)]
Just use g_strdup_printf() to create a g_mallocated formatted string.

And, as it's g_mallocated, we don't need to g_mallocate it again with
g_strdup().

The same is true of strings allocated with g_strconcat().  Don't make an
extra copy, and don't free up the original.

Change-Id: Iea470a4424a811934f7fb8b0ba8dd110d337e420
Reviewed-on: https://code.wireshark.org/review/8058
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoUI: Implementing menus for plugins
Roland Knall [Mon, 30 Mar 2015 14:10:01 +0000 (16:10 +0200)]
UI: Implementing menus for plugins

 Plugins may utilize the tap interface to provide special tools
 or analysis options, not otherwise available in Wireshark, or
 perhaps not allowed to be distributed freely. Up until now, those
 tools either had to start automatically, or could not be started
 at all, or had to be started separately.

 It should be possible, that those tools may be started using a
 menu entry directly from Wireshark. This interface tries to achieve
 exactly that.

 This interface uses a clean interface, which can be implemented in
 any plugin or dissector. Documentation for this has been added to
 README.plugins.

 Separators are only supported for now in the Qt interface, but
 URLs can now be added as a simple item, and the UI will use the
 same methods used for other URL calls to open them.

Change-Id: I170107dafb66f6badaa864d05a9091e5cbbf52c2
Reviewed-on: https://code.wireshark.org/review/7865
Reviewed-by: Roland Knall <rknall@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
9 years agoFix zlib DLL copy.
Gerald Combs [Mon, 13 Apr 2015 20:44:23 +0000 (13:44 -0700)]
Fix zlib DLL copy.

Switch to "if exist ... xcopy".

Change-Id: I255fd3e719645b247024583590b748104c5e15b9
Reviewed-on: https://code.wireshark.org/review/8056
Reviewed-by: Gerald Combs <gerald@wireshark.org>
9 years agoMore casts.
Guy Harris [Mon, 13 Apr 2015 19:35:14 +0000 (12:35 -0700)]
More casts.

Change-Id: I0c8969bcb986350fa58f65d8e67394766b734286
Reviewed-on: https://code.wireshark.org/review/8055
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoAdd a major version number argument to --with-qt.
Guy Harris [Mon, 13 Apr 2015 18:05:08 +0000 (11:05 -0700)]
Add a major version number argument to --with-qt.

Without a major version number, it behaves as before, picking whatever
version it finds, and preferring Qt 5 to Qt 4.  With a major version
number, it looks only for the version in question.

Bug: 10793
Change-Id: Idf6c2c61e84bb87f7b601d8f09c33f31b67bf46d
Reviewed-on: https://code.wireshark.org/review/8052
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoCast away some warnings.
Guy Harris [Mon, 13 Apr 2015 19:06:11 +0000 (12:06 -0700)]
Cast away some warnings.

offsetof() doesn't necessarily return an int-sized value; cast it to
guint.

Change-Id: Ie0072d62de0178f87bc3168e3f8f1a03d9ec69d5
Reviewed-on: https://code.wireshark.org/review/8053
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoAdd the OpenSUSE zlib1.dll when needed.
Gerald Combs [Mon, 13 Apr 2015 17:31:00 +0000 (10:31 -0700)]
Add the OpenSUSE zlib1.dll when needed.

The Visual Studio solution files created by CMake list "Debug" as the
first configuration, which means that we end up with zlibd1.dll by
default. Many of the OpenSUSE DLLs depend on zlib1.dll. Add the OBS
version in that case.

Change-Id: Ia98490f1a192802d1482e0749bbd2b550e916bc5
Reviewed-on: https://code.wireshark.org/review/8051
Reviewed-by: Gerald Combs <gerald@wireshark.org>
9 years agoFix extcap interface capture with tshark
Pascal Quantin [Sat, 11 Apr 2015 19:49:48 +0000 (21:49 +0200)]
Fix extcap interface capture with tshark

Extcap parameters must be saved when doing the interface number/name matching,
otherwise extcap program is not launched and pipe is not created

Change-Id: Iaa0c9ad145049ee6e7a285dfca904ceb0baf417f
Reviewed-on: https://code.wireshark.org/review/8017
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
9 years agodumpcap: fix opening of pipes on Windows broken since gbed29af
Pascal Quantin [Fri, 10 Apr 2015 17:04:22 +0000 (19:04 +0200)]
dumpcap: fix opening of pipes on Windows broken since gbed29af

Previous code was assuming that all local pipes were of extcap type. Let's explicitly check for extcap prefix now.

Bug: 10803
Change-Id: If955e77a9ee2af11b553740269964c40273d5177
Reviewed-on: https://code.wireshark.org/review/8013
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
9 years agoQt: Add option to copy all visible item or selected tree items in Packet Details...
Michal Labedzki [Mon, 23 Mar 2015 11:04:36 +0000 (12:04 +0100)]
Qt: Add option to copy all visible item or selected tree items in Packet Details pane

The idea is allow to copy data from GUI by user,
what is currently case only for tshark.

The first option copy every item from Packet Details that are expanded (visibled).
The second option do the same but start on currently selected item/tree.
(let think about protocols like BT SDP where there is a lot of recursive subtrees)

Change-Id: I19c925d21293ceb8af2167c7d2c1b1b36507124e
Reviewed-on: https://code.wireshark.org/review/8047
Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Michal Labedzki <michal.labedzki@tieto.com>
9 years agoSupport for new netscaler 3.5 trace format.
anilkumar911 [Thu, 19 Mar 2015 05:25:10 +0000 (10:55 +0530)]
Support for new netscaler 3.5 trace format.

Change-Id: Ica74f3f9239a96486967cf248feb4313bc390734
Reviewed-on: https://code.wireshark.org/review/7751
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
9 years agoAdd more "bitmask grouping" APIs.
Michael Mann [Sun, 12 Apr 2015 23:12:35 +0000 (19:12 -0400)]
Add more "bitmask grouping" APIs.

Add proto_tree_add_bitmask_value, proto_tree_add_bitmask_value_with_flags and proto_tree_add_bitmask_list to aid in the removal of proto_tree_add_boolean "groupings" as well as "groups" of fields that use proto_tree_add_item with the same offset/len.

This may be able to be optimized later, but the first step will be converting dissectors to use it.  A sample conversion of each API is also included.

Change-Id: I53febc7450ad632482f82615a7fa62174f8472c9
Reviewed-on: https://code.wireshark.org/review/8038
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
9 years agoGSM A: force display of the bits sequence corresponding to "Degrees of longitude...
Pascal Quantin [Mon, 13 Apr 2015 12:50:56 +0000 (14:50 +0200)]
GSM A: force display of the bits sequence corresponding to "Degrees of longitude" field

It makes the display more consistent with other fields of Location Estimate IE

Bug: 11114
Change-Id: Ib31c61a34f419cf97601a660f3b807454b1becd9
Reviewed-on: https://code.wireshark.org/review/8049
Reviewed-by: Anders Broman <a.broman58@gmail.com>
9 years agoRemove deprecated API tvb_lengtRemove deprecated API tvb_length
AndersBroman [Mon, 13 Apr 2015 10:13:05 +0000 (12:13 +0200)]
Remove deprecated API tvb_lengtRemove deprecated API tvb_length

Change-Id: Iea7dd7d13ce1a2ee375a2c4a75f897ba2c936921
Reviewed-on: https://code.wireshark.org/review/8048
Reviewed-by: Anders Broman <a.broman58@gmail.com>
9 years agoFix the path for androiddump.
Guy Harris [Sun, 12 Apr 2015 21:55:53 +0000 (14:55 -0700)]
Fix the path for androiddump.

The androiddump binary ends up in the top-level source directory, not
the extcap subdirectory.

Change-Id: Ia306b35211b885b817802a6a22ed9dbbe07f2532
Reviewed-on: https://code.wireshark.org/review/8037
Reviewed-by: Guy Harris <guy@alum.mit.edu>