metze/wireshark/wip.git
22 months agoAutotools: Build rawshark.
Gerald Combs [Wed, 7 Mar 2018 16:57:40 +0000 (16:57 +0000)]
Autotools: Build rawshark.

a1da75c554 inadvertently removed rawshark from bin_PROGRAMS. Add
it back.  Sort bin_PROGRAMS while we're here.

Change-Id: I6f71b43efd52ed116ea5fb9567b7ff1a94db58c7
Reviewed-on: https://code.wireshark.org/review/26340
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Ed Beroset <beroset@ieee.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
22 months agodissectors: more SPDX license convertions.
Dario Lombardo [Wed, 7 Mar 2018 13:08:18 +0000 (14:08 +0100)]
dissectors: more SPDX license convertions.

Change-Id: I96e1f1cdbaaf49d65705ecacc903f73cf0e47d7c
Reviewed-on: https://code.wireshark.org/review/26334
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
22 months agoQt: remove leak in simple_statistics_dialog (found by clang).
Dario Lombardo [Thu, 1 Mar 2018 12:35:42 +0000 (13:35 +0100)]
Qt: remove leak in simple_statistics_dialog (found by clang).

Change-Id: Ie1b6d6e8039eeaeb08f2d59c21a88298d55ea797
Reviewed-on: https://code.wireshark.org/review/26145
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Reviewed-by: Roland Knall <rknall@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
22 months agoQt: remove leak from protocol_preferences_menu (found by clang).
Dario Lombardo [Thu, 1 Mar 2018 12:45:55 +0000 (13:45 +0100)]
Qt: remove leak from protocol_preferences_menu (found by clang).

Change-Id: I8ea4f550cbce934335e8d8e7d7c6b5fba7bcacfe
Reviewed-on: https://code.wireshark.org/review/26141
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Roland Knall <rknall@gmail.com>
22 months agospdx: more licenses converted.
Dario Lombardo [Tue, 6 Mar 2018 14:31:02 +0000 (15:31 +0100)]
spdx: more licenses converted.

Change-Id: I3861061ec261e63b23621799e020e811ed78a343
Reviewed-on: https://code.wireshark.org/review/26333
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
22 months agolicensecheck: add BSD licenses.
Dario Lombardo [Wed, 7 Mar 2018 14:39:29 +0000 (15:39 +0100)]
licensecheck: add BSD licenses.

Change-Id: I764d03e4dc6d8925e656f37c98ece3da1fb1f001
Reviewed-on: https://code.wireshark.org/review/26335
Reviewed-by: Anders Broman <a.broman58@gmail.com>
22 months agoMore licenses converted to SPDX.
Dario Lombardo [Tue, 6 Mar 2018 14:31:02 +0000 (15:31 +0100)]
More licenses converted to SPDX.

Change-Id: Id4f987dcdacf06622d70263f4659a4400e30dc39
Reviewed-on: https://code.wireshark.org/review/26332
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
22 months agoQt: rework routine in module_preferences_scroll_area.
Dario Lombardo [Thu, 1 Mar 2018 12:42:09 +0000 (13:42 +0100)]
Qt: rework routine in module_preferences_scroll_area.

This removes a check that confuses clang and generates a false poritive.

Change-Id: Ib28b88b40e16ad300ba6d3df8334bd752a4fa7f1
Reviewed-on: https://code.wireshark.org/review/26171
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Reviewed-by: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Dario Lombardo <lomato@gmail.com>
22 months agobluetooth: Update Assigned Numbers
Stig Bjørlykke [Wed, 7 Mar 2018 07:22:55 +0000 (08:22 +0100)]
bluetooth: Update Assigned Numbers

Update URLs for sources.

Change-Id: Ia70bc657210e867abea1eb25c5feab189c53a230
Reviewed-on: https://code.wireshark.org/review/26324
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
22 months agoQt: Handle UAT editor dialogs explicitly.
Michael Mann [Sat, 16 Sep 2017 21:45:05 +0000 (17:45 -0400)]
Qt: Handle UAT editor dialogs explicitly.

QAbstractItemView assumes that editors are widgets, not windows.
QAbstractItemView::edit calls QAbstractItemViewPrivate::openEditor,
which simply calls show() and setFocus() on the editor widget. If that
widget happens to be a native dialog, its event loop might not be
processed. This is the case on macOS at least.

Create widgets derived from QLineEdit that edit the value directly along
with a button that can open the associated modal dialog. Install event
filters so that we keep the correct tab behavior between fields of the
UAT.

Bug: 13958
Ping-Bug: 14031
Bug: 7761
Change-Id: Ie5f0a5cbde33bb9add8217029c2063a0bbfd804a
Reviewed-on: https://code.wireshark.org/review/23015
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Roland Knall <rknall@gmail.com>
22 months agoFix another leak, which happens with -E occurrence=l.
Guy Harris [Wed, 7 Mar 2018 08:49:28 +0000 (00:49 -0800)]
Fix another leak, which happens with -E occurrence=l.

For each occurrence, if there was already an occurrence in the array, we
were just removing it. not freeing what it pointed to.

While we're at it, expand comments. and always check the array size with
"!= 0", not "> 0" - the value is unsigned, so they're equivalent, but
this makes the code more self-consistent.

Change-Id: I538f46b296a7721a39ba4366c2f6269e7e097b0d
Reviewed-on: https://code.wireshark.org/review/26328
Reviewed-by: Guy Harris <guy@alum.mit.edu>
22 months agoWIP:ieee80211: HotSpot 2.0 fixes.
Richard Sharpe [Tue, 6 Mar 2018 18:27:01 +0000 (10:27 -0800)]
WIP:ieee80211: HotSpot 2.0 fixes.

This bring the IEEE802.11 dissector further into conformance with the
HS2.0 spec.

I have concerns at how complex the handling of
dissect_advertisement_protocol_common has become.

I also have some bugs reported by the WFA to deal with.

Change-Id: I69caca7d568562b752a70e5f73a7fa395364bc23
Reviewed-on: https://code.wireshark.org/review/26279
Petri-Dish: Richard Sharpe <realrichardsharpe@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: ronnie sahlberg <ronniesahlberg@gmail.com>
22 months agoprint: free memory if not used (found by clang).
Dario Lombardo [Wed, 28 Feb 2018 18:04:25 +0000 (19:04 +0100)]
print: free memory if not used (found by clang).

