metze/wireshark/wip.git
4 years agoSDP: protect against out of bounds access
Pascal Quantin [Sat, 24 Oct 2015 09:32:16 +0000 (11:32 +0200)]
SDP: protect against out of bounds access

Change-Id: I4b24441cb26757b639e8113cab18d64c7f07112f
Ping-Bug: 9887
Reviewed-on: https://code.wireshark.org/review/11241
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
4 years agoThere's no need for all these variables to be volatile.
Jeff Morriss [Sun, 25 Oct 2015 02:22:38 +0000 (22:22 -0400)]
There's no need for all these variables to be volatile.

I suppose there must have been TRYs and CATCHes in here years ago. And/or
there was just too much cutting-and-pasting going on here.

Also reindent some col_ calls: they weren't moved left when check_col() was
taken out.

Change-Id: I0b01e008395be5b638a0470645d247dc706ca93f
Reviewed-on: https://code.wireshark.org/review/11254
Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
4 years ago[nfs] don't THROW() an exception from a dissector
Martin Kaiser [Tue, 20 Oct 2015 18:38:54 +0000 (20:38 +0200)]
[nfs] don't THROW() an exception from a dissector

the case where the number of bitmaps is too large was already handled
more cleanly in some places, we can just copy their code

unfortunately, we have to add a pinfo parameter to quite a few functions

Change-Id: I0e0fa9674d6ecd98c3d7e49e065f7121cc275a9b
Reviewed-on: https://code.wireshark.org/review/11247
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
4 years agoBail out immediately if we can't allocate a buffer for carving up $PATH.
Guy Harris [Sun, 25 Oct 2015 02:01:39 +0000 (19:01 -0700)]
Bail out immediately if we can't allocate a buffer for carving up $PATH.

Quit immediately, don't even bother allocating a buffer for the pathname
of the file we found.

Revert some other cosmetic changes, to reduce the differences between us
and upstream.

Change-Id: I217fecee64c7e6bac9272486d0cc334e192b501e
Reviewed-on: https://code.wireshark.org/review/11253
Reviewed-by: Guy Harris <guy@alum.mit.edu>
4 years agoepl: Remove usage of subnum
Roland Knall [Fri, 23 Oct 2015 11:40:29 +0000 (13:40 +0200)]
epl: Remove usage of subnum

 pinfo->fd->subnum is not used in a way as it was documented
 in frame_data.h. This uses a more generic approach and also
 frees subnum in this case

Change-Id: I3aee0ffcdf1948c97a2d2f95c868e636362664a1
Reviewed-on: https://code.wireshark.org/review/11225
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
4 years agolemon: move free() to avoid mem leak (CID 718529)
Dario Lombardo [Mon, 5 Oct 2015 12:32:15 +0000 (14:32 +0200)]
lemon: move free() to avoid mem leak (CID 718529)

Change-Id: I3b0740f5ccc3b9b87ed351e26f198152bbb1e599
Reviewed-on: https://code.wireshark.org/review/10801
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>
4 years ago[aeron] a new-style dissector should return 0 (not -1) to reject a packet
Martin Kaiser [Tue, 20 Oct 2015 18:59:19 +0000 (20:59 +0200)]
[aeron] a new-style dissector should return 0 (not -1) to reject a packet

we shouldn't throw an exception before we know that the packet
contains our protocol

Change-Id: Ic58cb985775766a18e9086fe52096e3290674515
Reviewed-on: https://code.wireshark.org/review/11248
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
4 years agoNTP timestamps can't be relative.
Michael Mann [Sat, 24 Oct 2015 21:30:38 +0000 (17:30 -0400)]
NTP timestamps can't be relative.

Bug: 11633
Change-Id: If0d3c8c51ef8179f2e6f25a617cf545db662d32b
Reviewed-on: https://code.wireshark.org/review/11250
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
4 years agoRLC Graph: call replot() with rpQueued to avoid lag caused by trying to draw every...
Martin Mathieson [Sat, 24 Oct 2015 20:42:41 +0000 (13:42 -0700)]
RLC Graph: call replot() with rpQueued to avoid lag caused by trying to draw every mouse position

Change-Id: Ibde38a1168f8d8dafbce5985a4b10ed935d95cba
Reviewed-on: https://code.wireshark.org/review/11249
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
4 years agolemon: add free() to avoid mem leak (CID 1309088)
Dario Lombardo [Mon, 5 Oct 2015 09:55:09 +0000 (11:55 +0200)]
lemon: add free() to avoid mem leak (CID 1309088)

Change-Id: Id32864d324f72ffee9c1033f0f36a79eb2651334
Reviewed-on: https://code.wireshark.org/review/10797
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
4 years agoPER: fix ASAN runtime error: left shift of negative value -1
Pascal Quantin [Sat, 24 Oct 2015 09:30:31 +0000 (11:30 +0200)]
PER: fix ASAN runtime error: left shift of negative value -1

Change-Id: Ibab619ee96b0389df87021156c4bf35a3d52063c
Ping-Bug: 9887
Reviewed-on: https://code.wireshark.org/review/11240
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>
4 years agoRemove ADDRESS macros and just have their lower-case equivalents.
Michael Mann [Sat, 24 Oct 2015 02:23:41 +0000 (22:23 -0400)]
Remove ADDRESS macros and just have their lower-case equivalents.

Remove calls SET_ADDRESS, CMP_ADDRESS, ADDRESSES_EQUAL, COPY_ADDRESS, COPY_ADDRESS_SHALLOW, and ADD_ADDRESS_TO_HASH since they are no longer used.

Change-Id: I53fa4cfda756d8cef8815ad0324a3b9d9f9cd490
Reviewed-on: https://code.wireshark.org/review/11238
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
4 years agoTDS: Replace use of val_to_str() with VALS()
Nathan Cole [Sat, 24 Oct 2015 08:35:13 +0000 (09:35 +0100)]
TDS: Replace use of val_to_str() with VALS()

Multiple uses of val_to_str replaced, allowing proto_tree_add_item and
proto_item_append_text to be replaced with just proto_tree_add_item.

While changing this aspect in dissect_tds7_prelogin_packet, I strengthened
the add_item calls so that integer fields could not be passed with invalid
lengths.

