metze/wireshark/wip.git
5 years agoE1AP: upgrade dissector to v15.2.0
Pascal Quantin [Wed, 9 Jan 2019 19:36:02 +0000 (20:36 +0100)]
E1AP: upgrade dissector to v15.2.0

Change-Id: Ieafe6558e54a04ce7004c4005f646cea88ac9e5d
Reviewed-on: https://code.wireshark.org/review/31469
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
5 years agoNGAP: use extended value_string for CauseRadioNetwork
Pascal Quantin [Wed, 9 Jan 2019 19:39:28 +0000 (20:39 +0100)]
NGAP: use extended value_string for CauseRadioNetwork

Change-Id: Ie32c8c63e26a31c1fd76cf8f1e7d6ef9103c5960
Reviewed-on: https://code.wireshark.org/review/31470
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
5 years agoNGAP: upgrade dissector to v15.2.0
Pascal Quantin [Wed, 9 Jan 2019 11:40:01 +0000 (12:40 +0100)]
NGAP: upgrade dissector to v15.2.0

Change-Id: Id050878d8d18fda321304ce5dd2d7842e66cfa93
Reviewed-on: https://code.wireshark.org/review/31463
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
5 years agozbee: zbee_zdp.profile wrong data type
Dana Sy [Tue, 8 Jan 2019 19:56:56 +0000 (11:56 -0800)]
zbee: zbee_zdp.profile wrong data type

Fixed the data type for zbee_zdp.profile to use the proper data type
of UINT16.

Change-Id: I20bac57ec3a0a7261aeb65333d9dd4b5bdb4a85c
Reviewed-on: https://code.wireshark.org/review/31458
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agordp: add parsing MONITOR_DEF fields [1]
Mariusz Zaborski [Sat, 5 Jan 2019 19:19:29 +0000 (20:19 +0100)]
rdp: add parsing MONITOR_DEF fields [1]

[1] https://msdn.microsoft.com/en-us/library/dd342324.aspx

Change-Id: I671ebdd5900a0cd409159388e2f72e6e5fbfd6a2
Reviewed-on: https://code.wireshark.org/review/31390
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agodissectors: j1939: Use raw id to filter packets
Maksim Salau [Tue, 8 Jan 2019 17:35:00 +0000 (20:35 +0300)]
dissectors: j1939: Use raw id to filter packets

Using raw CAN id allows us to drop error frames and frames with
standard ids since J1939 work only with extended ids.
Also if allows us to not to decode payload of RTR frames.

Change-Id: I06cec52176be79028f9ac5bce2017907c06aacfb
Reviewed-on: https://code.wireshark.org/review/31449
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agoAdd validate-clang-check script for Petri Dish
Alexis La Goutte [Fri, 2 Nov 2018 10:31:12 +0000 (10:31 +0000)]
Add validate-clang-check script for Petri Dish

Launch clang-check -analyze for each file...

Change-Id: Ic4132d563ccaa5d375f27d08366ba6fc052f095c
Reviewed-on: https://code.wireshark.org/review/30482
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
5 years agodissectors: socketcan: Pass raw ids to dissectors
Maksim Salau [Tue, 8 Jan 2019 16:49:26 +0000 (19:49 +0300)]
dissectors: socketcan: Pass raw ids to dissectors

In the current implementation only masked id is provided to
subdissectors, which doesn't allow to filter packets effectively.
E.g.: J1939 should dissect only extended frames. Without EFF flag, the
subdissector is unable to filter out frames with 11-bit ids.
Also J1939 tries to dissect pyaload of RTR of ERR frames, which obviously
doesn't make sense.

The change exports raw id alongside the masked one for backwards
compatibility. Once all the CAN dissectors are updated to use the raw
variant (if necessary) the masked variant may be dropped.

Change-Id: I52df5673ecfd53d2e65790c4187ea129e67a88e9
Reviewed-on: https://code.wireshark.org/review/31448
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agoQt: Cleanup deletion of CopyFromProfileMenu
Stig Bjørlykke [Tue, 8 Jan 2019 16:48:21 +0000 (17:48 +0100)]
Qt: Cleanup deletion of CopyFromProfileMenu

Set the push button as parent to the profile list menu so it will
be deleted when that parent is destroyed.

Change-Id: Ide4a234e039a3e27d9ee4732a3800906c80be173
Reviewed-on: https://code.wireshark.org/review/31446
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agovalgrind-wireshark: default to looking in run/ for our binaries.
Jeff Morriss [Tue, 8 Jan 2019 20:24:11 +0000 (15:24 -0500)]
valgrind-wireshark: default to looking in run/ for our binaries.

If33a39c26714ebe699463d1c8c67469025767efb made this change for the other
scripts.

Change-Id: I158c1c2d0b564a115443e96a6d90733c2ffff071
Reviewed-on: https://code.wireshark.org/review/31459
Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agoCMake: remove LocatePythonExecutable.cmake for Windows
Peter Wu [Tue, 8 Jan 2019 18:24:38 +0000 (19:24 +0100)]
CMake: remove LocatePythonExecutable.cmake for Windows

Cygwin is now unsupported, so remove special handling for it and rely on
FindPythonInterp.cmake to locate an appropriate version.

This patch can only cause issues if the PATH environment variable
contains the Cygwin binary directory without any native Python version
appearing before that. In that case, either remove Cygwin from PATH or
add the native Python (e.g. C:\Python37) earlier in PATH.

Change-Id: Ia5554e5a83d06a941dacf4a28d41d84fca4fe99d
Reviewed-on: https://code.wireshark.org/review/31453
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
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>
5 years agoCMake,WSDG: Remove Cygwin support
Peter Wu [Tue, 8 Jan 2019 18:12:43 +0000 (19:12 +0100)]
CMake,WSDG: Remove Cygwin support

Declare Cygwin as unsupported and remove all supporting code. Simplify
some Chocolatey notes in the WSDG.