Change-Id: Ib6dc913ab1eeff7b29e18930b66b728080629773
Reviewed-on: https://code.wireshark.org/review/26183
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: ronnie sahlberg <ronniesahlberg@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
22 months agoieee802154: fix 'wpan.tsch.timeslot' exists multiple times with NOT compatible types...
Alexis La Goutte [Wed, 7 Mar 2018 07:25:18 +0000 (08:25 +0100)]
ieee802154: fix 'wpan.tsch.timeslot' exists multiple times with NOT compatible types: FT_UINT16 and FT_NONE

Change-Id: I36ca5c469281f17e3ed9aebe1899648533a9b1a5
Reviewed-on: https://code.wireshark.org/review/26323
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
22 months agonas_5gs: fix duplicate entry
Alexis La Goutte [Wed, 7 Mar 2018 07:21:38 +0000 (08:21 +0100)]
nas_5gs: fix duplicate entry

Field 'Request type' (nas_5gs.mm.req_typ) has a conflicting entry in its value_string: 3 is at indices 2 (Initial emergency request) and 3 (Existing emergency PDU session)

Change-Id: I64c6222033efa64c3f730b2be7e92c731d71d43c
Reviewed-on: https://code.wireshark.org/review/26322
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
22 months agoPlug another leak for Wiretap errors.
Guy Harris [Wed, 7 Mar 2018 07:17:31 +0000 (23:17 -0800)]
Plug another leak for Wiretap errors.

Clean up comments while we're at it.

Change-Id: I7e218ba3f998804045e3d7fab08d85d09a293d69
Reviewed-on: https://code.wireshark.org/review/26320
Reviewed-by: Guy Harris <guy@alum.mit.edu>
22 months agoIEEE 802.15.4: Add expert warning for Payload IE in header
Ed Beroset [Tue, 6 Mar 2018 18:38:39 +0000 (13:38 -0500)]
IEEE 802.15.4: Add expert warning for Payload IE in header

Change-Id: I34f4814ff0a93f9ef149241fd9899b50199955c5
Reviewed-on: https://code.wireshark.org/review/26280
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
22 months agofailure_message.c: fix a memory leak if err is not negative
Pascal Quantin [Tue, 6 Mar 2018 21:56:20 +0000 (22:56 +0100)]
failure_message.c: fix a memory leak if err is not negative

Bug: 14489
Change-Id: I958cfae824c50263913ba9df8128e34e9466cb67
Reviewed-on: https://code.wireshark.org/review/26294
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: ronnie sahlberg <ronniesahlberg@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
22 months agoPCP: allocate conversation info in file scope
Pascal Quantin [Tue, 6 Mar 2018 21:43:31 +0000 (22:43 +0100)]
PCP: allocate conversation info in file scope

Bug: 14488
Change-Id: I9bb85cfd58ace721ba8b957bc3351f6c017a8b69
Reviewed-on: https://code.wireshark.org/review/26293
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
22 months agoH223: fix a memory leak in conversation management
Pascal Quantin [Tue, 6 Mar 2018 21:39:01 +0000 (22:39 +0100)]
H223: fix a memory leak in conversation management

Bug: 14487
Change-Id: I75089ccfa2896b357f775fea67fd6b76500fc5dc
Reviewed-on: https://code.wireshark.org/review/26292
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
22 months agoSMB1/2: Update some FileFS fields with new flags
Ronnie Sahlberg [Tue, 6 Mar 2018 23:50:22 +0000 (09:50 +1000)]
SMB1/2: Update some FileFS fields with new flags

Change-Id: I7fbf874c8f9f7fcbcdecd07b04762688d080b961
Signed-off-by: Ronnie Sahlberg <ronniesahlberg@gmail.com>
Reviewed-on: https://code.wireshark.org/review/26300
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
22 months agomultipart: use packet scope memory to avoid leaking in case an exception is triggered...
Pascal Quantin [Tue, 6 Mar 2018 21:33:49 +0000 (22:33 +0100)]
multipart: use packet scope memory to avoid leaking in case an exception is triggered by subdissectors

Bug: 14486
Change-Id: I275f8c962f126ad55fc7086012e7b67cc0dc60b3
Reviewed-on: https://code.wireshark.org/review/26291
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
22 months agoGIOP: use wmem packet scope for get_modname_from_repoid()
Pascal Quantin [Tue, 6 Mar 2018 21:03:50 +0000 (22:03 +0100)]
GIOP: use wmem packet scope for get_modname_from_repoid()

Bug: 14484
Change-Id: Ie2a4cc179ba25a1e3e50d689e21f003001a301fa
Reviewed-on: https://code.wireshark.org/review/26289
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
22 months agoLAPD: fix some memory leaks in conversation management
Pascal Quantin [Tue, 6 Mar 2018 20:49:41 +0000 (21:49 +0100)]
LAPD: fix some memory leaks in conversation management

Bug: 14482
Change-Id: Ia49705e13f1071a69d61ba1d6bd331e3e7734d81
Reviewed-on: https://code.wireshark.org/review/26287
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
22 months agoSMB2: use file scope to avoid leaking memory
Pascal Quantin [Tue, 6 Mar 2018 22:26:10 +0000 (23:26 +0100)]
SMB2: use file scope to avoid leaking memory

Bug: 14483
Change-Id: I1532fa57cd9a847c0408db95744eb7af3a6f4ee5
Reviewed-on: https://code.wireshark.org/review/26295
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: ronnie sahlberg <ronniesahlberg@gmail.com>
22 months agoAdd additional dissect information in the ZCL Level Control Cluster.
Paul Zander [Tue, 6 Mar 2018 19:32:35 +0000 (20:32 +0100)]
Add additional dissect information in the ZCL Level Control Cluster.

Change-Id: I46f5ee8cc0aff39a01289be5f9cea86640f0a72d
Reviewed-on: https://code.wireshark.org/review/26282
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
22 months agoISUP: plug some memory leaks
Pascal Quantin [Tue, 6 Mar 2018 20:44:54 +0000 (21:44 +0100)]
ISUP: plug some memory leaks