Bug: 11631
Change-Id: I556c4d965fd4ee5dffa36b538695d46e422062de
Reviewed-on: https://code.wireshark.org/review/11239
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: Michael Mann <mmann78@netscape.net>
4 years agoT38: fix a dereference of NULL pointer
Pascal Quantin [Sat, 24 Oct 2015 09:35:02 +0000 (11:35 +0200)]
T38: fix a dereference of NULL pointer

Change-Id: I6d0a87e301145f43af0c0ccba44c1dbb2f84adb2
Ping-Bug: 9887
Reviewed-on: https://code.wireshark.org/review/11242
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
4 years agoNULL terminate some hf_ arrays used in proto_tree_add_bitmask_xxx calls.
Michael Mann [Fri, 23 Oct 2015 20:34:23 +0000 (16:34 -0400)]
NULL terminate some hf_ arrays used in proto_tree_add_bitmask_xxx calls.

I thought this was already caught by one of the check*.pl scripts, but I ran into the one in packet-nfs.c and decided to manually check the dissector directory.

Change-Id: I8df83227255818eabc43763e3cf760cf762797cc
Reviewed-on: https://code.wireshark.org/review/11230
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
4 years agoMore ADDRESS macro to address function conversions.
Gerald Combs [Fri, 23 Oct 2015 18:14:34 +0000 (11:14 -0700)]
More ADDRESS macro to address function conversions.

Replace remaining calls to SET_ADDRESS, CMP_ADDRESS, ADDRESSES_EQUAL,
COPY_ADDRESS, and COPY_ADDRESS_SHALLOW with their lower-case
equivalents.

Replace all ADD_ADDRESS_TO_HASH calls with add_address_to_hash.

Change-Id: I4cff857d7a84085abe0bccd52d2605d2a468bf6f
Reviewed-on: https://code.wireshark.org/review/11229
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: Michael Mann <mmann78@netscape.net>
4 years ago802.1ah: call subdissectors even when we have no tree.
Jeff Morriss [Fri, 23 Oct 2015 14:58:54 +0000 (10:58 -0400)]
802.1ah: call subdissectors even when we have no tree.

Otherwise none of the subdissectors are called on the first pass which means
none of their analysis (which is generally done on the first pass) is going to
work.

Bug: 11629
Change-Id: I6fe8d0692e5cf6f5b5fa099d31a91d01cc5c7c68
Reviewed-on: https://code.wireshark.org/review/11226
Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
4 years agoQt: Explicitly set the byte view painter font.
Gerald Combs [Fri, 23 Oct 2015 22:07:35 +0000 (15:07 -0700)]
Qt: Explicitly set the byte view painter font.

Set the painter font at the beginning of each paintEvent. It looks like
we either aren't calling setFont at the right time or the
QAbstractScrollArea viewport sometimes ignores its parent font.

Bug: 11594
Change-Id: Id4484f6b990be112bbc5728d5ad0e31a74a60201
Reviewed-on: https://code.wireshark.org/review/11231
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
4 years agoFix some copy+pasted tooltip text.
Gerald Combs [Fri, 23 Oct 2015 18:05:43 +0000 (11:05 -0700)]
Fix some copy+pasted tooltip text.

Change-Id: I782cc60b33639ad8b8b403db7094d9568e6cfc59
Reviewed-on: https://code.wireshark.org/review/11227
Reviewed-by: Gerald Combs <gerald@wireshark.org>
4 years agoandroiddump: fix doc.
Dario Lombardo [Fri, 23 Oct 2015 08:56:29 +0000 (10:56 +0200)]
androiddump: fix doc.

Change-Id: If11a9095ab20e84f61eb0194a64f33dbee6cc70e
Reviewed-on: https://code.wireshark.org/review/11223
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
4 years agodoc: add README.extcap
Dario Lombardo [Thu, 22 Oct 2015 12:32:25 +0000 (14:32 +0200)]
doc: add README.extcap

Change-Id: I0c9b6b5c16a10d13860a0a7bd4c0ace3005bc893
Reviewed-on: https://code.wireshark.org/review/11210
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
4 years ago[Nettrace] Add parsing of IP addresses and ports.
AndersBroman [Thu, 22 Oct 2015 11:55:47 +0000 (13:55 +0200)]
[Nettrace] Add parsing of IP addresses and ports.

Change-Id: I4e2988edd9b5f75f7b104c8daddd1510bf1fc722
Reviewed-on: https://code.wireshark.org/review/11209
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
4 years agoTDS: Use hf_tds_prelogin field
Alexis La Goutte [Tue, 20 Oct 2015 06:42:01 +0000 (08:42 +0200)]
TDS: Use hf_tds_prelogin field

Change-Id: I06a87dbc402b5b96910f73402d44ed30118c9d23
Reviewed-on: https://code.wireshark.org/review/11172
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
4 years agoTry to fix osx-app.sh bundle creation.
Gerald Combs [Thu, 22 Oct 2015 22:20:51 +0000 (15:20 -0700)]
Try to fix osx-app.sh bundle creation.

Change-Id: I6d96974fae3956a017a007988a1ed145f08d4647
Reviewed-on: https://code.wireshark.org/review/11220
Reviewed-by: Gerald Combs <gerald@wireshark.org>
4 years agoPass --verbose to windeployqt.
Gerald Combs [Thu, 22 Oct 2015 20:03:14 +0000 (13:03 -0700)]
Pass --verbose to windeployqt.

Change-Id: I0adc2eb294c7165b9a327a70b2437916b228f044
Reviewed-on: https://code.wireshark.org/review/11219
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
4 years agoosx-app.sh: Make sure we sign the Wireshark executable.
Gerald Combs [Thu, 22 Oct 2015 18:26:51 +0000 (11:26 -0700)]
osx-app.sh: Make sure we sign the Wireshark executable.

Change-Id: Ib94bfd5fb8579d8bd824109806d340ee3e4f2f1c
Reviewed-on: https://code.wireshark.org/review/11217
Reviewed-by: Gerald Combs <gerald@wireshark.org>
4 years agoosx-app.sh: Fix bundling.
Gerald Combs [Thu, 22 Oct 2015 18:12:23 +0000 (11:12 -0700)]
osx-app.sh: Fix bundling.

When creating a bundle using osx-app.sh (i.e. when we're using
Autotools), make sure we copy androiddump to the extcap subdirectory.