Remove FindPerl.cmake as it only existed to force use of Wireshark's
bundled FindCygwin.cmake (bug 13922). FindXSLTPROC.cmake special
handling for Cygwin was also removed, in theory this could cause issues
when the PATH contains a Cygwin xsltproc, but it's unsupported anyway.

Change-Id: Iabfac2b4a9fd930530505d27bdba618bdb8f7f34
Reviewed-on: https://code.wireshark.org/review/31452
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agodissectors: socketcan: Fix indentation
Maksim Salau [Tue, 8 Jan 2019 16:43:28 +0000 (19:43 +0300)]
dissectors: socketcan: Fix indentation

Change-Id: I4b9023a812e7f24a8980abe871f7fa28f60cefec
Reviewed-on: https://code.wireshark.org/review/31447
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
5 years agoQt: Fix copy ASCII characters from ByteView
Stig Bjørlykke [Tue, 8 Jan 2019 09:48:07 +0000 (10:48 +0100)]
Qt: Fix copy ASCII characters from ByteView

Only copy ASCII characters when doing "Copy Bytes as Hex + ASCII Dump"
from the ByteView. This is what we do in all other Hex Dumps.

Also change the parameter name to reflect this.

Change-Id: I63cc79ffa014fd9aa50c84d765ee168f0b1ea44a
Reviewed-on: https://code.wireshark.org/review/31442
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
5 years agomas5gs: Fix dissection of QoS flow descriptions and QoS rules.
Anders Broman [Tue, 8 Jan 2019 13:37:59 +0000 (14:37 +0100)]
mas5gs: Fix dissection of QoS flow descriptions and QoS rules.

Change-Id: Ie4b9fcf0afdea19ba6f2fb531e84096ac103c99b
Reviewed-on: https://code.wireshark.org/review/31443
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agoS1AP: upgrade dissector to v15.4.0
Pascal Quantin [Tue, 8 Jan 2019 14:07:32 +0000 (15:07 +0100)]
S1AP: upgrade dissector to v15.4.0

Change-Id: Iecf02ce3858cd2cea12bc73e402ace0c558d8abc
Reviewed-on: https://code.wireshark.org/review/31444
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
5 years agoQt: Pluralize "Export TLS Session Keys (%Ln key(s))"
Stig Bjørlykke [Mon, 7 Jan 2019 08:19:29 +0000 (09:19 +0100)]
Qt: Pluralize "Export TLS Session Keys (%Ln key(s))"

Properly pluralize "Export TLS Session Keys (%Ln key(s))" in the
window caption.

Change-Id: Ida7d725a2b8daa356cb44aec4d4475151916a425
Reviewed-on: https://code.wireshark.org/review/31432
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
5 years agoQt: Add syntax line edit feedback symbols.
Gerald Combs [Wed, 5 Dec 2018 23:37:27 +0000 (15:37 -0800)]
Qt: Add syntax line edit feedback symbols.

Draw a circle+backslash or a warning triangle in the far right of the
line edit entry for invalid and deprecated filters respectively. This
should provide an additional clue for color blind users.

Bug: 15326
Change-Id: I55a1e214834a340ccda3bfe8880bba12c5e274e9
Reviewed-on: https://code.wireshark.org/review/30936
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>
5 years agoCIP Safety: Correct Safety Configuration ID
Dylan Ulis [Tue, 8 Jan 2019 01:52:23 +0000 (20:52 -0500)]
CIP Safety: Correct Safety Configuration ID

This was previously being parsed as a UNID, which is not correct.

Change-Id: I2f9fc17debf3ce60d35d71a28bd1d19f54a1b982
Reviewed-on: https://code.wireshark.org/review/31441
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agoNTP: don't increment offsets that aren't used again.
Jeff Morriss [Mon, 7 Jan 2019 21:27:35 +0000 (16:27 -0500)]
NTP: don't increment offsets that aren't used again.

This avoids warnings from Clang.  Rewriting this to use the cursor API might
be interesting.

Change-Id: I8a5459ffbee8d0907757e99eff273d7eff6d1735
Reviewed-on: https://code.wireshark.org/review/31436
Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agotravis: do not run pip as root
Peter Wu [Mon, 7 Jan 2019 17:21:33 +0000 (18:21 +0100)]
travis: do not run pip as root

Both Ubuntu and macOS seems happy without it, removing sudo allows it to
be executed on Windows as well.

Change-Id: I9daece79d3bc5c97078ba27834de42228f7c3dc9
Reviewed-on: https://code.wireshark.org/review/31434
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agoQt: Clarify Remove action from the welcome page
Stig Bjørlykke [Mon, 7 Jan 2019 13:21:45 +0000 (14:21 +0100)]
Qt: Clarify Remove action from the welcome page

Rename the Remove action in the welcome page to "Remove from list" to
indicate that the file is only removed from the list, not from disk.

Change-Id: I4a47c9852203596cc601bf254a4bcfc700ccd025
Reviewed-on: https://code.wireshark.org/review/31433
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
5 years agoieee1609dot2: remove unused handoff function
Alexis La Goutte [Sun, 6 Jan 2019 19:48:02 +0000 (20:48 +0100)]
ieee1609dot2: remove unused handoff function

Change-Id: I9c3a6098e2a54d281228689cdbbbbf78604b2750
Reviewed-on: https://code.wireshark.org/review/31422
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
5 years agocesoeth: declare register and handoff function
Alexis La Goutte [Sun, 6 Jan 2019 15:17:04 +0000 (16:17 +0100)]
cesoeth: declare register and handoff function

for avoid -Wmissing-prototypes warning

Change-Id: I92edf8d62c3685033c4424f9af16d4094c6599d6
Reviewed-on: https://code.wireshark.org/review/31421
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
5 years agows_pipe(.h): fix issue on doxygen documentation
Alexis La Goutte [Sun, 6 Jan 2019 19:50:43 +0000 (20:50 +0100)]
ws_pipe(.h): fix issue on doxygen documentation

parameter 'argv' not found in the function declaration [-Wdocumentation]