Bug: 14481
Change-Id: I940dc4c7ac197deb1f925418bbcdebb30285a775
Reviewed-on: https://code.wireshark.org/review/26286
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
22 months agooids.c: fix a memory leak in oid_string2subid()
Pascal Quantin [Tue, 6 Mar 2018 21:15:22 +0000 (22:15 +0100)]
oids.c: fix a memory leak in oid_string2subid()

Bug: 14485
Change-Id: Ia0ccd4480808c4f5da228975c7a076cd3f5d332b
Reviewed-on: https://code.wireshark.org/review/26290
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: ronnie sahlberg <ronniesahlberg@gmail.com>
22 months agoEliminate unused structure members and an unused list.
Guy Harris [Wed, 7 Mar 2018 01:08:29 +0000 (17:08 -0800)]
Eliminate unused structure members and an unused list.

We don't use the addresses, and don't use the inbound port.

We also don't need a list of tn5250_conv_info_t's - they're allocated
with wmem, so they get freed when we're done with a file, and they're
attached to conversations, so we don't need a list to find them.

Change-Id: Id3b44fb11cf353d7d15a58938883f2460cf642a0
Reviewed-on: https://code.wireshark.org/review/26301
Reviewed-by: Guy Harris <guy@alum.mit.edu>
22 months agoNSIS, WiX: Handle the presence or absence of mmdbresolve.
Gerald Combs [Tue, 6 Mar 2018 23:29:34 +0000 (15:29 -0800)]
NSIS, WiX: Handle the presence or absence of mmdbresolve.

Only install mmdbresolve if MAXMINDDB_FOUND is true.

Fixup the Qt about box and WiX GTK defines while we're here.

Change-Id: I7ac3c21ddb4aebc1dae1c3d8cfd2bcafc4139d2e
Reviewed-on: https://code.wireshark.org/review/26299
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
22 months agommdbresolve: Process our command line arguments by hand.
Gerald Combs [Tue, 6 Mar 2018 20:37:27 +0000 (12:37 -0800)]
mmdbresolve: Process our command line arguments by hand.

Visual Studio doesn't ship with a getopt implementation, so process our
arguments ourselves. Note that if we add support for more flags we'll
probably want to use GOption.

Change-Id: Ie78204aa64321ca68f3e66195b8c39e47ca410d9
Reviewed-on: https://code.wireshark.org/review/26288
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
22 months agoGet rid of unused information.
Guy Harris [Tue, 6 Mar 2018 23:17:13 +0000 (15:17 -0800)]
Get rid of unused information.

We only need to know the outbound port, so we can determine whether this
is to or from the host.

Fix a comment to reflect reality while we're at it.

Change-Id: If01df5aeb73900850a0de9f9f9731c6fa7f094bb
Reviewed-on: https://code.wireshark.org/review/26298
Reviewed-by: Guy Harris <guy@alum.mit.edu>
22 months agoTN3270: fix memory leaks in conversation management
Pascal Quantin [Tue, 6 Mar 2018 20:41:57 +0000 (21:41 +0100)]
TN3270: fix memory leaks in conversation management

Bug: 14480
Change-Id: I9148bef80492426195a1673f8367a39c02c432ce
Reviewed-on: https://code.wireshark.org/review/26285
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Guy Harris <guy@alum.mit.edu>
22 months agomaxmind_db.c: fix a memory leak
Pascal Quantin [Tue, 6 Mar 2018 20:40:24 +0000 (21:40 +0100)]
maxmind_db.c: fix a memory leak

Change-Id: Ie3484e863363a8d2b9ccb435088886020678d15d
Reviewed-on: https://code.wireshark.org/review/26284
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
22 months agomaxmind_db.c: add an explicit cast to please gcc 7.3.1
Pascal Quantin [Tue, 6 Mar 2018 20:36:22 +0000 (21:36 +0100)]
maxmind_db.c: add an explicit cast to please gcc 7.3.1

Change-Id: Idb2ae052804fb523d6769fe50b5bb4ba45e40f79
Reviewed-on: https://code.wireshark.org/review/26283
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
22 months agoIEEE 802.15.4: individual functions for MHR/PIE/payload processing
Robert Sauter [Sun, 4 Mar 2018 15:31:18 +0000 (16:31 +0100)]
IEEE 802.15.4: individual functions for MHR/PIE/payload processing

- reduce scope of special handling for ZBOSS and 'options'
- move -2015 command byte handling to corresponding function
- fix data handling for unimplemented command types

Rationale: this allows reusing the individual functions for protocols
that are based on IEEE 802.15.4 but require additional transformation
of the payload without adding special cases within the functions.

Change-Id: I5447620f6779031c4f9b280b16de9678b255b06f
Reviewed-on: https://code.wireshark.org/review/26262
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Ed Beroset <beroset@ieee.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
22 months agoDocs: Updates for xsltproc and Asciidoctor.
Gerald Combs [Tue, 6 Mar 2018 16:30:42 +0000 (08:30 -0800)]
Docs: Updates for xsltproc and Asciidoctor.

Change-Id: I3cfe2121beaab0fe09228ec277997d68fe824693
Reviewed-on: https://code.wireshark.org/review/26281
Reviewed-by: Gerald Combs <gerald@wireshark.org>
22 months agoCMake: Fixup our Chocolatey bin path discovery.
Gerald Combs [Tue, 6 Mar 2018 17:34:36 +0000 (09:34 -0800)]
CMake: Fixup our Chocolatey bin path discovery.

Search for choco.exe directly instead of using PATHS + PATH_SUFFIXES.
Look in %ChocolateyInstall%\bin first. CHOCOLATEY_BIN_PATH is the binary
path. There's no need to append /bin to it.

Change-Id: I732db398bd989bf12222a5cee2c79c0bd4161638
Reviewed-on: https://code.wireshark.org/review/26276
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
22 months agoCMake: Remove SH from the packate list.
Gerald Combs [Tue, 6 Mar 2018 18:19:19 +0000 (10:19 -0800)]
CMake: Remove SH from the packate list.

Change-Id: Idafd85df598e0c58fc8252574ce0478b3e1464a9
Reviewed-on: https://code.wireshark.org/review/26278
Reviewed-by: Gerald Combs <gerald@wireshark.org>
22 months agoTransition from GeoIP Legacy to MaxMindDB.
Gerald Combs [Fri, 9 Feb 2018 01:20:26 +0000 (17:20 -0800)]
Transition from GeoIP Legacy to MaxMindDB.