Change-Id: Iabb24ae969ae77856f15dd94120cc6e395311198
Reviewed-on: https://code.wireshark.org/review/11215
Reviewed-by: Gerald Combs <gerald@wireshark.org>
4 years agoosx-app.sh: Make sure we sign our binaries.
Gerald Combs [Thu, 22 Oct 2015 17:44:59 +0000 (10:44 -0700)]
osx-app.sh: Make sure we sign our binaries.

Throw an error if we don't.

Change-Id: I7967fe8903f989e6e1a1e8193fb65c6ce086595b
Ping-Bug: 11620
Reviewed-on: https://code.wireshark.org/review/11213
Reviewed-by: Gerald Combs <gerald@wireshark.org>
4 years agoosx-app.sh fixups.
Gerald Combs [Thu, 22 Oct 2015 01:18:57 +0000 (18:18 -0700)]
osx-app.sh fixups.

For libraries, instead of prefixing dependent library paths with
@executable_path/../Framework, prefix them with @rpath. This should let
us load them from different directory depths.

Remove any LC_RPATH not in an allowed list of prefixes. This should keep
us from leaking paths specific to the build environment and user, and
should make any portability problems more obvious.

Add either @executable_path/../Frameworks or
@executable_path/../../Frameworks as an LC_RPATH depending on which
actually exists. This lets us place androiddump in the extcap
subdirectory.

Add error checking in a few places and make sure we detect failures in
subshells.

Add a macdeployqt buglink.

Bug: 11620
Change-Id: I43ef02ecc6f741761fcb9827c0b0b7b2ef16fa9a
Reviewed-on: https://code.wireshark.org/review/11205
Reviewed-by: Gerald Combs <gerald@wireshark.org>
4 years agoqt: remove leak
Dario Lombardo [Wed, 14 Oct 2015 14:57:08 +0000 (16:57 +0200)]
qt: remove leak

Found by clang analyzer.

Change-Id: If8bc72e1de276ae778ee3ac3e0dfc9dffa384c29
Reviewed-on: https://code.wireshark.org/review/11028
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Reviewed-by: Michael Mann <mmann78@netscape.net>
4 years agoUse address functions instead of ADDRESS macros in ui.
Gerald Combs [Wed, 21 Oct 2015 18:46:49 +0000 (11:46 -0700)]
Use address functions instead of ADDRESS macros in ui.

Replace CMP_ADDRESS, COPY_ADDRESS, et al with their lower-case
equivalents in the ui directory.

Change-Id: I10e95e66c8da5b880133452ebc484c53046e87ba
Reviewed-on: https://code.wireshark.org/review/11199
Reviewed-by: Michael Mann <mmann78@netscape.net>
4 years agoUse address functions instead of ADDRESS macros in asn1 and epan
Gerald Combs [Wed, 21 Oct 2015 19:04:16 +0000 (12:04 -0700)]
Use address functions instead of ADDRESS macros in asn1 and epan

Replace CMP_ADDRESS, COPY_ADDRESS, et al with their lower-case
equivalents in the asn1 and epan directories.

Change-Id: I4043b0931d4353d60cffbd829e30269eb8d08cf4
Reviewed-on: https://code.wireshark.org/review/11200
Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
4 years agoTransifex: Add type of translation file
Alexis La Goutte [Thu, 22 Oct 2015 08:07:01 +0000 (10:07 +0200)]
Transifex: Add type of translation file

Change-Id: Ib6ef02013a2d42ec88b0b18cd1ba3794a7db59ae
Reviewed-on: https://code.wireshark.org/review/11206
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
4 years agoAvoid adding -pie on older cmake versions
Peter Wu [Wed, 21 Oct 2015 14:52:47 +0000 (16:52 +0200)]
Avoid adding -pie on older cmake versions

Fixes building on Ubuntu 12.04 x86_64 which has cmake 2.8.7.

Bug: 11617
Change-Id: I253e9fda698d4b963d50516e483d8243231f056b
Reviewed-on: https://code.wireshark.org/review/11193
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
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>
4 years agoRtpAudioStream: Add a cast.
Gerald Combs [Wed, 21 Oct 2015 21:26:57 +0000 (14:26 -0700)]
RtpAudioStream: Add a cast.

Change-Id: I45d353ad900dee062775408f12d58ebb43793219
Reviewed-on: https://code.wireshark.org/review/11203
Reviewed-by: Gerald Combs <gerald@wireshark.org>
4 years agoQt: Wire up the RTP Streams "Analyze" button.
Gerald Combs [Thu, 8 Oct 2015 19:52:32 +0000 (12:52 -0700)]
Qt: Wire up the RTP Streams "Analyze" button.

Change-Id: I0ad5d689b6c05fd3f98ba3304a5d99297db2bd6c
Reviewed-on: https://code.wireshark.org/review/11198
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
4 years agoLTE RLC Graph: fix CID 1328485: Uninitialized members (UNINIT_CTOR)
Martin Mathieson [Wed, 21 Oct 2015 21:05:39 +0000 (14:05 -0700)]
LTE RLC Graph: fix CID 1328485:  Uninitialized members  (UNINIT_CTOR)

Change-Id: Ia3d6a87ba4d8fb0ff66700d19ec30ffaeea86f2b
Reviewed-on: https://code.wireshark.org/review/11201
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
4 years agoSplit RTP player tapping, decoding, and plotting.
Gerald Combs [Tue, 20 Oct 2015 15:31:52 +0000 (08:31 -0700)]
Split RTP player tapping, decoding, and plotting.

In RtpAudioStream split tapping+decoding into separate member functions.
Store RTP payloads in memory. In RtpPlayerDialog split tapping+plotting.
This more closely resembles what we're doing in the GTK+ UI and paves
the way for jitter support and other changes.

Change-Id: I244c225cec8930545622e6582b7be35ebe45b237
Reviewed-on: https://code.wireshark.org/review/11195
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
4 years agoh261: fix "hf->bitmask != 0" assertion
Peter Wu [Wed, 21 Oct 2015 15:27:11 +0000 (17:27 +0200)]
h261: fix "hf->bitmask != 0" assertion

fuzz-2014-03-13-20306.pcap from bug 9887 triggered:

    Dissector bug, protocol H.261, in packet 978: epan/proto.c:8418:
    failed assertion "hf->bitmask != 0" (h261.sbit)

Fixes regression from v1.99.6rc0-311-g8d6324f.