Change-Id: I68262a23e3a6f4b50d8b5e666b92f055feeaf74f
Reviewed-on: https://code.wireshark.org/review/31424
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
5 years agoepan: Add a boundary check to get_t61_string.
Gerald Combs [Mon, 7 Jan 2019 22:41:29 +0000 (14:41 -0800)]
epan: Add a boundary check to get_t61_string.

Add a boundary check to make sure we don't go past the end of "ptr".

Bug: 15373
Change-Id: I85394e8e6e477b47919362af146051cc8911254b
Reviewed-on: https://code.wireshark.org/review/31437
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
5 years agostr_util(.h): fix issue on doxygen documentation
Alexis La Goutte [Sun, 6 Jan 2019 19:49:32 +0000 (20:49 +0100)]
str_util(.h): fix issue on doxygen documentation

parameter 'string' not found in the function declaration [-Wdocumentation]

Change-Id: I8c6fe47e708411e329954a682ea4da10aad348f6
Reviewed-on: https://code.wireshark.org/review/31423
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
5 years agof5ethtrailer: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
Alexis La Goutte [Sun, 6 Jan 2019 14:42:35 +0000 (14:42 +0000)]
f5ethtrailer: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang

Change-Id: Ie8f1a4a4a11370ff5d5d85f8110aec568f88877e
Reviewed-on: https://code.wireshark.org/review/31410
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
5 years agosharkd: use json_dumper for output.
Dario Lombardo [Wed, 12 Dec 2018 14:33:44 +0000 (15:33 +0100)]
sharkd: use json_dumper for output.

Change-Id: I457613ea154a86098f536b57844ad6606c595a46
Reviewed-on: https://code.wireshark.org/review/31035
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Dario Lombardo <lomato@gmail.com>
5 years agoMinor bugfix of ASTERIX I023
Atli Guðmundsson [Sun, 6 Jan 2019 23:46:04 +0000 (23:46 +0000)]
Minor bugfix of ASTERIX I023

I023 bugfixes
- Fixed I023 Capitalisation inconsistencies

Change-Id: I39eccd0b7c3a68a8b74d68cf16b988bacce92924
Reviewed-on: https://code.wireshark.org/review/31429
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agoCIP: Correct DATE_AND_TIME parsing
Dylan Ulis [Mon, 7 Jan 2019 00:31:31 +0000 (19:31 -0500)]
CIP: Correct DATE_AND_TIME parsing

DATE_AND_TIME struct is actually time then date. We were previously
parsing it as date then time.

Change-Id: I7367b5502318de32b7c9e7fd170ae58de4c3347f
Reviewed-on: https://code.wireshark.org/review/31431
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agodfilter: remove legacy comment.
Dario Lombardo [Sun, 6 Jan 2019 20:48:06 +0000 (21:48 +0100)]
dfilter: remove legacy comment.

Change-Id: Iec4ea07e86907e9c52b2b58a3e7d8f4a75e747ef
Reviewed-on: https://code.wireshark.org/review/31426
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agoFix whitespace.
Guy Harris [Sun, 6 Jan 2019 19:44:13 +0000 (11:44 -0800)]
Fix whitespace.

Change-Id: I87e441d3a00c00d4ec7dff5717899408a8e7ab3a
Reviewed-on: https://code.wireshark.org/review/31420
Reviewed-by: Guy Harris <guy@alum.mit.edu>
5 years agoRequire that dissect_atm_pw_oam_cell() be called with a non-null data pointer.
Guy Harris [Sun, 6 Jan 2019 19:42:56 +0000 (11:42 -0800)]
Require that dissect_atm_pw_oam_cell() be called with a non-null data pointer.

The only place where it's currently called passes it data.

Do a DISSECTOR_ASSERT() check to make sure it's non-null.

Remove null-pointer checks that this renders no longer necessary.

Change-Id: I2fc86f9591a7126d328029379ecfe98400dd01cb
Reviewed-on: https://code.wireshark.org/review/31419
Reviewed-by: Guy Harris <guy@alum.mit.edu>
5 years agocdma2k: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
Alexis La Goutte [Sun, 6 Jan 2019 14:40:51 +0000 (14:40 +0000)]
cdma2k: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang

Change-Id: Ied58cd7f969121aa51579fdd0919fdfe33e552e3
Reviewed-on: https://code.wireshark.org/review/31409
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agonettrace_3gpp_32_423: Fix Dead Store (Dead assignement/Dead increment) Warning found...
Alexis La Goutte [Sun, 6 Jan 2019 14:47:06 +0000 (14:47 +0000)]
nettrace_3gpp_32_423: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang

Change-Id: I9f59b5ae6fe34d124b6930fa759c7c76c38aa213
Reviewed-on: https://code.wireshark.org/review/31412
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agoNo need to check whether atm_info is null in that code path.
Guy Harris [Sun, 6 Jan 2019 19:05:54 +0000 (11:05 -0800)]
No need to check whether atm_info is null in that code path.

All exported (via dissector tables and dissector handles) routines that
call dissect_atm_common() first do DISSECTOR_ASSERT(atm_info != NULL),
so dissect_atm_common() will never be called iwth a null data pointer.
dissect_reassembled_pdu() is called only from dissect_atm_common(), so
it also won't ever be called with a non-null data pointer.

Fixes Coverity CID 1442299.

Change-Id: I3b455ac546a6a0cd6aa8ef184c71fda2ca2a0710
Reviewed-on: https://code.wireshark.org/review/31418
Reviewed-by: Guy Harris <guy@alum.mit.edu>
5 years agopgsql: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
Alexis La Goutte [Sun, 6 Jan 2019 14:47:56 +0000 (14:47 +0000)]
pgsql: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang

Change-Id: Iddbc5257108c7e77eff5e43f0421a688709680f3
Reviewed-on: https://code.wireshark.org/review/31413
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
5 years agoISIS(-lsp): Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
Alexis La Goutte [Sun, 6 Jan 2019 15:02:30 +0000 (15:02 +0000)]
ISIS(-lsp): Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang

Change-Id: Ic9851860e4b6e2f55efa5de6553c71ed84012c55
Reviewed-on: https://code.wireshark.org/review/31415
Reviewed-by: Taisuke Sasaki <taisasak@cisco.com>
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
5 years agoH2Operations: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
Alexis La Goutte [Sun, 6 Jan 2019 14:34:13 +0000 (14:34 +0000)]
H2Operations: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang

Change-Id: I9913b9653fedeb9cc119f10632f4c96fe54027b4
Reviewed-on: https://code.wireshark.org/review/31408
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
5 years agofpp: fix this condition has identical branches [-Wduplicated-branches]
Alexis La Goutte [Tue, 1 Jan 2019 17:54:43 +0000 (17:54 +0000)]
fpp: fix this condition has identical branches [-Wduplicated-branches]

Change-Id: I09e9a2ee8a89e4784057eb50e47022a7d1e74943
Reviewed-on: https://code.wireshark.org/review/31291
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
5 years agosmpp: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
Alexis La Goutte [Sun, 6 Jan 2019 14:48:47 +0000 (14:48 +0000)]
smpp: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang

Change-Id: Ifbe72c48ec401582d2df30b440e449398c71eb40
Reviewed-on: https://code.wireshark.org/review/31414
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
5 years agoNAS 5Gs: PDU session establishment reject msg fix
Swapnil Roy [Sat, 5 Jan 2019 06:04:15 +0000 (11:34 +0530)]
NAS 5Gs: PDU session establishment reject msg fix

Change-Id: Ic9774cc09ab5c7582dc85bf41e4021bddfca1ebe
Reviewed-on: https://code.wireshark.org/review/31382
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
5 years agoUpdates and bugfixes of ASTERIX I048
Atli Guðmundsson [Wed, 2 Jan 2019 20:57:57 +0000 (20:57 +0000)]
Updates and bugfixes of ASTERIX I048

I048 v1.23 updates (now the default)
- Added I048/020.ERR
- Updated I048/170.CDM value meaning
I048 v1.21 updates
- Added I048/020.XPP
- Updated I048/030.WE with new value codes (19-23)
I048 updates
- Added I048/RE.MD5, Mode 5 Reports
- Added I048/RE.M5N, Mode 5 Reports, New Format
- Added I048/RE.M4E, Extended Mode 4 Report
- Added I048/RE.RPC, Radar Plot Characteristics
- Added I048/RE.ERR, Extended Range Report
I048 bugfixes
- Fixed I048 Capitalisation and spelling inconsistencies
- Fixed I048/030, now displays up to 10 Warning/Error codes
- Fixed I048/100, fixed order and invalid masks of all sub-fields
- Fixed I048/120#0.CAL, incorrect type, missing mask
- Fixed I048/120#1.DOP, incorrect type
- Fixed I048/120#1.AMB, incorrect type
- Fixed I048/120#1.FRQ, incorrect type
- Fixed I048/260.ACAS, not displaying anything, incorrect type

Change-Id: I5d742fded258e3831392cb6f1e1d9d3eafd6e938
Reviewed-on: https://code.wireshark.org/review/31379
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agoUnit tests for ASTERIX I034
Atli Guðmundsson [Sun, 6 Jan 2019 04:29:17 +0000 (04:29 +0000)]
Unit tests for ASTERIX I034

Change-Id: I7a063fdbc08a79c0358857d1e38ded41ae122b23
Reviewed-on: https://code.wireshark.org/review/31399
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agoBugfixes of ASTERIX I034
Atli Guðmundsson [Sun, 6 Jan 2019 04:15:57 +0000 (04:15 +0000)]
Bugfixes of ASTERIX I034

I034 bugfixes
- Fixed I034 Capitalisation inconsistencies
- Fixed I034/041.ARS, incorrect name
- Fixed I034/060#2.RED-RAD, incorrect name
- Fixed I034/060#2.STC, incorrect mask
- Fixes I034/060#3.RED-RAD, incorrect name
- Fixes I034/060#4.RED-RAD, incorrect name
- Fixed I034/110.TYP, incorrect name

Change-Id: I9a78a08ecfd34044030e36c9050fd7b848b80051
Reviewed-on: https://code.wireshark.org/review/31398
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years ago[Automatic update for 2019-01-06]
Gerald Combs [Sun, 6 Jan 2019 08:26:28 +0000 (08:26 +0000)]
[Automatic update for 2019-01-06]

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

Change-Id: I0e282baebc0cda0e54e49eff60827eec02f6f797
Reviewed-on: https://code.wireshark.org/review/31402
Reviewed-by: Gerald Combs <gerald@wireshark.org>
5 years agoFix typo.
Guy Harris [Sun, 6 Jan 2019 07:15:00 +0000 (23:15 -0800)]
Fix typo.

Change-Id: I03291922ddef34ab1408684df650dbac191a2020
Reviewed-on: https://code.wireshark.org/review/31401
Reviewed-by: Guy Harris <guy@alum.mit.edu>
5 years agoFix link, don't put it separately from the introductory words.
Guy Harris [Sun, 6 Jan 2019 07:09:52 +0000 (23:09 -0800)]
Fix link, don't put it separately from the introductory words.

Change-Id: If144fb08d27886ae1bf3610c2157c8a25d1de75e
Reviewed-on: https://code.wireshark.org/review/31400
Reviewed-by: Guy Harris <guy@alum.mit.edu>
5 years agoReplace ancient notes about modifying libpcap with a link to a newer doc.
Guy Harris [Sun, 6 Jan 2019 03:06:10 +0000 (19:06 -0800)]
Replace ancient notes about modifying libpcap with a link to a newer doc.

Instead of giving horribly out-of-date instructions on how to add a new
module to libpcap, just point to the document that I started whipping up
earlier today (it definitely needs work - it's incomplete - but I'll be
getting back to it).