MaxMind is discontinuing its legacy databases in April in favor of
GeoIP2, which use a newer database format (MaxMind DB). The reference C
library (libmaxminddb) is available under the Apache 2.0 license which
isn't quite compatible with ours.

Add mmdbresolve, a utility that reads IPv4 and IPv6 addresses on stdin
and prints resolved information on stdout. Place it under a liberal
license (MIT) so that we can keep libmaxminddb at arm's length. Add
epan/maxmind_db.[ch], which spawns mmdbresolve and communicates with it
via stdio.

Migrate the preferences and documentation to MaxMindDB.

Change the IPv4 and IPv6 asnum fields to FT_UINT32s. Change the
geographic coordinate fields to FT_DOUBLEs.

Bug: 10658
Change-Id: I24aeed637bea1b41d173270bda413af230f4425f
Reviewed-on: https://code.wireshark.org/review/26214
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
22 months agoCMake: Remove FindSH.
Gerald Combs [Tue, 6 Mar 2018 17:59:00 +0000 (09:59 -0800)]
CMake: Remove FindSH.

We haven't used SH_EXECUTABLE since the Asciidoctor migration.

Change-Id: I93e8245ea02ed994ebb62942d5ea4ec890e35a97
Reviewed-on: https://code.wireshark.org/review/26277
Reviewed-by: Gerald Combs <gerald@wireshark.org>
22 months agoipsec: zero memory in get_full_ipv6_addr (found by clang).
Dario Lombardo [Mon, 26 Feb 2018 15:27:09 +0000 (16:27 +0100)]
ipsec: zero memory in get_full_ipv6_addr (found by clang).

Change-Id: I5a1c8cccd40867b70e64c8763a56da6a77c164b2
Reviewed-on: https://code.wireshark.org/review/26116
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Dario Lombardo <lomato@gmail.com>
22 months agodcm: Fixed crash in dissector, and other bugs Some tag descriptions which are added...
david-aggeler [Mon, 5 Mar 2018 10:54:55 +0000 (11:54 +0100)]
dcm: Fixed crash in dissector, and other bugs Some tag descriptions which are added to the parent item (32 tags). If one of those was empty a crash occurred. Mainly the RTPlan modality was affected.

Fixed length decoding for OD, OL, UC, UR Fixed hf_dcm_assoc_item_type to be interpreted as 1 byte
Fixed pdu_type to be interpreted as 1 byte
Fixed decoding of AT type, where value length was wrongly reported in capture as 2 (instead of n*4)
Removed tailing white spaces
Please merge to 2.4 once ok.

Bug: 14415
Change-Id: I7857ef107e7e599c7dd9f8d069daa5b3bfb4122f
Reviewed-on: https://code.wireshark.org/review/26268
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
22 months agoUse the generic function decode_zcl_time_in_100ms instead of the local zcl_fmt_time_t...
Paul Zander [Tue, 6 Mar 2018 11:32:39 +0000 (12:32 +0100)]
Use the generic function decode_zcl_time_in_100ms instead of the local zcl_fmt_time_tenths.

Change-Id: Id79b59c77083e6fb236d4137820182616f5b83c1
Reviewed-on: https://code.wireshark.org/review/26275
Reviewed-by: Dario Lombardo <lomato@gmail.com>
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Dario Lombardo <lomato@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
22 months ago[Diameter] Added extended AVPs for Gx and Rx
Joakim Karlsson [Tue, 6 Mar 2018 08:27:04 +0000 (09:27 +0100)]
[Diameter] Added extended AVPs for Gx and Rx

Change-Id: Ic795a84dfb42868a34707142ce31ec77cd855e44
Reviewed-on: https://code.wireshark.org/review/26273
Reviewed-by: Anders Broman <a.broman58@gmail.com>
22 months ago[Diameter] fixed valid Diameter xml
Joakim Karlsson [Mon, 5 Mar 2018 22:06:25 +0000 (23:06 +0100)]
[Diameter] fixed valid Diameter xml

Change-Id: Iacbbbb359885468e056dee3f8fa401223a38ca3c
Reviewed-on: https://code.wireshark.org/review/26271
Reviewed-by: Anders Broman <a.broman58@gmail.com>
22 months agoVLAN: define a recursion depth limit
Pascal Quantin [Mon, 5 Mar 2018 20:51:11 +0000 (21:51 +0100)]
VLAN: define a recursion depth limit

Altough the dissection consumes 4 bytes each time it is called, it can
trigger a stack overflow for big packets. Let's limmit the number of
allowed VLAN tags for a given packet.

Bug: 14469
Change-Id: Ieb6834ab3350dc7e8c301e6479577855a253897e
Reviewed-on: https://code.wireshark.org/review/26270
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
22 months agoextcap: add g_free to extcap_free_toolbar_value (found by clang).
Dario Lombardo [Tue, 27 Feb 2018 13:52:31 +0000 (14:52 +0100)]
extcap: add g_free to extcap_free_toolbar_value (found by clang).

Change-Id: I81ca1665913f54333fe638208c99c4eef4ed2cc7
Reviewed-on: https://code.wireshark.org/review/26139
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Roland Knall <rknall@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
22 months agowisun: fix, improve, and refactor Wi-SUN IEs
Robert Sauter [Mon, 5 Mar 2018 06:59:08 +0000 (07:59 +0100)]
wisun: fix, improve, and refactor Wi-SUN IEs

Change-Id: I6e67d01c06536da5b41f9cf5b09b5f44393e6956
Reviewed-on: https://code.wireshark.org/review/26266
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
22 months agoAdd missing ZigBee ZCL Scene cluster commands.
Paul Zander [Thu, 1 Mar 2018 06:59:25 +0000 (07:59 +0100)]
Add missing ZigBee ZCL Scene cluster commands.

The following commands are added:
0x40 - Enhanced add scene
0x41 - Enhanced view scene
0x42 - Copy scene

Change-Id: If7f921f7ede7518ecbb88395d6200f600a47bd85
Reviewed-on: https://code.wireshark.org/review/26202
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
22 months agoIEEE 802.15.4: always allocate protocol data if not present
Pascal Quantin [Sun, 4 Mar 2018 21:05:06 +0000 (22:05 +0100)]
IEEE 802.15.4: always allocate protocol data if not present