Change-Id: I69f537576743347cad41873222b4905d48c2fb8d
Reviewed-on: https://code.wireshark.org/review/11194
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
4 years agoGSM SMS: do not call GSM SMS port IE subdissectors until message is reassembled
Pascal Quantin [Wed, 21 Oct 2015 11:57:40 +0000 (13:57 +0200)]
GSM SMS: do not call GSM SMS port IE subdissectors until message is reassembled

Change-Id: Ibf384c01a1d3283e36b87a3d84e6c256341b8664
Reviewed-on: https://code.wireshark.org/review/11190
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>
4 years agox11 generator: Fix indent (use always 4 spaces) and add modelines
Alexis La Goutte [Sat, 17 Oct 2015 13:39:06 +0000 (15:39 +0200)]
x11 generator: Fix indent (use always 4 spaces) and add modelines

Change-Id: I91739bb6f4acc4da060cf389ec288ee910965b2a
Reviewed-on: https://code.wireshark.org/review/11113
Reviewed-by: Michael Mann <mmann78@netscape.net>
4 years agoAdd to DIS dissector many new PDU types, fixing issues, and richer information.
Oren Koler [Wed, 30 Sep 2015 19:08:20 +0000 (22:08 +0300)]
Add to DIS dissector many new PDU types, fixing issues, and richer information.

This is a massive changeset, developed by Oren Koler from IDF BattleLab, and is being integrated by me.
IDF BattleLab enhanced this dissector for its own popular PDUs, and was tested successfully by its own DIS scenarios.

We also fixed those issues:
* Only zero or one timestamp in DIS packet header (division of integer by integer)
* Bad datum values padding.

IDF BattleLab outputs the result of Oren Koler work to the community.

Sadly, because of information security, we couldn't share recorded captures with the community.
However, we brought basic PDU record outside from IDF BattleLab.

Change-Id: Iec425569da3842f7054a97be5f371cbe893ff482
Reviewed-on: https://code.wireshark.org/review/10710
Reviewed-by: Tal Hadad <tal_hd@hotmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
4 years agoLTE RLC graph: Only enable graph buttons for directions with data
Martin Mathieson [Wed, 21 Oct 2015 09:18:23 +0000 (02:18 -0700)]
LTE RLC graph: Only enable graph buttons for directions with data

Change-Id: I80248aa6cf26a68c0d3aeff01c6c0e97951d1eed
Reviewed-on: https://code.wireshark.org/review/11189
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
4 years agoX11 generator: avoid extraneous parens in conditionals.
Jeff Morriss [Tue, 20 Oct 2015 20:14:21 +0000 (16:14 -0400)]
X11 generator: avoid extraneous parens in conditionals.

This is to avoid complaints from clang of the form:

wireshark/epan/dissectors/x11-extension-implementation.h:17021:18: error:
equality comparison with extraneous parentheses [-Werror,-Wparentheses-equality]
        if ((f_class_id == 0)) {
             ~~~~~~~~~~~^~~~

Change-Id: I91d629ad47677b71909d7da517c4a6198c276186
Reviewed-on: https://code.wireshark.org/review/11186
Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
4 years agoLTE dialogs: tidy up some loose ends
Martin Mathieson [Tue, 20 Oct 2015 14:07:10 +0000 (07:07 -0700)]
LTE dialogs: tidy up some loose ends

Change-Id: I18f099311f7660c91cffdf21bbacdb88b7c0fd7e
Reviewed-on: https://code.wireshark.org/review/11182
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
4 years ago[Nettrace] Parse timestamps and add to individual packets.
AndersBroman [Tue, 20 Oct 2015 13:47:40 +0000 (15:47 +0200)]
[Nettrace] Parse timestamps and add to individual packets.

Change-Id: I4a84f19011ef0e02836c84dff665b6fcadbf59ae
Reviewed-on: https://code.wireshark.org/review/11180
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
4 years agoTDS: add more casts to please OSX 10.5 x86 buildbot
Pascal Quantin [Tue, 20 Oct 2015 13:58:20 +0000 (15:58 +0200)]
TDS: add more casts to please OSX 10.5 x86 buildbot

Change-Id: I92f3c2b869132da38f15c20355abd24d4e11639c
Reviewed-on: https://code.wireshark.org/review/11181
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
4 years agoNCP2222: use wmem string buffer to build search pattern string
Pascal Quantin [Mon, 19 Oct 2015 08:59:55 +0000 (10:59 +0200)]
NCP2222: use wmem string buffer to build search pattern string

Bug: 11591
Change-Id: I2c76938234da076fd22f77dc0ce04d09a9a0ba6c
Reviewed-on: https://code.wireshark.org/review/11142
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
4 years agoTDS: try to pacify buildbots
Pascal Quantin [Tue, 20 Oct 2015 10:44:18 +0000 (12:44 +0200)]
TDS: try to pacify buildbots

Change-Id: Ic54cdf0849fb5b4b4f5147b170184fedcb9c1e76
Reviewed-on: https://code.wireshark.org/review/11177
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
4 years agoTDS: fix variable 'header_length' is uninitialized when used here [-Wuninitialized]
Alexis La Goutte [Tue, 20 Oct 2015 06:38:05 +0000 (08:38 +0200)]
TDS: fix variable 'header_length' is uninitialized when used here [-Wuninitialized]

fix also (header) item length

Change-Id: I4107fdb3020789a55e71814a42a53830e0371ea1
Reviewed-on: https://code.wireshark.org/review/11170
Reviewed-by: Anders Broman <a.broman58@gmail.com>
4 years agoTCP: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
Alexis La Goutte [Mon, 19 Oct 2015 05:44:46 +0000 (07:44 +0200)]
TCP: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang

Change-Id: Ib63d634b08da60c300e124e93399442adbde1c5e
Reviewed-on: https://code.wireshark.org/review/11169
Reviewed-by: Matthieu Coudron <matthieu.coudron@lip6.fr>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
4 years agonbns: Added closing parenthesis on flags item
Stig Bjørlykke [Tue, 20 Oct 2015 06:50:43 +0000 (08:50 +0200)]
nbns: Added closing parenthesis on flags item

Change-Id: I022ed8e9b14290c69a64f08f9bf373d34fb25afa
Reviewed-on: https://code.wireshark.org/review/11173
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
4 years agoTDS: fix implicit conversion shortens 64-bit value into a 32-bit value
Alexis La Goutte [Tue, 20 Oct 2015 06:40:50 +0000 (08:40 +0200)]
TDS: fix implicit conversion shortens 64-bit value into a 32-bit value

Change-Id: Ib436e5f5dab4d155cfea092a44b92abef9d46133
Reviewed-on: https://code.wireshark.org/review/11171
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
4 years agoUpdate TDS dissector to latest version of protocol.
Nathan Cole [Fri, 16 Oct 2015 16:35:22 +0000 (17:35 +0100)]
Update TDS dissector to latest version of protocol.

Dissector updated to recognise and dissect up to TDS 7.4. Most response tokens
now fully parsed and registered, allowing for much more granular filtering and
output. Virtually all TDS datatypes now parsed and presented in human readable
format.

Version dependent decisions now default to TDS 7.2 in the absence of
version information in the data, making successful dissection more likely.

Bug: 11603
Change-Id: Iabaa35c74b104d56eda7e043302d14e99cb7aa06
Reviewed-on: https://code.wireshark.org/review/11100
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>
4 years agoRequire libgcrypt 1.4.2, add cmake version detection
Peter Wu [Wed, 14 Oct 2015 17:40:24 +0000 (19:40 +0200)]
Require libgcrypt 1.4.2, add cmake version detection

libgcrypt 1.4.2 is required since since v1.11.0-rc1-2787-g23f9100
("Really add support for AEAD ciphers (GCM)") due to the use of
gcry_cipher_setctr. Bump the version in configure.ac too.

Add version check for gcrypt to cmake. Tested with CentOS 6 (cmake
2.8.12.2, libgcrypt 1.4.5).

Change-Id: I93c3ed902a764d9d14675779e866230d073c96d5
Reviewed-on: https://code.wireshark.org/review/11043
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
4 years agoProfinet: Add Watchdog Factor data field in IOCRBlockReq.
Thomas Wiens [Mon, 19 Oct 2015 21:41:57 +0000 (23:41 +0200)]
Profinet: Add Watchdog Factor data field in IOCRBlockReq.

The Watchdog Factor was displayed as Data Hold Factor, which was wrong.
Attribute type of the Watchdog Factor is also Unsigned16.

Change-Id: Ic5f32b9b322c225361be50b1f4a3180638a0c88b
Reviewed-on: https://code.wireshark.org/review/11161
Reviewed-by: Anders Broman <a.broman58@gmail.com>
4 years agoBugfix missing NULL elements for proto_tree_add_bitmask array values.
Michael Mann [Mon, 19 Oct 2015 20:46:19 +0000 (16:46 -0400)]
Bugfix missing NULL elements for proto_tree_add_bitmask array values.

Change-Id: Idbe7ee2750233eea3cb7c2bbef2bbb2c629a0183
Reviewed-on: https://code.wireshark.org/review/11160
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>
4 years agox11: update X11 from last mesa and xcb
Alexis La Goutte [Sat, 17 Oct 2015 13:39:46 +0000 (15:39 +0200)]
x11: update X11 from last mesa and xcb

Change-Id: Ic3567b4789385a29bb420fba5c56bd5fecbb6a22
Reviewed-on: https://code.wireshark.org/review/11114
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: Jeff Morriss <jeff.morriss.ws@gmail.com>
4 years agoDo -fPIC only if it's necessary.
Guy Harris [Fri, 16 Oct 2015 02:57:57 +0000 (19:57 -0700)]
Do -fPIC only if it's necessary.

Or, at least, undo the unconditional addition of -fPIC to
Qt5Widgets_EXECUTABLE_COMPILE_FLAGS, and add it back only if we need it
to compile a small test program that includes <QtCore>.

-fPIC still shows up for other reasons; perhaps we need to undo other
unconditional operations "helpfully" done by Qt5CoreConfigExtras.cmake.

Change-Id: I76c1b01b3dce7398e4115552bc4ff87bc775e027
Reviewed-on: https://code.wireshark.org/review/11079
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
4 years agoOn UN*X, use XDG_CONFIG_HOME/wireshark for configuration files.
Guy Harris [Sun, 18 Oct 2015 22:02:52 +0000 (15:02 -0700)]
On UN*X, use XDG_CONFIG_HOME/wireshark for configuration files.

If it doesn't exist, but ~/.wireshark does, continue to use that, for
backwards compatibility.

Derived from change I7fa64d6e8bd43c6a5dec93e30a4f69a747c34256.

Bug: 6353
Change-Id: I937f94b19a371486b7ea2228e51994cc4c72b501
Reviewed-on: https://code.wireshark.org/review/11137
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: João Valverde <j@v6e.pt>
Reviewed-by: Michael Mann <mmann78@netscape.net>
4 years agoX11 (doc): now more of 200Mb for mesa git repo
Alexis La Goutte [Sat, 17 Oct 2015 13:28:12 +0000 (15:28 +0200)]
X11 (doc): now more of 200Mb for mesa git repo

Change-Id: I98e382e60868c20415a35026100e5c4e4a67e010
Reviewed-on: https://code.wireshark.org/review/11112
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
4 years agomake-version.pl: no need for git-ls-remote
Peter Wu [Wed, 14 Oct 2015 17:13:08 +0000 (19:13 +0200)]
make-version.pl: no need for git-ls-remote

In subversion, the URL was needed to find the branch. This is not needed
for git where a 'git branch' command suffices.

Remove the unused URL handling from git, this fixes a warning during
cmake on RHEL6 and avoids a fallback to SVN:

    Version configuration file version.conf not found.  Using defaults.
    usage: git ls-remote [--heads] [--tags]  [-u <exec> | --upload-pack <exec>] <repository> <refs>...
    Unable to open ./.svn/entries
    #define VCSVERSION "v2.1.0rc0-69-g2eb7e87"
    #define VCSBRANCH "master"

Print the SVN warning to stderr, this avoids a compilation failure due
to a syntax error in version.h.

Change-Id: Idb28e74b7a9bf592686b45349cf5e81f85f6c358
Reviewed-on: https://code.wireshark.org/review/11041
Reviewed-by: Gerald Combs <gerald@wireshark.org>
4 years agox11 generator: Support new XCB paramref
Peter Harris [Sat, 17 Oct 2015 00:15:10 +0000 (20:15 -0400)]
x11 generator: Support new XCB paramref

Change-Id: I8ae38785bd0f2f81fa2164b5bc29274bd7e940f5
Reviewed-on: https://code.wireshark.org/review/11105
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
4 years agoQt: fix time shift
Gerald Combs [Thu, 15 Oct 2015 21:14:10 +0000 (23:14 +0200)]
Qt: fix time shift

Add a timeShifted signal to TimeShiftDialog and use it to update the
packet list and model. Add drawCurrentPacket to PacketList so that we
can do a more thorough job of redrawing the current packet and tree.

Bug: 11575
Change-Id: I960d8cdbf6872e3f71007cb4d2bbd5457f268257
Reviewed-on: https://code.wireshark.org/review/11068
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>
4 years agoAdd a margin to the main statusbar layout.
Gerald Combs [Mon, 19 Oct 2015 17:37:03 +0000 (10:37 -0700)]
Add a margin to the main statusbar layout.

Add a margin between the left edge of the window and the expert icon.
This makes it easier to distinguish between clicking on the expert icon
and resizing the window, at least on OS X.

Change-Id: Ibe20f3112862dc72f3be5d31f50656d081bbc110
Reviewed-on: https://code.wireshark.org/review/11151
Reviewed-by: Gerald Combs <gerald@wireshark.org>
4 years agoSeparate out sname and cname in Kerberos dissector.
Michael Mann [Mon, 18 May 2015 11:40:49 +0000 (07:40 -0400)]
Separate out sname and cname in Kerberos dissector.

Bug: 4479
Change-Id: I41de06f2e3eea0c44edd659ed053f628406550c6
Reviewed-on: https://code.wireshark.org/review/11125
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
4 years ago[OpenFlow] Fix a crash caused by the same filter name used for several
AndersBroman [Mon, 19 Oct 2015 16:15:14 +0000 (18:15 +0200)]
[OpenFlow] Fix a crash caused by the same filter name used for several
different ftypes.

Change-Id: Idf4335b2ab733af74afd23bdde066bff81d13952
Reviewed-on: https://code.wireshark.org/review/11148
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
4 years agoIf it's used by dissectors, it belongs in to_str.h, not to_str-int.h.
Guy Harris [Mon, 19 Oct 2015 16:39:59 +0000 (09:39 -0700)]
If it's used by dissectors, it belongs in to_str.h, not to_str-int.h.

Assuming *any* of the routines that generate printable strings should be
thought of as "for internal use by libwireshark routines only, not by
dissectors", the ones that *are* used by dissectors obviously shouldn't
be.  The ability for dissectors to register address types certainly
expands the list of routines they would use.

Move everything used by dissectors from to_str-int.h into to_str.h, and
have dissectors not include to_str-int.h.

(Perhaps we should just get rid of to_str-int.h altogether.)

Change-Id: I3c583351f038233c9bcd8f9216188f82630267fa
Reviewed-on: https://code.wireshark.org/review/11149
Reviewed-by: Guy Harris <guy@alum.mit.edu>
4 years agoRLC LTE graph: allow switching between zoom and drag, and place limits on each
Martin Mathieson [Mon, 19 Oct 2015 13:28:51 +0000 (06:28 -0700)]
RLC LTE graph: allow switching between zoom and drag, and place limits on each

Change-Id: I9fb9fa5be25dc56810dcbf2d4d5607d79eed541e
Reviewed-on: https://code.wireshark.org/review/11146
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
4 years agox11 generator: Don't crash when a switch is in a struct
Peter Harris [Sat, 17 Oct 2015 00:57:34 +0000 (20:57 -0400)]
x11 generator: Don't crash when a switch is in a struct

The size calculation for the struct will be wrong (too small) which looks
strange in the GUI when the children elements extend past the region
marked by their parent. But it doesn't seem to cause any actual problems,
there is only one request affected by this, and correct size calculation
(by recursing the switch) would take a fair amount of work.

Change-Id: I1847f736153daf59b8dbf3299005a772ffe9673a
Reviewed-on: https://code.wireshark.org/review/11107
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
4 years agox11 generator: Fix struct size with array
Peter Harris [Sat, 17 Oct 2015 00:43:51 +0000 (20:43 -0400)]
x11 generator: Fix struct size with array

my $count here shadows my $count in the outer scope, preventing the size
of constant sized arrays from being calculated correctly.

Change-Id: I89c989ee2d288d4828871ebab650807fbde747dd
Reviewed-on: https://code.wireshark.org/review/11106
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
4 years agox11 generator: Allow perl 5.20 and newer
Peter Harris [Fri, 16 Oct 2015 22:15:43 +0000 (18:15 -0400)]
x11 generator: Allow perl 5.20 and newer

Despite promises from the Perl maintainers to remove or at least
drastically change given/when and smartmatch, that still hasn't happened
as of 5.22.

We can cross that bridge when we come to it. Until then, assume they're
never going to break given/when.

Change-Id: If9270bd6fd819d24c58f31f2dfe0d88e831b19fe
Reviewed-on: https://code.wireshark.org/review/11104
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
4 years agoExplain what it means that Wireshark can now open PCAP files (as MIME files).
Jeff Morriss [Fri, 16 Oct 2015 01:50:17 +0000 (21:50 -0400)]
Explain what it means that Wireshark can now open PCAP files (as MIME files).

The title "New File Format Support" containing a list that included PCAP and
PCAPNG caught my eye: Wireshark has supported those for years.  (Attempt to)
explain what it means.

Change-Id: I472fabcca00befee9032cd7ef11bf30257b8ff8e
Reviewed-on: https://code.wireshark.org/review/11076
Reviewed-by: Anders Broman <a.broman58@gmail.com>
(cherry picked from commit 1a434143693a7f9ce103dfcf53e60c63415c81e8)
Reviewed-on: https://code.wireshark.org/review/11147
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
4 years agox11 generator: some blacklisted structs are now used.
Jeff Morriss [Tue, 13 Oct 2015 01:23:17 +0000 (21:23 -0400)]
x11 generator: some blacklisted structs are now used.

Also, die more gracefully than:

    Can't use string ("1") as a HASH ref while "strict refs" in use at
    ../../tools/process-x11-xcb.pl line 675.
    at ../../tools/process-x11-xcb.pl line 1859
    at ../../tools/process-x11-xcb.pl line 1859

when blacklisted (previously unused) structures start being used in the
xcbproto source.

(It's still not possible to regenerate the X11 dissector but this is a step...)

Change-Id: I1dec16a7a479d5f453c5f54e561aa8238eb21280
Reviewed-on: https://code.wireshark.org/review/10972
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
4 years agoX509AF: ensure that BER dissector successfully decoded a bit string before calling...
Pascal Quantin [Mon, 19 Oct 2015 12:23:12 +0000 (14:23 +0200)]
X509AF: ensure that BER dissector successfully decoded a bit string before calling RSA Public Key dissection

Bug: 11612
Change-Id: Ia1279b5991604631241398ab19f0652e36a2114e
Reviewed-on: https://code.wireshark.org/review/11144
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>
4 years agoX509AF: protect against a comparison with a NULL algorithm_id string
Pascal Quantin [Mon, 19 Oct 2015 10:07:50 +0000 (12:07 +0200)]
X509AF: protect against a comparison with a NULL algorithm_id string

Bug: 11611
Change-Id: Ide8a26f74c99405b53acf394041ddf4a599da90a
Reviewed-on: https://code.wireshark.org/review/11143
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>
4 years agoDon't fallback to thinking we have SVN; say Git if we didn't find a VCS.
Jeff Morriss [Tue, 13 Oct 2015 19:54:14 +0000 (15:54 -0400)]
Don't fallback to thinking we have SVN; say Git if we didn't find a VCS.

The 2.0.0rc0 Gtk+ GUI, when built from a source tarball, currently puts the
version in the title bar with the string "SVN Rev Unknown".  This changes it
to say "Git Rev Unknown".

(I think there's a Better Way but that will come later.)

Change-Id: I04c903f20554cf681bac09a51a3ef46bb41696f1
Reviewed-on: https://code.wireshark.org/review/10984
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
4 years agoEliminate unused method arguments and class members.
Guy Harris [Mon, 19 Oct 2015 08:22:32 +0000 (01:22 -0700)]
Eliminate unused method arguments and class members.

(Yes, clang "Apple LLVM version 7.0.0 (clang-700.0.72)" complains about
it.)

Change-Id: I5b9ddff26664e20c1129e0b2494bd96c1903c6d9
Reviewed-on: https://code.wireshark.org/review/11141
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>
4 years agoAllJoyn: prevent an infinite loop
Pascal Quantin [Sun, 18 Oct 2015 20:44:09 +0000 (22:44 +0200)]
AllJoyn: prevent an infinite loop

Display an expert error when the argument is empty

Bug: 11607
Change-Id: I8682eab8fe1822f784e848220ff90de4eb5e13ff
Reviewed-on: https://code.wireshark.org/review/11132
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: Michael Mann <mmann78@netscape.net>
4 years agoDCOM: ensure to initialize IPv4 variable put on the stack
Pascal Quantin [Sun, 18 Oct 2015 21:12:30 +0000 (23:12 +0200)]
DCOM: ensure to initialize IPv4 variable put on the stack

Bug: 11610
Change-Id: I920b88ab035ff34e7cff9eab8158aa2dabe2faac
Reviewed-on: https://code.wireshark.org/review/11134
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
4 years ago[lmp] don't THROW() an exception from a dissector
Martin Kaiser [Sun, 18 Oct 2015 17:05:52 +0000 (19:05 +0200)]
[lmp] don't THROW() an exception from a dissector

Change-Id: I274be5700a68a7698b6a8de9bf577af548055480
Reviewed-on: https://code.wireshark.org/review/11133
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
4 years ago[Automatic update for 2015-10-18]
Gerald Combs [Sun, 18 Oct 2015 15:18:58 +0000 (08:18 -0700)]
[Automatic update for 2015-10-18]

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

Change-Id: I717ca04b801731df4433ed94f285b33ccb4d15c1
Reviewed-on: https://code.wireshark.org/review/11129
Reviewed-by: Gerald Combs <gerald@wireshark.org>
4 years agoUMTS FP: fix another out of bounds access
Pascal Quantin [Sun, 18 Oct 2015 08:58:37 +0000 (10:58 +0200)]
UMTS FP: fix another out of bounds access

According to NBAP ASN.1, the maximum DCH ID value is 255

Bug: 11606
Change-Id: Ic5c85a31eb1a84d59f25baaed4afbd040a7852c5
Reviewed-on: https://code.wireshark.org/review/11126
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>
4 years agox509af: dissect subjectPublicKey for RSA
Peter Wu [Tue, 15 Sep 2015 21:24:26 +0000 (23:24 +0200)]
x509af: dissect subjectPublicKey for RSA

The subjectPublicKey field of a Certificate (TBSCertificate) is defined
as type BIT STRING. The actual contents depend on the Algorithm
Identifier which is preceding the subjectPublicKey field.

This patch adds support for dissection of the public key for RSA
public keys which show up below the subjectPublicKey tree:

    subjectPublicKeyInfo
        algorithm (rsaEncryption)
            Algorithm Id: 1.2.840.113549.1.1.1 (rsaEncryption)
        subjectPublicKey: 3082010a0282010100b7c769e2d0eacaeb929fc08238a9ff...
            modulus : 0x00b7c769e2d0eacaeb929fc08238a9ffc59cab39c28a2e26...
            publicExponent: 65537

Change-Id: Ib92645433b0a0078a947ff0ac26c5e6a64877b93
Reviewed-on: https://code.wireshark.org/review/10967
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
4 years agoDon't parse services file twice, respect user settings
João Valverde [Tue, 6 Oct 2015 08:11:46 +0000 (09:11 +0100)]
Don't parse services file twice, respect user settings

Platform file '/etc/services' is the same as Wireshark's
'/usr/share/wireshark/services', only Wireshark's is more recent
(on my system, same goes for other platforms I assume).

Use only Wireshark's IANA services files.

Other benefits would be removing some platform specific #ifdefs and making
service names more consistent.

Also respect user services settings by parsing $PERSCONFIG_DIR/services
after $SYSCONFIG_DIR/services.

Change-Id: I9890473af92763e02dabd2386eaa767aed2f2899
Reviewed-on: https://code.wireshark.org/review/10941
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
4 years agoNBAP: fix indent (use 8 spaces)
Alexis La Goutte [Sat, 17 Oct 2015 12:51:50 +0000 (14:51 +0200)]
NBAP: fix indent (use 8 spaces)

Change-Id: I79c19f887cc868cb861631fe6926f0ec2b903a8c
Reviewed-on: https://code.wireshark.org/review/11111
Reviewed-by: Michael Mann <mmann78@netscape.net>
4 years agoLTE RLC Graph: add support for going to packet clicked
Martin Mathieson [Sat, 17 Oct 2015 15:54:55 +0000 (08:54 -0700)]
LTE RLC Graph: add support for going to packet clicked

Change-Id: I7e1ada7508c33f7ccea5703a9ea9e2a76ecdb706
Reviewed-on: https://code.wireshark.org/review/11118
Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
4 years agoqt: add missing initializer (CID 1317258)
Dario Lombardo [Mon, 12 Oct 2015 20:52:06 +0000 (22:52 +0200)]
qt: add missing initializer (CID 1317258)

Change-Id: I0a38d09d025525501173486284fa4ffba3335ce9
Reviewed-on: https://code.wireshark.org/review/10968
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
4 years ago[giop] don't THROW() an exception from a dissector
Martin Kaiser [Sat, 17 Oct 2015 17:50:09 +0000 (19:50 +0200)]
[giop] don't THROW() an exception from a dissector

btw the exception was thrown only if tree!=NULL...

Change-Id: I3a0d46de715df6ada5fda3db126ade210a6201c1
Reviewed-on: https://code.wireshark.org/review/11122
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
4 years agoUMTS FP: fix an out of bounds access
Pascal Quantin [Sat, 17 Oct 2015 15:12:46 +0000 (17:12 +0200)]
UMTS FP: fix an out of bounds access

Bug: 11602
Change-Id: I636a5494a0eda5895e856e80424be29f01c758bf
Reviewed-on: https://code.wireshark.org/review/11117
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>
4 years ago[m2pa] remove unnecessary if (tree) checks
Martin Kaiser [Sat, 17 Oct 2015 15:59:50 +0000 (17:59 +0200)]
[m2pa] remove unnecessary if (tree) checks

Change-Id: I36e25805195f2fc873397814e0f7cbe712da3554
Reviewed-on: https://code.wireshark.org/review/11120
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
4 years ago[m2pa] don't THROW() an exception from a dissector
Martin Kaiser [Sat, 17 Oct 2015 15:54:14 +0000 (17:54 +0200)]
[m2pa] don't THROW() an exception from a dissector

in this case, we can just return; the dissector already brings up an expert info

Change-Id: I6595a865e5250da31d6f1a411d84e7860a9dde1c
Reviewed-on: https://code.wireshark.org/review/11119
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
4 years agoNBAP: avoid dereferencing a NULL pointer
Pascal Quantin [Sat, 17 Oct 2015 11:28:19 +0000 (13:28 +0200)]
NBAP: avoid dereferencing a NULL pointer

Bug: 11602
Change-Id: I56b9db19eca416c288f36c1f3a4faa7e22b38c8f
Reviewed-on: https://code.wireshark.org/review/11109
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: Alexis La Goutte <alexis.lagoutte@gmail.com>
4 years agoMove the static handling to a place where it is effective during package
Joerg Mayer [Sat, 17 Oct 2015 10:00:27 +0000 (12:00 +0200)]
Move the static handling to a place where it is effective during package
discovery.
  More work needed to get static really working.

v2:
  - Rebase
  - Remove accidentally added macos-setup.sh changes

Change-Id: Ic3a68d2ab7064afffbf5dcfc90925699e8729780
Reviewed-on: https://code.wireshark.org/review/11082
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
4 years agoBluetooth: ATT: Fix Heart Rate Measurement characteristic
Michal Labedzki [Wed, 7 Oct 2015 15:39:50 +0000 (17:39 +0200)]
Bluetooth: ATT: Fix Heart Rate Measurement characteristic

Hear Rate flags should be 8-bits, not 16.

Change-Id: I31e3219bcdc60f3c649ef2c4f7775c10c1391d6f
Reviewed-on: https://code.wireshark.org/review/11022
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>
4 years agoBluetooth: Make dissectors independent of passed data
Michal Labedzki [Sun, 27 Sep 2015 16:22:32 +0000 (18:22 +0200)]
Bluetooth: Make dissectors independent of passed data

If Bluetooth dissectors has additional data from previous layer - good.
But if do not... try to decode as much as possible - probably using
some "force" dissector preferences you can decode payload correctly.

Change-Id: I6427afafb987ed3b9b751fd91616e670802b3542
Reviewed-on: https://code.wireshark.org/review/11021
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
4 years agoBluetooth: ATT: Print names assigned to handles in info column
Michal Labedzki [Tue, 6 Oct 2015 17:39:42 +0000 (19:39 +0200)]
Bluetooth: ATT: Print names assigned to handles in info column

This increase readability.

Change-Id: I033ae557316f40b292da2c9b3f99692bbe21cf4d
Reviewed-on: https://code.wireshark.org/review/11020
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
4 years agoBluetooth: Fix expert info for undecoded data
Michal Labedzki [Fri, 25 Sep 2015 09:23:39 +0000 (11:23 +0200)]
Bluetooth: Fix expert info for undecoded data

Swap PI_* values avoid crashes (assert...) of expert info.

Change-Id: I5f5188c9358a4ac93565fc079a3a0e8ea4b7f965
Reviewed-on: https://code.wireshark.org/review/11019
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
4 years agoBluetooth: Fix displaying and handling UUID128
Michal Labedzki [Wed, 9 Sep 2015 15:34:46 +0000 (17:34 +0200)]
Bluetooth: Fix displaying and handling UUID128

Use a standard way of displaying 128 UUIDs (like GUID).
This also change a way that UUID are handled by dissector tables.

Change-Id: Ie0f880f58480c34b40dd23c426202349e0620b12
Reviewed-on: https://code.wireshark.org/review/11018
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
4 years agoBluetooth: ATT: Add missing "Generic" items for Appearance
Michal Labedzki [Fri, 25 Sep 2015 11:42:14 +0000 (13:42 +0200)]
Bluetooth: ATT: Add missing "Generic" items for Appearance

Each category of Appearance has "Generic" value (0x00), so show it as "Generic"
rather then "Unknown".

Change-Id: I572c8336a836a543d82975f0a27f0a06648132b8
Reviewed-on: https://code.wireshark.org/review/11017
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>