While we're at it, update the notes on adding support for new LINKTYPE_
values to libwiretap, and note that it's only necessary if you had to
add a new DLT_ *and* there isn't already a WTAP_ENCAP_ value that would
correspond to that DLT_.

Change-Id: I3882d0a57b29e98f73c074317bc6df7458fcc677
Reviewed-on: https://code.wireshark.org/review/31397
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>
5 years agoAdd a coloring rule for system events.
Gerald Combs [Fri, 4 Jan 2019 17:08:37 +0000 (09:08 -0800)]
Add a coloring rule for system events.

Add a coloring rule for sdjournal and sysdig events.

Change-Id: I92f0bea238a9f0242d4790c58867144f0e256097
Reviewed-on: https://code.wireshark.org/review/31369
Reviewed-by: Michael Mann <mmann78@netscape.net>
5 years agodoc: remove wrong trailing slash.
Dario Lombardo [Sat, 5 Jan 2019 22:22:50 +0000 (23:22 +0100)]
doc: remove wrong trailing slash.

Change-Id: If6bcf2ce9754453cfff434dde67b682761b37231
Reviewed-on: https://code.wireshark.org/review/31394
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>
5 years ago ATM: add new dissector table
Andrii Vladyka [Sat, 5 Jan 2019 18:26:01 +0000 (10:26 -0800)]
 ATM: add new dissector table

 The new table takes unit ((VPI << 16) | VCI) to allow ATM cell payload dissection depending on VPI+VCI combination

Change-Id: I8f958f904749363cafe0046424c3c2bf6a1a5c96
Reviewed-on: https://code.wireshark.org/review/31381
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>
5 years agoRemove comment whose meaning is unclear at best.
Guy Harris [Sat, 5 Jan 2019 21:35:08 +0000 (13:35 -0800)]
Remove comment whose meaning is unclear at best.

What is is it saying we shouldn't be doing?

Change-Id: Iad26687f3f3f482af09760255fef7189ed71a3ae
Reviewed-on: https://code.wireshark.org/review/31391
Reviewed-by: Guy Harris <guy@alum.mit.edu>
5 years agotravis: remove asciidoctor
Peter Wu [Sat, 5 Jan 2019 11:41:55 +0000 (12:41 +0100)]
travis: remove asciidoctor

It is already installed in debian-setup.sh. brew setup does not install
it, but as no documentation is built it should not matter.

Change-Id: I0cfa343d1c837ebba3b020a6586fb4dd0ae57f9b
Reviewed-on: https://code.wireshark.org/review/31387
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agotravis: remove obsolete sudo key
Peter Wu [Sat, 5 Jan 2019 11:29:46 +0000 (12:29 +0100)]
travis: remove obsolete sudo key

Container-based builds have been removed, sudo is always available now:
https://blog.travis-ci.com/2018-11-19-required-linux-infrastructure-migration

Change-Id: Id7cbcf0e406f4c7199f5fd7a3848023e78249a92
Reviewed-on: https://code.wireshark.org/review/31386
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agoNTP: Adding missing commands of ntpdc mode 7
Uli Heilmeier [Sat, 5 Jan 2019 07:48:00 +0000 (08:48 +0100)]
NTP: Adding missing commands of ntpdc mode 7

Used documentation of bug report.

Bug: 15272
Change-Id: I83871b7458c36df711502bc6aa954a8c3c53604d
Reviewed-on: https://code.wireshark.org/review/31385
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agordp: Parse the CS_MONITOR flags.
Mariusz Zaborski [Sat, 5 Jan 2019 19:17:14 +0000 (20:17 +0100)]
rdp: Parse the CS_MONITOR flags.

The CS_MONITOR package have also a flags fields wich is not used. [1]
This fix parsing the CS_MONITOR package.

[1] https://msdn.microsoft.com/en-us/library/dd305336.aspx

Change-Id: I99eea5abe95d4654aed8dc0d0e137c845aaba3aa
Reviewed-on: https://code.wireshark.org/review/31389
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agoPass a structure including an atm_phdr to dissect_atm_pw_oam_cell().
Guy Harris [Sat, 5 Jan 2019 07:39:38 +0000 (23:39 -0800)]
Pass a structure including an atm_phdr to dissect_atm_pw_oam_cell().

This will allow the VPI and VCI to be handed to
dissect_atm_cell_payload() in
https://code.wireshark.org/review/c/31381/.

That structure also needs to include the enable_fill_columns_by_atm_dissector
flag; we remove that from the pwatm_private_data_t, which is now private
to the ATM pseudo-wire dissector, and put it in the new structure.

Change-Id: I88f4a9f4b3c4c1c94914311bb883ea38e10ca4b4
Reviewed-on: https://code.wireshark.org/review/31384
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>
5 years agoWSDG: update testing section to cover use of pytest
Peter Wu [Thu, 3 Jan 2019 23:36:41 +0000 (00:36 +0100)]
WSDG: update testing section to cover use of pytest

Remove traces of the "config" module, it was removed. Add a new section
on using pytest.

Change-Id: I763fc53359157f5fcb04198ed98e2d7f7a2c7220
Reviewed-on: https://code.wireshark.org/review/31372
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agotest: enable parallelism by default for pytest
Peter Wu [Fri, 4 Jan 2019 18:47:53 +0000 (19:47 +0100)]
test: enable parallelism by default for pytest

Consistent with tools like "ninja", enable parallelism by default. It
can be disabled again with `pytest -n0`.

This makes pytest-xdist a dependency when pytest is used as test runner.
This does not affect the unittest-based test runnet (test/test.py).

Change-Id: I4dc905f097c57a869aa39487b15361502b431616
Reviewed-on: https://code.wireshark.org/review/31371
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agopytest.ini: declare minimum version requirement
Peter Wu [Fri, 4 Jan 2019 19:06:45 +0000 (20:06 +0100)]
pytest.ini: declare minimum version requirement

pytest 3.0.0 (2016-08-18) or newer is required due to the use of the
yield keyword in fixtures and the use of getfixturevalue. Do not bother
supporting older versions, install newer versions via pip instead.