When using 2 passes, L2TP dissector can set a session info for previous
packets, breaking the assumption that IEEE 802.15.4 dissector will
always be called on first pass.
Let's always allocate the protocol data if missing, even if this is not
the first pass.

Bug: 14468
Change-Id: I4cb7ea2e54c1b763a48b99c0d64f542552789d18
Reviewed-on: https://code.wireshark.org/review/26260
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
22 months agoNBAP: avoid linking a DCH-ID to itself
Pascal Quantin [Sun, 4 Mar 2018 18:01:11 +0000 (19:01 +0100)]
NBAP: avoid linking a DCH-ID to itself

Otherwise it can create an infinite loop, leading to a buffer overflow.
Also add explicit cheks on the buffer usage and set its maximum size to
128 instead of 32 per ASN.1 description.

Bug: 14471
Change-Id: I805f4ce09347bc35143b010b4a558a0d090c0159
Reviewed-on: https://code.wireshark.org/review/26259
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
22 months agowisun: dissect Wi-SUN Netricity IEs
Robert Sauter [Sun, 4 Mar 2018 18:21:30 +0000 (19:21 +0100)]
wisun: dissect Wi-SUN Netricity IEs

Change-Id: Icae32b9934549891fab0683fa055fe16d01fdd90
Reviewed-on: https://code.wireshark.org/review/26258
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
22 months ago6LoWPAN: fix cast-qual warning
Robert Sauter [Sun, 4 Mar 2018 22:10:24 +0000 (23:10 +0100)]
6LoWPAN: fix cast-qual warning

Change-Id: I688c2052b2e242664d31d995583330715ace37cd
Reviewed-on: https://code.wireshark.org/review/26261
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>
22 months agodof: use tvb_memdup instead of g_memdup.
Dario Lombardo [Wed, 28 Feb 2018 12:05:49 +0000 (13:05 +0100)]
dof: use tvb_memdup instead of g_memdup.

Change-Id: I0d1e6a09fa6fcf09c40c6e77b79cc97e0723bff5
Reviewed-on: https://code.wireshark.org/review/26144
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
22 months agodot11decrypt: free memory on exit (found by clang).
Dario Lombardo [Wed, 28 Feb 2018 17:47:48 +0000 (18:47 +0100)]
dot11decrypt: free memory on exit (found by clang).

Change-Id: I1af895accdd52fe64fc156905c549e719aaba304
Reviewed-on: https://code.wireshark.org/review/26182
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
22 months agoRTSP: Fixed missing space in column info between multiple pipelined messages
Jiri Novak [Fri, 2 Mar 2018 13:59:43 +0000 (14:59 +0100)]
RTSP: Fixed missing space in column info between multiple pipelined messages

When there is multiple RTSP messages in one packet, info column shows its headers right next to each other. It is ugly:

Reply: RTSP/1.0 200 OKReply: RTSP/1.0 200 OK

Patch adds ', ' between messages:

Reply: RTSP/1.0 200 OK, Reply: RTSP/1.0 200 OK

Ping-Bug: 14450
Change-Id: I151dbc72b669002ed02d91af43d683c5fc4fe4ba
Reviewed-on: https://code.wireshark.org/review/26222
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
22 months agocoloring rules dialogue: remove unused signal
Martin Kaiser [Sat, 3 Mar 2018 11:52:11 +0000 (12:52 +0100)]
coloring rules dialogue: remove unused signal

View / Coloring Rules...

shows this warning

12:02:26.401     Main Warn QObject::connect: No such signal ColoringRulesModel::dragDropComplete() in ../ui/qt/coloring_rules_dialog.cpp:61
12:02:26.401     Main Warn QObject::connect:  (receiver name: 'ColoringRulesDialog')

Remove the unused signal.

Change-Id: Id42c249ac9252269eb31e4971e62e927a28c88ed
Reviewed-on: https://code.wireshark.org/review/26239
Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Petri Dish Buildbot
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
22 months agoWindows: Remove support for MSVC older than VS2015
Graham Bloice [Sat, 3 Mar 2018 17:55:36 +0000 (17:55 +0000)]
Windows: Remove support for MSVC older than VS2015

Cleanup the support for older versions of Visual Studio

Change-Id: Ieb97d56e9bff6a5902433e8d99b27276bc7034f7
Reviewed-on: https://code.wireshark.org/review/26247
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
22 months agodissectors: epon: Improve preamble detection
Hauke Mehrtens [Sat, 3 Mar 2018 13:00:35 +0000 (14:00 +0100)]
dissectors: epon: Improve preamble detection

The full EPON preamble is 55 55 D5 55, sometimes some bits are getting
lost so this dissector supports multiple parts of this preamble. Add
also the full preamble to detect also such packets correctly.

Change-Id: I6d74694601bf2a430e24f8c9c004f3558aa056c5
Reviewed-on: https://code.wireshark.org/review/26240
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
22 months ago[Automatic update for 2018-03-04]
Gerald Combs [Sun, 4 Mar 2018 08:18:26 +0000 (08:18 +0000)]
[Automatic update for 2018-03-04]

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

Change-Id: I95feebf818e68804d287e011f4c6ee2cd244b2f3
Reviewed-on: https://code.wireshark.org/review/26254
Reviewed-by: Gerald Combs <gerald@wireshark.org>
22 months agoenip: use wmem for copied addresses
Martin Kaiser [Sat, 3 Mar 2018 18:49:22 +0000 (19:49 +0100)]
enip: use wmem for copied addresses

When we copy an address from pinfo into connInfo->O2T.ipaddress, a
shallow copy is not sufficient. connInfo->O2T.ipaddress is kept across
packets whereas pinfo is valid only for the current packet.

Use wmem with file scope for the copied address. This fixes a
use-after-free error when we access the address in a subsequent packet.

Bug: 14470
Change-Id: I8b74037020189485485a506af6510cb45828e3c4
Reviewed-on: https://code.wireshark.org/review/26248
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
22 months agommse: remove a ton of if (tree) checks
Martin Kaiser [Sat, 3 Mar 2018 15:33:40 +0000 (16:33 +0100)]
mmse: remove a ton of if (tree) checks