Change-Id: I35ae787e2abcc706c19251d29a7d5b8513079c15
Reviewed-on: https://code.wireshark.org/review/31373
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agotest: allow running pytest without specifying the tests directory
Peter Wu [Thu, 3 Jan 2019 22:43:56 +0000 (23:43 +0100)]
test: allow running pytest without specifying the tests directory

This allows `pytest` to be executed from the top-level source or build
directory (or any other directory below).

Change-Id: Ib7af2ea2aaf01319d6839d2dc67228fbb5a7bc34
Reviewed-on: https://code.wireshark.org/review/31370
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agomaxmind_db: Close our pipe FDs inside a lock.
Gerald Combs [Fri, 4 Jan 2019 21:24:10 +0000 (13:24 -0800)]
maxmind_db: Close our pipe FDs inside a lock.

Lock our pipe mutex before closing its file descriptors. This should
hopefully fix some infrequent crashes that I'm seeing on my Windows 7 VM.

Add a note about GRWLock behavior on Windows which doesn't appear to be
related to this issue, but which is nevertheless important.

Ping-Bug: 14701
Change-Id: I32e66a24258264fa65a907f319755594f90c0177
Reviewed-on: https://code.wireshark.org/review/31375
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>
5 years agoadd encoding windows 1251, cp855, cp866
kanidef [Thu, 3 Jan 2019 07:07:02 +0000 (10:07 +0300)]
add encoding windows 1251, cp855, cp866

Change-Id: I0e8507cf63d89942167ca579ef304bc3d679346e
Reviewed-on: https://code.wireshark.org/review/31316
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>
5 years agoFinish migrating to Asciidoctor's modern syntax.
Gerald Combs [Fri, 4 Jan 2019 20:00:59 +0000 (12:00 -0800)]
Finish migrating to Asciidoctor's modern syntax.

Finish migrating the User's and Developer's guides to modern syntax.
Remove :compat-mode: from attributes.asciidoc.

Change-Id: I1232676c6ef4c3638253d070dcbae6d3c1ead284
Reviewed-on: https://code.wireshark.org/review/31374
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
5 years agodebian: add dh-python to debian deps.
Dario Lombardo [Thu, 3 Jan 2019 11:01:34 +0000 (12:01 +0100)]
debian: add dh-python to debian deps.

Basic Ubuntu installation lacks it.

Change-Id: I208952d15bd32a7813c20625fe94656fb71ae824
Reviewed-on: https://code.wireshark.org/review/31322
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Balint Reczey <balint@balintreczey.hu>
5 years agotest: assume binaries in $PWD\run\RelWithDebInfo by default
Peter Wu [Thu, 3 Jan 2019 19:17:00 +0000 (20:17 +0100)]
test: assume binaries in $PWD\run\RelWithDebInfo by default

Avoid the need to set `pytest --program-path` in the common case.

Change-Id: I3b237e47eee741decb62a74b733110040aa26673
Reviewed-on: https://code.wireshark.org/review/31348
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agoextcap: fix --extcap-version argument to include the version
Peter Wu [Fri, 4 Jan 2019 12:39:03 +0000 (13:39 +0100)]
extcap: fix --extcap-version argument to include the version

Change-Id: I727864ae0a210fea2dc90624102b793f5a98e395
Fixes: v2.9.0rc0-2648-g9ae02a5918 ("extcap: run --extcap-config in parallel to reduce startup time")
Reviewed-on: https://code.wireshark.org/review/31367
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
5 years agocommit-msg: accept commit messages with backslashes
Peter Wu [Fri, 4 Jan 2019 13:27:57 +0000 (14:27 +0100)]
commit-msg: accept commit messages with backslashes

Dash (/bin/sh on Ubuntu) treats backslashes specially in an echo
command. This could fail the validate-commit.py script when '\r' or '\n'
occur anywhere in a commit message.

Change-Id: Icec2c1e8ad1b365b4326ecc6ba9667ac64866fdd
Reviewed-on: https://code.wireshark.org/review/31368
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agowsutil: fix code according to clang-tidy.
Dario Lombardo [Fri, 4 Jan 2019 13:12:04 +0000 (14:12 +0100)]
wsutil: fix code according to clang-tidy.

Change-Id: I7b4caed147c5813d7c9737c551b8bf1a7be48929
Reviewed-on: https://code.wireshark.org/review/31361
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
5 years agowiretap: fix code according to clang-tidy.
Dario Lombardo [Fri, 4 Jan 2019 13:12:45 +0000 (14:12 +0100)]
wiretap: fix code according to clang-tidy.

Change-Id: I7f539968e9dce3a49112b7aeaa052b8cdb7501a6
Reviewed-on: https://code.wireshark.org/review/31364
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agoQt: Add "Show in Finder/Folder" for plugins.
Stig Bjørlykke [Sun, 30 Dec 2018 19:30:56 +0000 (20:30 +0100)]
Qt: Add "Show in Finder/Folder" for plugins.

Add a menu item for "Show in Finder/Folder" for plugins in cases where
Wireshark loads plugins from other folders than is listed in "Folders".

Change-Id: I8cc42d9992d885f1ca37f5769d7292bed1584f4b
Reviewed-on: https://code.wireshark.org/review/31270
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
5 years agows_mempbrk_sse42: use same var names.
Dario Lombardo [Fri, 4 Jan 2019 08:48:20 +0000 (09:48 +0100)]
ws_mempbrk_sse42: use same var names.

Found by clang-tidy.

Change-Id: I2f89c6860d591c5c1563b9ca01306bb3d9e5e42c
Reviewed-on: https://code.wireshark.org/review/31359
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agows_pipe: use same var name.
Dario Lombardo [Fri, 4 Jan 2019 08:47:45 +0000 (09:47 +0100)]
ws_pipe: use same var name.

Found by clang-tidy.

Change-Id: I0d324faf494f6b68275d6ff600304f716529778b
Reviewed-on: https://code.wireshark.org/review/31358
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agoxtea: use same var name.
Dario Lombardo [Fri, 4 Jan 2019 08:40:52 +0000 (09:40 +0100)]
xtea: use same var name.

Found by clang-tidy.

Change-Id: I5afce9464536cbbaf8f7f84b165d2ef56e166c2e
Reviewed-on: https://code.wireshark.org/review/31357
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agoCRC6: Fixed CRC lookup table and functions
Ross [Thu, 3 Jan 2019 22:19:59 +0000 (14:19 -0800)]
CRC6: Fixed CRC lookup table and functions

* Generated code and 256-element lookup table with pycrc
* Combined 2 crc6 functions which both have same poly 0x6f and lookup table
* Using the example file from the bug report,

    $ tshark -r ~/Downloads/M1_header_crc.pcapng -V | grep "Calculated CRC"
    1101 00.. = Header CRC: 0x34 [Calculated CRC 0x34]

Header and Calculated CRC are now both 0x34 (correct value)

* pycrc settings for generation:
    $ python pycrc.py --reflect-in False \
                      --reflect-out False \
                      --xor-in 0 \
                      --xor-out 0 \
                      --algorithm table-driven
                      --width 6 \
                      --poly 0x2f

* To manually check 3GPP protocol header CRCs, use above command with flag

    --check-hexstring=<HEADER HEX>

Bug: 14875
Change-Id: I283f52fcae10b2f92f107df6988629d49d692428
Reviewed-on: https://code.wireshark.org/review/31356
Reviewed-by: Ross Jacobs <rossbjacobs@gmail.com>
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agoepan: remove return from functions returning void.
Dario Lombardo [Thu, 3 Jan 2019 16:45:02 +0000 (17:45 +0100)]
epan: remove return from functions returning void.

Found by clang-tidy.

Change-Id: Ibedfec5e5d3eca7c2e65319b7ecb4dcbe974b88b
Reviewed-on: https://code.wireshark.org/review/31337
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agoWSDG: Add a note about Npcap licensing.
Gerald Combs [Thu, 3 Jan 2019 22:05:27 +0000 (14:05 -0800)]
WSDG: Add a note about Npcap licensing.

Expand the Npcap text. Make it clear that you might need to purchase a
license to redistribute Npcap.

Change-Id: I9340ed2d363e66443797478c59859ce10d648aff
Reviewed-on: https://code.wireshark.org/review/31351
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>
5 years agoWSDG: Stop recommending DDD.
Gerald Combs [Thu, 3 Jan 2019 22:21:59 +0000 (14:21 -0800)]
WSDG: Stop recommending DDD.

Drop mentions of DDD in favor of Qt Creator, CLion, and Eclipse. From
looking at https://sourceware.org/gdb/wiki/GDB%20Front%20Ends I'm
guessing that those have superseded DDD, as nice at it is/was.

Change-Id: I445a909ab8c8aa73c90f868d6b0958bb8faf62d6
Reviewed-on: https://code.wireshark.org/review/31353
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>
5 years agotest/dissectorstest: assert that text2pcap and tshark runs
Peter Wu [Thu, 3 Jan 2019 21:58:28 +0000 (22:58 +0100)]
test/dissectorstest: assert that text2pcap and tshark runs

Fail early if these commands fail.

Change-Id: I6ba6cfa4b0b68c7282b79204b4f2bfedfefa4326
Reviewed-on: https://code.wireshark.org/review/31352
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agotest: split SubprocessTestCase.run into setUp/tearDown
Peter Wu [Thu, 3 Jan 2019 18:07:40 +0000 (19:07 +0100)]
test: split SubprocessTestCase.run into setUp/tearDown

The run method is not invoked when running in debug mode (for example,
with `pytest --pdb`) and would result in spurious errors due to "log_fd"
being None. Split the method to resolve this incompatibility.

Note that with `pytest --pdb`, the tearDown method is not called when
exceptions occur, see https://docs.pytest.org/en/latest/unittest.html

Change-Id: I4b66c03d5b050b53311ec64021fe17dc91bb48dd
Reviewed-on: https://code.wireshark.org/review/31339
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agoRemove a no-longer-needed DIAG_OFF/DIAG_ON pair.
Guy Harris [Thu, 3 Jan 2019 23:43:30 +0000 (15:43 -0800)]
Remove a no-longer-needed DIAG_OFF/DIAG_ON pair.

If you're not casting anything, you're not casting away qualifiers, so
there's no need to disable warnings about casting away constness.

Change-Id: Ib6bb75a8683ce129078a09df385159c13d2cf306
Reviewed-on: https://code.wireshark.org/review/31355
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>
5 years agodoc/README.display_filter: Fix typo: asser -> assert
Jim Young [Thu, 3 Jan 2019 23:36:04 +0000 (18:36 -0500)]
doc/README.display_filter: Fix typo: asser -> assert

Change-Id: If49baf3e2b4e01f4ca4ea85415a3a291f8c04c92
Reviewed-on: https://code.wireshark.org/review/31354
Petri-Dish: Jim Young <jim.young.ws@gmail.com>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
5 years agoepan: remove redundant casts.
Dario Lombardo [Thu, 3 Jan 2019 16:53:42 +0000 (17:53 +0100)]
epan: remove redundant casts.

Found by clang-tidy.

Change-Id: Iaf6cf84c33b03ddfcd39a333b49f4987002afa56
Reviewed-on: https://code.wireshark.org/review/31338
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>
5 years agofile: remove redundant cast.
Dario Lombardo [Thu, 3 Jan 2019 16:41:49 +0000 (17:41 +0100)]
file: remove redundant cast.

Found by clang-tidy.

Change-Id: I58c11e09ed89e99457635dd843311ce3cf3c6bae
Reviewed-on: https://code.wireshark.org/review/31334
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>
5 years agosharkd: remove redundant cast.
Dario Lombardo [Thu, 3 Jan 2019 16:42:36 +0000 (17:42 +0100)]
sharkd: remove redundant cast.