Keep the "global" check where the entire processing was under if (tree).
Move this check in front of the while loop and exit if we have no tree.

Remove the subsequent (duplicate) checks for indivial
proto_tre_add_...() calls.

Change-Id: I6b978b438b9f1c84c8927ae4eb9c53a8eaadb4ef
Reviewed-on: https://code.wireshark.org/review/26246
Reviewed-by: Anders Broman <a.broman58@gmail.com>
22 months agoclean up tvb_get_guintvar() a bit more
Martin Kaiser [Sat, 3 Mar 2018 15:22:33 +0000 (16:22 +0100)]
clean up tvb_get_guintvar() a bit more

Wrap long lines.

Use a do-while loop. We know up-front that we'll go into the loop at
least once. Remove the cont variable, use the exit condition directly.

Set *octetCount = 0 if we return 0 because of an error. In that case, we
did not process any bytes and should inform the caller about this.

Change-Id: I222270939e42e0096b6f5a25b197bd4bae12235e
Reviewed-on: https://code.wireshark.org/review/26245
Reviewed-by: Anders Broman <a.broman58@gmail.com>
22 months agowap: include stdio.h
Martin Kaiser [Sat, 3 Mar 2018 15:04:46 +0000 (16:04 +0100)]
wap: include stdio.h

Otherwise, fprintf() is not defined and the debug prints don't work.

Change-Id: I9bc791dfc829cf9e7b1b6e61b0090d2fb94bebb2
Reviewed-on: https://code.wireshark.org/review/26244
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
22 months agotvb_get_guintvar: correct a debug print
Martin Kaiser [Sat, 3 Mar 2018 15:02:14 +0000 (16:02 +0100)]
tvb_get_guintvar: correct a debug print

We always start with counter=0, guint *octetCount is used only as a
return value.

Change-Id: I3c080c59ef7620c5007f6dc3139a78a72cff2a21
Reviewed-on: https://code.wireshark.org/review/26243
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
22 months agotvb_get_guintvar: don't overflow our return value
Martin Kaiser [Sat, 3 Mar 2018 14:25:56 +0000 (15:25 +0100)]
tvb_get_guintvar: don't overflow our return value

tvb_get_guintvar() returns a guint. If we haven't seen the final byte
after sizeof(guint) bytes, something is wrong. Abort and return 0.

This is the minimum fix for

Bug: 14473

Change-Id: Ibe8a1239c1cbbeec0591c66710416bb56f9f60dc
Reviewed-on: https://code.wireshark.org/review/26242
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
22 months agoAdd support for new peekremote features.
Nicolas Darchis [Wed, 28 Feb 2018 14:26:03 +0000 (15:26 +0100)]
Add support for new peekremote features.

Enhanced peekremote dissector to take into account the new extended
flags written by Cisco APs in sniffer mode after WLC version 8.5.

Support for 80mhz channel flag (bit 9), short preamble (bit 8), amount
of spatial streams (bit 14-16)
dot11_ht_vht_flags=0x00000551 <--short preamble encoded to 10th bit of
dot11_ht_vht_flags.
dot11_ht_vht_flags=0x00008bc8 <--80MHz info encoded to 9th bit of
dot11_ht_vht_flags.

The spatial streams information is already encoded to 16:15:14 bits of
dot11_ht_vht_flags. The following are the bit pattern representation,
000 - 1 spatial stream
001 - 2 spatial streams
010 - 3 spatial streams

Bug: 14452
Change-Id: If0539e356b32a791901d213a653f7a98521667ee
Reviewed-on: https://code.wireshark.org/review/26178
Reviewed-by: Guy Harris <guy@alum.mit.edu>
22 months agoPDCP: show wrong calculated digest on MAC item, and add some comments about calculation
Martin Mathieson [Sat, 3 Mar 2018 22:31:13 +0000 (22:31 +0000)]
PDCP: show wrong calculated digest on MAC item, and add some comments about calculation

Change-Id: I97445f87abd59761fb14b05dad2df98d2b127f7a
Reviewed-on: https://code.wireshark.org/review/26250
Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
22 months agoPDCP: don't link back security setup to self
Martin Mathieson [Sat, 3 Mar 2018 13:39:18 +0000 (13:39 +0000)]
PDCP: don't link back security setup to self

Change-Id: If74714846463394d99ec34bc36960c872f9726a9
Reviewed-on: https://code.wireshark.org/review/26241
Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
22 months agoWiX: install the other plugin types as well
Jaap Keuter [Wed, 28 Feb 2018 12:36:55 +0000 (13:36 +0100)]
WiX: install the other plugin types as well

The WiX toolset configuration files have to be extended to handle the
new plugin directory structure as well. Apart from the EPAN plugins
the wiretap and codec plugins have to be included as well.

Change-Id: I173e6b87a88e4ef8aa3283a308e2b5207f0d6ba2
Signed-off-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Reviewed-on: https://code.wireshark.org/review/26176
Reviewed-by: Anders Broman <a.broman58@gmail.com>
22 months agoDon't crash in manually_resolve_cleanup() if there's nothing to clean up.
Guy Harris [Sat, 3 Mar 2018 08:07:26 +0000 (00:07 -0800)]
Don't crash in manually_resolve_cleanup() if there's nothing to clean up.

We might not yet have allocated the manually-resolved address lists;
only free the if we have.

Change-Id: Iff9864e397a04cdcb613268603c073ecd1fa77fb
Reviewed-on: https://code.wireshark.org/review/26236
Reviewed-by: Guy Harris <guy@alum.mit.edu>
22 months agoMove what capture_info_close() does into its only caller.
Guy Harris [Sat, 3 Mar 2018 06:55:11 +0000 (22:55 -0800)]
Move what capture_info_close() does into its only caller.

Change-Id: If9539142100fb2079cbbe247d8975778b183ece8
Reviewed-on: https://code.wireshark.org/review/26235
Reviewed-by: Guy Harris <guy@alum.mit.edu>
22 months agoMore indentation cleanups.
Guy Harris [Sat, 3 Mar 2018 06:43:16 +0000 (22:43 -0800)]
More indentation cleanups.

Change-Id: If24cf44a1ba9772d8fe2e026d19e6838cf8e0949
Reviewed-on: https://code.wireshark.org/review/26234
Reviewed-by: Guy Harris <guy@alum.mit.edu>
22 months agoClean up indentation.
Guy Harris [Sat, 3 Mar 2018 06:39:12 +0000 (22:39 -0800)]
Clean up indentation.