Found by clang-tidy.

Change-Id: Ie02a77ffc17050743de216594d40faa65e1dabc2
Reviewed-on: https://code.wireshark.org/review/31336
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>
5 years agoextcap: remove redundant casts.
Dario Lombardo [Thu, 3 Jan 2019 16:38:03 +0000 (17:38 +0100)]
extcap: remove redundant casts.

Found by clang-tidy.

Change-Id: Icd4a72d840092ce9c5e18e3d16a94b785b4521dc
Reviewed-on: https://code.wireshark.org/review/31333
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>
5 years agorawshark: remove redundant cast.
Dario Lombardo [Thu, 3 Jan 2019 16:42:21 +0000 (17:42 +0100)]
rawshark: remove redundant cast.

Found by clang-tidy.

Change-Id: I50912055e0230173af3a6b008fafb12144b02f8d
Reviewed-on: https://code.wireshark.org/review/31335
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>
5 years agoPut a period at the end of a sentence.
Guy Harris [Thu, 3 Jan 2019 22:01:08 +0000 (14:01 -0800)]
Put a period at the end of a sentence.

Change-Id: Ifad6b9a09bc052d687cefe3ccda8c07ad765abda
Reviewed-on: https://code.wireshark.org/review/31350
Reviewed-by: Guy Harris <guy@alum.mit.edu>
5 years agoSlight fixup for where the capture code lives.
Guy Harris [Thu, 3 Jan 2019 21:56:15 +0000 (13:56 -0800)]
Slight fixup for where the capture code lives.

The full explanation is a bit more complicated - we'd have to mention
the dumpcap/*shark split, and the code on both sides of the split.

Change-Id: I43f8fc3c589bdf900e20714b55a3b4f544879bc2
Reviewed-on: https://code.wireshark.org/review/31349
Reviewed-by: Guy Harris <guy@alum.mit.edu>
5 years agoWSDG: Miscellaneous updates and fixes.
Gerald Combs [Thu, 3 Jan 2019 20:01:19 +0000 (12:01 -0800)]
WSDG: Miscellaneous updates and fixes.

Update the Windows CRT text to mention the Universal CRT.

Replace references to WinPcap with Npcap.

Update the Qt LTS text.

Add a WiX / .msi section

Use curly quotes.

Use the {cpp} attribute so that the "++" in "C++" doesn't trigger
monospace formatting.

Make the various "Unix" and "Windows" subsection title names uniform.
Give them the "discrete" attribute so that they don't clutter up the
TOC.

Title-case section titles.

Remove the reference to m4. As far as I can tell we don't require it.

Change-Id: I73f851adae640f77205781d6c4962002c2d53f49
Reviewed-on: https://code.wireshark.org/review/31343
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
5 years agotest: print command output for dfiltertest failures
Peter Wu [Thu, 3 Jan 2019 18:28:44 +0000 (19:28 +0100)]
test: print command output for dfiltertest failures

The buildbot detects random errors on Windows. Log some more details in
order to understand the problem better.

Change-Id: I903457894985273a63b8907b6784a2897cd93d93
Reviewed-on: https://code.wireshark.org/review/31340
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
5 years agoAvoid definition collisions for INVALID_SOCKET.
Guy Harris [Thu, 3 Jan 2019 20:21:19 +0000 (12:21 -0800)]
Avoid definition collisions for INVALID_SOCKET.

Newer versions of libpcap define it (due to the somewhat infelicitous
API for "active mode" remote capture, which returns a socket); don't
define it ourselves if it's already defined.

Change-Id: I620576620fd2708ebd503da696e17b472bc20472
Reviewed-on: https://code.wireshark.org/review/31344
Reviewed-by: Guy Harris <guy@alum.mit.edu>
5 years agoFix indentation.
Guy Harris [Thu, 3 Jan 2019 19:39:54 +0000 (11:39 -0800)]
Fix indentation.

Change-Id: I60d9b7b5dce04dae560a68feb329041c0374c241
Reviewed-on: https://code.wireshark.org/review/31342
Reviewed-by: Guy Harris <guy@alum.mit.edu>
5 years agotshark: remove redundant casts.
Dario Lombardo [Thu, 3 Jan 2019 16:16:35 +0000 (17:16 +0100)]
tshark: remove redundant casts.

Found by clang-tidy.

Change-Id: I7fe1c3219758d8daf411d094e2df17916f2eb57b
Reviewed-on: https://code.wireshark.org/review/31330
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agocapture_sync: use the same var name as in other places.
Dario Lombardo [Thu, 3 Jan 2019 15:53:01 +0000 (16:53 +0100)]
capture_sync: use the same var name as in other places.

error_message -> error_msg.

Change-Id: Ie1bc1b72800dc6c93e481cfffa202d5bd0743b5c
Reviewed-on: https://code.wireshark.org/review/31329
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agodoc: update README.display_filter for new test location
Peter Wu [Thu, 3 Jan 2019 19:14:09 +0000 (20:14 +0100)]
doc: update README.display_filter for new test location

Change-Id: I29bb00dbec43692d940ef6f389743af56dfd6995
Reviewed-on: https://code.wireshark.org/review/31341
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
5 years agorelease-notes: document TLS and library changes
Peter Wu [Thu, 3 Jan 2019 15:00:08 +0000 (16:00 +0100)]
release-notes: document TLS and library changes

Change-Id: I3af4cb96a6c87205cdd6c85c27977366cb77291f
Reviewed-on: https://code.wireshark.org/review/31327
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
5 years agoepan: use json_dumper for json outputs.
Dario Lombardo [Mon, 10 Dec 2018 12:44:03 +0000 (13:44 +0100)]
epan: use json_dumper for json outputs.

They include -Tjson, -Tjsonraw, -Tek.

Change-Id: Ib3d700482ce5c29727c3f778cc3c46a1bf7756c4
Reviewed-on: https://code.wireshark.org/review/31000
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>