Change-Id: Id3d84d33590b12a91f15e7c2d8af350fb630b7b2
Reviewed-on: https://code.wireshark.org/review/26233
Reviewed-by: Guy Harris <guy@alum.mit.edu>
22 months agoFix a warning message.
Guy Harris [Sat, 3 Mar 2018 06:33:23 +0000 (22:33 -0800)]
Fix a warning message.

Change-Id: Ice2ed63bb3785323949c466a67b287fd4f80fd12
Reviewed-on: https://code.wireshark.org/review/26232
Reviewed-by: Guy Harris <guy@alum.mit.edu>
22 months agoRemove declaration of routine that no longer exists.
Guy Harris [Sat, 3 Mar 2018 06:31:11 +0000 (22:31 -0800)]
Remove declaration of routine that no longer exists.

The routine was removed in Id302e88bed4da8b9b457049fb78b0bc7d7ffabe3.

Change-Id: I1874be1cb666d42011cc9b4ab9360dc885d3622c
Reviewed-on: https://code.wireshark.org/review/26231
Reviewed-by: Guy Harris <guy@alum.mit.edu>
22 months agoRemove an ipmap remnant.
Gerald Combs [Fri, 2 Mar 2018 22:43:12 +0000 (14:43 -0800)]
Remove an ipmap remnant.

Change-Id: I391043aa0fdfce132a552e063d850d17bcf5a4de
Reviewed-on: https://code.wireshark.org/review/26230
Reviewed-by: Gerald Combs <gerald@wireshark.org>
22 months agoRemove the endpoint "Map" feature.
Gerald Combs [Fri, 2 Mar 2018 19:24:31 +0000 (11:24 -0800)]
Remove the endpoint "Map" feature.

Remove the endpoint map and its button from the Qt and GTK+ UIs. It
depends on GeoIP Legacy for coordinate information and those databases
are being deprecated in favor of MaxMind DB. We *could* upgrade the code
to use mmdbresolve, but according to
https://dev.maxmind.com/geoip/geoip2/geolite2/ they're also going to
remove coordinate information from GeoLite2:

"In addition, in 2019, latitude and longitude coordinates in the
 GeoLite2 databases will be removed.* Latitude and longitude coordinates
 will continue to be provided in GeoIP2 databases. Please check back for
 updates."

Change-Id: I43e1593d282a0f1aae897b1f4724117d1496b21e
Reviewed-on: https://code.wireshark.org/review/26229
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
22 months agoextcap: Make settings dialog modal
Roland Knall [Fri, 2 Mar 2018 12:48:39 +0000 (13:48 +0100)]
extcap: Make settings dialog modal

Otherwise dialogs could be opened multiple times

Change-Id: I19f9c11395b5f5ba41c00ff78ab9794064562d29
Reviewed-on: https://code.wireshark.org/review/26221
Petri-Dish: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Roland Knall <rknall@gmail.com>
22 months ago[NAS-5GS] Dissect more IEs.
AndersBroman [Fri, 2 Mar 2018 15:00:31 +0000 (16:00 +0100)]
[NAS-5GS] Dissect more IEs.

Change-Id: I67a86383688089f59573f6549e02d5e0027e1b4b
Reviewed-on: https://code.wireshark.org/review/26224
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
22 months agoMore spawned process handling updates.
Gerald Combs [Fri, 2 Mar 2018 17:11:31 +0000 (09:11 -0800)]
More spawned process handling updates.

Document ws_pipe.h. Define invalid PIDs in one place.

Extcap didn't use stdin before 1a0987904f. Make sure we close it.

Change-Id: I7a69cd9b5137ae82435e64628a22e4d812d58f89
Reviewed-on: https://code.wireshark.org/review/26226
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
22 months agoFuzz-test: Handle ABRT.
Gerald Combs [Fri, 2 Mar 2018 17:58:07 +0000 (09:58 -0800)]
Fuzz-test: Handle ABRT.

Trap ABRT and try to pass it on to our runners.

Change-Id: I6e5a9fd63822c9bc84e116b3574abc4ccca448f5
Reviewed-on: https://code.wireshark.org/review/26227
Reviewed-by: Gerald Combs <gerald@wireshark.org>
22 months agoNAS-EPS: added heuristic udp dissector
Mathias Kurth [Fri, 23 Feb 2018 14:31:18 +0000 (15:31 +0100)]
NAS-EPS: added heuristic udp dissector

Change-Id: I5df909ac55be5d00f73bd2403b2c7d4b3d1494ca
Reviewed-on: https://code.wireshark.org/review/26050
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
22 months agoXRA: added upstream channel id, sid and iuc to burstinfo dissect
Bruno Verstuyft [Fri, 2 Mar 2018 09:06:12 +0000 (10:06 +0100)]
XRA: added upstream channel id, sid and iuc to burstinfo dissect

Change-Id: Ib46f5dd7199143847c83a77d19f9dd114ef9005c
Reviewed-on: https://code.wireshark.org/review/26220
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
22 months agoWindows: Update target version info
Graham Bloice [Thu, 1 Mar 2018 23:18:17 +0000 (23:18 +0000)]
Windows: Update target version info

Set the API target level to Win7, along with installer changes
to match.

Change-Id: Icd93964eadf93018c56218e3efdfed10b9f8959a
Reviewed-on: https://code.wireshark.org/review/26218
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
22 months ago[NAS-EPS] Use proto_tree_add_bitmask_list() for some bitfields.
AndersBroman [Thu, 1 Mar 2018 16:00:19 +0000 (17:00 +0100)]
[NAS-EPS] Use proto_tree_add_bitmask_list() for some bitfields.

Change-Id: I0b241a1e553beaf7527948ef067cc1f9356754c8
Reviewed-on: https://code.wireshark.org/review/26210
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
22 months agoOne strstr() call suffices.
Guy Harris [Fri, 2 Mar 2018 08:59:47 +0000 (00:59 -0800)]
One strstr() call suffices.

If we've found "interleaved=" in the buffer *and*, if so, know where
we've found it, we don't need to find it again; we can just use the
result of the first strstr() call.

That should also keep Visual Studio Code Analyzer from bogusly saying
"hey, we might not have found it, maybe we're handing a bad pointer to
sscanf()".

Change-Id: I9d8f5c0b38038a3f05b8e5343f965f1676105875
Reviewed-on: https://code.wireshark.org/review/26219
Reviewed-by: Guy Harris <guy@alum.mit.edu>
22 months agoquic: Make sure that we still build when certain libraries not found.
Richard Sharpe [Thu, 1 Mar 2018 16:42:14 +0000 (08:42 -0800)]
quic: Make sure that we still build when certain libraries not found.

This adds some _U_ to prevent build failures when the build platform
does not have certain libraries or more recent versions of those libraries.

Change-Id: I82a1c14dd250181af189bd8564afc47180385e60
Reviewed-on: https://code.wireshark.org/review/26211
Petri-Dish: Richard Sharpe <realrichardsharpe@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
22 months agoRLC: Fix duplication check after sqn reset
Lutz Kresge [Thu, 1 Mar 2018 14:25:40 +0000 (16:25 +0200)]
RLC: Fix duplication check after sqn reset

When rlc sequence number wrapped around, duplicate frames wouldn't be
marked because they were compared to the sqn from the first round.
Change-Id: Ia57aac9b86b4cc84dd8ec411fe0a94972acb9526
Reviewed-on: https://code.wireshark.org/review/26208
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
22 months agoBluetooth: Initialize ett features for Media Player Dissection
Ajay Panicker [Fri, 2 Mar 2018 02:18:18 +0000 (18:18 -0800)]
Bluetooth: Initialize ett features for Media Player Dissection

The ett_btavrcp_features and ett_btavrcp_featuers_not_used fields were
not initialzed causing an abort when dissecting.

Change-Id: I3ee2f557ace1643dfba5a978add66c3c7ba7d895
Reviewed-on: https://code.wireshark.org/review/26217
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
22 months agoPDCP: speed up dissection of status PDU.
Martin Mathieson [Thu, 1 Mar 2018 01:10:45 +0000 (01:10 +0000)]
PDCP: speed up dissection of status PDU.

N.B. In normal traffic status PDUs do not appear very often, but if
the config of RLC/PDCP are wrong, every PDU can appear to be a status
PDU and it can take a long time to print out the list of missing
sequence numbers.

Change-Id: I9514b505639fa58d86bf5ebb3fb2bcf1f8e65aa8
Reviewed-on: https://code.wireshark.org/review/26197
Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
22 months agoGeneralize our process spawning code.
Gerald Combs [Thu, 1 Mar 2018 23:31:45 +0000 (15:31 -0800)]
Generalize our process spawning code.

Move the contents of extcap_spawn to ws_pipe. Rename various extcap_*
prefixes to ws_pipe_*. Open stdin when we spawn processes.

Change-Id: I9286295443ee955bb6328b0ed6f945ee0bb2a798
Reviewed-on: https://code.wireshark.org/review/26216
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
22 months agoWindows: Remove cruft for unsupported versons
Graham Bloice [Thu, 1 Mar 2018 00:01:45 +0000 (00:01 +0000)]
Windows: Remove cruft for unsupported versons

Remove all the existing LoadDLL\GetProcAddress combinations
that allowed conditional Win32 API usage if supported on the
running OS version.

All the required functions are present in the versions we support.

Change-Id: Ibc43e51cefcd1c7562d4e251784362509f224ed6
Reviewed-on: https://code.wireshark.org/review/26215
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
22 months agoFix compilation without pcap.
Dario Lombardo [Thu, 1 Mar 2018 17:19:57 +0000 (18:19 +0100)]
Fix compilation without pcap.

Change-Id: Id9f6b9189c7663062ecc569a33ca2c30c4c86760
Reviewed-on: https://code.wireshark.org/review/26213
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>
22 months ago[NAS-5GS] Dissect more IEs.
AndersBroman [Thu, 1 Mar 2018 13:15:30 +0000 (14:15 +0100)]
[NAS-5GS] Dissect more IEs.

Change-Id: Ief8d55bbee921e701c3374ce4073ae4587177989
Reviewed-on: https://code.wireshark.org/review/26209
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
22 months agoieee80211: Fix some issues with VHT/HE NDP Announcements.
Richard Sharpe [Thu, 1 Mar 2018 03:20:23 +0000 (19:20 -0800)]
ieee80211: Fix some issues with VHT/HE NDP Announcements.

George Baltatanu noticed some issues, including subtrees in the wrong
place, some spelling errors, bit display order, etc.

Change-Id: I7e30e0e27e302bdd2b870a2bb01e7926336b413e
Reviewed-on: https://code.wireshark.org/review/26188
Petri-Dish: Richard Sharpe <realrichardsharpe@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Richard Sharpe <realrichardsharpe@gmail.com>
22 months agogitlab-ci: add clang 7 builds.
Dario Lombardo [Mon, 26 Feb 2018 21:27:57 +0000 (16:27 -0500)]
gitlab-ci: add clang 7 builds.

Compile nopcap with clang 7 instead of 6.

Change-Id: Icc3ffc895e2b97feadca719b45ef72a5d79098cd
Reviewed-on: https://code.wireshark.org/review/26207
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Dario Lombardo <lomato@gmail.com>
22 months agoNAS-5GS: fix PD values for 5GS SM and 5GS MM
Pavel Strnad [Thu, 1 Mar 2018 09:00:45 +0000 (10:00 +0100)]
NAS-5GS: fix PD values for 5GS SM and 5GS MM

   -based on agreed cr https://portal.3gpp.org/ngppapp/CreateTdoc.aspx?mode=view&contributionUid=C1-180442

Change-Id: I1c382cee9bb2120d1df1db0f6436e5f139803a43
Reviewed-on: https://code.wireshark.org/review/26206
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
22 months agoZigBee TP2 buffer test request malformed packet
Dana Sy [Thu, 1 Mar 2018 00:37:37 +0000 (16:37 -0800)]
ZigBee TP2 buffer test request malformed packet

Test profile 2 buffer test request is trying to parse "octet sequence"
which is not part of the command frame for the buffer test request.

Change-Id: I9f35aacbb3c70b5daed07a0ea29b1bec1cf7741a
Reviewed-on: https://code.wireshark.org/review/26196
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>