metze/wireshark/wip.git
6 years agocapchild: free memory on error.
Dario Lombardo [Tue, 16 Jan 2018 16:05:54 +0000 (17:05 +0100)]
capchild: free memory on error.

Change-Id: If2cd8d344dced80b16789744a0b504c505ba0824
Reviewed-on: https://code.wireshark.org/review/25344
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
6 years agoQt: add more sanity checks in utils (found by clang).
Dario Lombardo [Tue, 16 Jan 2018 16:28:56 +0000 (17:28 +0100)]
Qt: add more sanity checks in utils (found by clang).

Ensure the pointer exist before dereference them.

Change-Id: I7c2881c9c74b88517d01d9306507c14ff2a7b257
Reviewed-on: https://code.wireshark.org/review/25345
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
6 years agoQt: Fix proto tree links and related frames.
Gerald Combs [Tue, 16 Jan 2018 01:13:45 +0000 (17:13 -0800)]
Qt: Fix proto tree links and related frames.

Add FieldInformation::isLink and use it to style link items.

Add back a related frame information.

Get rid of rowsInserted() and just visit each tree node starting from
the root.

Change-Id: I0e7ef6b2e11d25465705adffbb77d6f6cfb2a435
Reviewed-on: https://code.wireshark.org/review/25342
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
6 years agoEtherCAT: Add Mailbox as a string in EtherCAT Frame Types.
Michalis Kapsalakis [Tue, 16 Jan 2018 12:06:38 +0000 (13:06 +0100)]
EtherCAT: Add Mailbox as a string in EtherCAT Frame Types.

This commit adds the missing mailbox type to the EthercatFrameTypes
array.

Change-Id: I0710b723cdfa6cff28b6655729dafb68678518cb
Reviewed-on: https://code.wireshark.org/review/25338
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: Dario Lombardo <lomato@gmail.com>
6 years agoplugins: Add source tree subfolder for plugin library
João Valverde [Mon, 15 Jan 2018 12:40:55 +0000 (12:40 +0000)]
plugins: Add source tree subfolder for plugin library

This allows some simplification and makes things more consistent,
particularly for loading plugins from the build dir.

Also fixes the issue reported here:

https://www.wireshark.org/lists/wireshark-dev/201801/msg00061.html

Change-Id: I0d8a000ee679172bccad546a3b0c47a79486f44d
Reviewed-on: https://code.wireshark.org/review/25329
Petri-Dish: João Valverde <j@v6e.pt>
Reviewed-by: João Valverde <j@v6e.pt>
6 years agoieee80211: Add support for EAPOL Key MIC lengths other than 16.
Richard Sharpe [Tue, 16 Jan 2018 03:37:56 +0000 (19:37 -0800)]
ieee80211: Add support for EAPOL Key MIC lengths other than 16.

This allows the user to override the EAPOL Key MIC length for those
crypto suites where the Key MIC length is greater than 16 bytes.

This works in the DPP case where the Key MIC length is supposed to be the
same as the Nonce length.

Change-Id: I8ef6bc978e0a44ece0e95d76b231a02c7f15c89b
Reviewed-on: https://code.wireshark.org/review/25332
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years agodumpcap: remove dead code (CID: 1188011).
Dario Lombardo [Mon, 25 Dec 2017 22:33:55 +0000 (23:33 +0100)]
dumpcap: remove dead code (CID: 1188011).

Change-Id: I55149733ae420d32c6dd86c3c61baef57cc2082f
Reviewed-on: https://code.wireshark.org/review/24996
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years agoui: check g_malloc return (found by clang scan).
Dario Lombardo [Wed, 10 Jan 2018 22:20:36 +0000 (23:20 +0100)]
ui: check g_malloc return (found by clang scan).

Change-Id: I96df8a87f5f213fc1b77c485899cf373987413ac
Reviewed-on: https://code.wireshark.org/review/25252
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years agoQUIC: fix Padding Frame
Alexis La Goutte [Mon, 15 Jan 2018 08:16:57 +0000 (09:16 +0100)]
QUIC: fix Padding Frame

Padding frame can be anywhere on QUIC payload
Add loop check if it is always padding frame (0x00)

Bug: 13881
Change-Id: I3d50e5347aeca9738aeac3287ddba7fd30fc72b1
Reviewed-on: https://code.wireshark.org/review/25324
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>
6 years ago[VoIP calls] Make ISUP over M3UA work.
AndersBroman [Mon, 15 Jan 2018 16:51:55 +0000 (17:51 +0100)]
[VoIP calls] Make ISUP over M3UA work.

I'm not sure how this tap_base_to_id() works but this seems to fix the
problem.

Change-Id: I98663a9560a38de03c130181dfa43b43befc612f
Reviewed-on: https://code.wireshark.org/review/25327
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years agoProtoTree behavior fixes.
Gerald Combs [Mon, 15 Jan 2018 18:18:48 +0000 (10:18 -0800)]
ProtoTree behavior fixes.

Sync our expansion state for every node since we might have mixed
expanded/collapsed hierarchies.

Move the prefs.gui_auto_scroll_on_expand code from expand() to its own
function (autoScrollTo()).

Rename expand() and collapse() to syncExpanded() and syncCollapsed().
We can update tree_is_expanded without overriding our base class.

Ping-Bug: 14340
Change-Id: Ibf758809ea26dcc3f79bd0201168fae35d7cce8d
Reviewed-on: https://code.wireshark.org/review/25328
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>
6 years agoCMake: Remove incorrect comment
João Valverde [Mon, 15 Jan 2018 21:59:10 +0000 (21:59 +0000)]
CMake: Remove incorrect comment

Change-Id: Ie58b172f5c465d92d8100ac39cfd8c905586e9f7
Reviewed-on: https://code.wireshark.org/review/25331
Reviewed-by: João Valverde <j@v6e.pt>
6 years agoQt: add assert to avoid null dereference (CID: 1427426).
Dario Lombardo [Fri, 12 Jan 2018 08:13:09 +0000 (09:13 +0100)]
Qt: add assert to avoid null dereference (CID: 1427426).

Change-Id: Ib3a5830a4ae07ebb9bd2657599d668af03c896c8
Reviewed-on: https://code.wireshark.org/review/25275
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
6 years ago[SIP] Display tel uri in VoIP calls.
AndersBroman [Mon, 15 Jan 2018 13:49:51 +0000 (14:49 +0100)]
[SIP] Display tel uri in VoIP calls.

Change-Id: I0a4eb85abd75ed706ea519371f2c62b172c05297
Reviewed-on: https://code.wireshark.org/review/25326
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
6 years agoQt: rename index to tab_index to pacify checkAPI.
Dario Lombardo [Mon, 15 Jan 2018 11:26:22 +0000 (12:26 +0100)]
Qt: rename index to tab_index to pacify checkAPI.

Change-Id: Ib171c835ca1e2a3b00ac6d6d495b41c70084b52f
Reviewed-on: https://code.wireshark.org/review/25325
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years agoQt: change obsolete qVariantFromValue into QVariant::fromValue.
Dario Lombardo [Mon, 15 Jan 2018 07:53:55 +0000 (08:53 +0100)]
Qt: change obsolete qVariantFromValue into QVariant::fromValue.

Change-Id: I767b06c0e316347cdb28b769f1032e6d44cba45b
Reviewed-on: https://code.wireshark.org/review/25321
Petri-Dish: Roland Knall <rknall@gmail.com>
Tested-by: Roland Knall <rknall@gmail.com>
Reviewed-by: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years agoBugfix VoipCallsDialog tap handling
Michael Mann [Sun, 14 Jan 2018 20:37:16 +0000 (15:37 -0500)]
Bugfix VoipCallsDialog tap handling

voip's special tap unregistering should be happening when
WiresharkDialog unregisters its taps.

Change-Id: I8f28b1ed31617b47870cb7a429d43f52fb8c4a86
Reviewed-on: https://code.wireshark.org/review/25294
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Roland Knall <rknall@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years agoQt: Expand subtrees when a packet is selected.
Gerald Combs [Sun, 14 Jan 2018 20:23:07 +0000 (12:23 -0800)]
Qt: Expand subtrees when a packet is selected.

ProtoTree::rowsInserted was expanding top-level items properly but not
subtrees. Make sure we do so.

Bug: 14340
Change-Id: I6c73fd09643b52d43014352816d0dd4838dbcb1d
Reviewed-on: https://code.wireshark.org/review/25316
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>
6 years agoQUIC(TLS): Add new error code from draft-07
Alexis La Goutte [Mon, 15 Jan 2018 07:16:18 +0000 (08:16 +0100)]
QUIC(TLS): Add new error code from draft-07

Bug: 13881
Change-Id: I7ef7fd2081d74991219e40f695635e4c00d20365
Reviewed-on: https://code.wireshark.org/review/25320
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years agoradius: Sync with FreeRADIUS
Alexis La Goutte [Sun, 14 Jan 2018 19:58:28 +0000 (20:58 +0100)]
radius: Sync with FreeRADIUS

commit 671cf8c3956c137ee089b7647cd81c182e201ef5
Author: Alan T. DeKok <aland@freeradius.org>
Date:   Fri Jan 12 10:34:11 2018 -0500

    these attributes are "string".  Fixes #2130

Change-Id: I0656f699958f583215551b3be2b2ab3dfdea6cfb
Reviewed-on: https://code.wireshark.org/review/25313
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>
6 years agoTest explicitly against 0 for integers and NULL for pointers, but not booleans.
Guy Harris [Mon, 15 Jan 2018 00:05:32 +0000 (16:05 -0800)]
Test explicitly against 0 for integers and NULL for pointers, but not booleans.

That makes it clearer what's being tested, and makes the tests more
consistent, so we're always, not just sometimes, testing that way.

Change-Id: Ifac4a86d16d0652d04db3dec572c11e1335c945d
Reviewed-on: https://code.wireshark.org/review/25318
Reviewed-by: Guy Harris <guy@alum.mit.edu>
6 years agoAdd a URL for RFC 1952.
Guy Harris [Sun, 14 Jan 2018 23:47:22 +0000 (15:47 -0800)]
Add a URL for RFC 1952.

Change-Id: I951829e173ef7a37ea1de7576ff919470e746974
Reviewed-on: https://code.wireshark.org/review/25317
Reviewed-by: Guy Harris <guy@alum.mit.edu>
6 years agoInterfaceFrame: don't use pointers for models
Michael Mann [Fri, 12 Jan 2018 17:50:52 +0000 (12:50 -0500)]
InterfaceFrame: don't use pointers for models

Change-Id: I6d41ba89006abb8f8e703f6d703370169062f7e9
Reviewed-on: https://code.wireshark.org/review/25285
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Roland Knall <rknall@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
6 years agoCheck for gzipped files even if we don't have libz.
Guy Harris [Sun, 14 Jan 2018 21:07:17 +0000 (13:07 -0800)]
Check for gzipped files even if we don't have libz.

If we aren't built with libz, report a new "decompression not supported"
error if the file is gzipped; the problem isn't that it's a new capture
file format we don't support, it's that a *compressed* capture file, in
some format, but we don't support the *compression* format used.

This can be extended if we add support for other compression formats.

Change-Id: I19239525d4e02357e3ca7189996556839af8fce2
Reviewed-on: https://code.wireshark.org/review/25315
Reviewed-by: Guy Harris <guy@alum.mit.edu>
6 years agoFix build with libz not configured in.
Guy Harris [Sun, 14 Jan 2018 20:39:24 +0000 (12:39 -0800)]
Fix build with libz not configured in.

Change-Id: I1a336eb5a19ddc9215a9598d176794cfa214863c
Reviewed-on: https://code.wireshark.org/review/25314
Reviewed-by: Guy Harris <guy@alum.mit.edu>
6 years agosharkd: keep filtered data in GHashTable.
Jakub Zawadzki [Sun, 14 Jan 2018 15:38:55 +0000 (16:38 +0100)]
sharkd: keep filtered data in GHashTable.

Change-Id: Ica0d953d93e35eab88b27a4d6bb8fbb75edb7e27
Reviewed-on: https://code.wireshark.org/review/25312
Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Jakub Zawadzki <darkjames-ws@darkjames.pl>
6 years agossl: fix reassembly for very small TCP segments
Peter Wu [Sun, 14 Jan 2018 14:29:26 +0000 (15:29 +0100)]
ssl: fix reassembly for very small TCP segments

A capture with a Server Hello failed to be dissected because the record
was split in TCP segments of one byte each. This resulted in a
"Malformed Packet" exception because ssl_looks_like_sslv2 looks at the
third byte which. To fix this, ensure that at least the size of a TLS
record is available.

Change-Id: I8558028a28169020bc6549fdac29e07ecedf6ce2
Reviewed-on: https://code.wireshark.org/review/25310
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years agoTLS13: update for draft -23 (new version and extensions)
Peter Wu [Sun, 14 Jan 2018 12:44:38 +0000 (13:44 +0100)]
TLS13: update for draft -23 (new version and extensions)

Renumber key_share extension, display the old codepoint as "Reserved
(key_share)" in case an older draft version is loaded. The old codepoint
(40) was apparently used for different purposes:
https://www.ietf.org/mail-archive/web/tls/current/msg25168.html

Add a new "signature_algorithms_cert" extension which is similar to
"signature_algorithms", except that it advertises the supported
algorithms in certificates rather than handshake messages.

Change-Id: Ibbb09100e2540deea8f652ba0685feadb68f33e7
Ping-Bug: 12779
Reviewed-on: https://code.wireshark.org/review/25309
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
6 years agohttp2: headers filter with UAT support
Alexander Gryanko [Sat, 18 Nov 2017 02:09:50 +0000 (05:09 +0300)]
http2: headers filter with UAT support

Make HTTP2 headers filterable.

Change-Id: I1a1a42ccdb41461f048e9ae462421ecad79da61b
Reviewed-on: https://code.wireshark.org/review/24475
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
6 years agofirewall_rules: rewrite all the defines (CID: 1158734).
Dario Lombardo [Wed, 27 Dec 2017 17:27:21 +0000 (18:27 +0100)]
firewall_rules: rewrite all the defines (CID: 1158734).

Change-Id: I7d39fe8eccb853723b75318590cbcfca8655245f
Reviewed-on: https://code.wireshark.org/review/25016
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
6 years agoFix lldp 802.3br typo
Anton Glukhov [Fri, 12 Jan 2018 17:51:58 +0000 (18:51 +0100)]
Fix lldp 802.3br typo

Change-Id: I8b69922c2bbb7905480277e7b28d9894453e785b
Signed-off-by: Anton Glukhov <anton.a.glukhov@gmail.com>
Reviewed-on: https://code.wireshark.org/review/25284
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years agoQt: Reword text shown when no interfaces displayed
Stig Bjørlykke [Sat, 13 Jan 2018 12:23:01 +0000 (13:23 +0100)]
Qt: Reword text shown when no interfaces displayed

Change-Id: Ic5ba4e562fe031b95fd2a7ab2d86de9bc09d5311
Reviewed-on: https://code.wireshark.org/review/25300
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years agoextcap: check preference in extcap_ensure_interface().
Dario Lombardo [Fri, 12 Jan 2018 20:17:31 +0000 (21:17 +0100)]
extcap: check preference in extcap_ensure_interface().

Change-Id: I2b854b410e54b9f85ce26212d908c474f4611929
Reviewed-on: https://code.wireshark.org/review/25289
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years agoextcap: check preference in extcap_loaded_interfaces().
Dario Lombardo [Fri, 12 Jan 2018 18:04:34 +0000 (19:04 +0100)]
extcap: check preference in extcap_loaded_interfaces().

Change-Id: Ie1fd214eb8f9d55f1ce400b7227ad9887f05da76
Reviewed-on: https://code.wireshark.org/review/25286
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years ago[Automatic update for 2018-01-14]
Gerald Combs [Sun, 14 Jan 2018 08:15:59 +0000 (08:15 +0000)]
[Automatic update for 2018-01-14]

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

Change-Id: Ie096b93a5c9476d763fb6677d0d9ab54c3c4744c
Reviewed-on: https://code.wireshark.org/review/25306
Reviewed-by: Gerald Combs <gerald@wireshark.org>
6 years agoAdd packet-nr-rrc.h to the list of headers.
Guy Harris [Sun, 14 Jan 2018 03:14:14 +0000 (19:14 -0800)]
Add packet-nr-rrc.h to the list of headers.

Change-Id: I7c59fef73a267aeb427eafff1e12e0b2b5ee05a1
Reviewed-on: https://code.wireshark.org/review/25305
Reviewed-by: Guy Harris <guy@alum.mit.edu>
6 years agoLTE RRC: upgrade dissector to v15.0.1
Pascal Quantin [Sat, 13 Jan 2018 17:34:14 +0000 (18:34 +0100)]
LTE RRC: upgrade dissector to v15.0.1

Change-Id: If0b6fe029b5f852250fde36ead5dc5bb03d44e28
Reviewed-on: https://code.wireshark.org/review/25304
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
6 years agoQt: Use the text "Initializing external capture plugins"
Stig Bjørlykke [Sat, 13 Jan 2018 12:46:09 +0000 (13:46 +0100)]
Qt: Use the text "Initializing external capture plugins"

Change-Id: Ic46dc0220722bf6ae3af857dcdac83d451772262
Reviewed-on: https://code.wireshark.org/review/25301
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
6 years agoNTP: Updated system and peer status codes
Uli Heilmeier [Fri, 12 Jan 2018 21:12:08 +0000 (22:12 +0100)]
NTP: Updated system and peer status codes

Used reference:
https://tools.ietf.org/html/draft-ietf-ntp-mode-6-cmds-03
http://doc.ntp.org/current-stable/decode.html

Bug: 14271
Change-Id: Iab829e31206f99b3458f68c6c65cc6188916a3bb
Reviewed-on: https://code.wireshark.org/review/25296
Reviewed-by: Michael Mann <mmann78@netscape.net>
6 years agoQt: Put all startup time logs in DEBUG_STARTUP_TIME
Stig Bjørlykke [Sat, 13 Jan 2018 12:21:09 +0000 (13:21 +0100)]
Qt: Put all startup time logs in DEBUG_STARTUP_TIME

Change-Id: I545674ecae45458860627f8cf430b6fa524274fd
Reviewed-on: https://code.wireshark.org/review/25299
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years agoQt: Don't use the term "extcap" interfaces in UI
Stig Bjørlykke [Sat, 13 Jan 2018 12:19:18 +0000 (13:19 +0100)]
Qt: Don't use the term "extcap" interfaces in UI

Use the term "external capture interfaces".

Change-Id: I216ce2273737b58e4922c476416333ba16d6cb30
Reviewed-on: https://code.wireshark.org/review/25298
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years agoUMTS MAC: protect against an out of bounds access
Pascal Quantin [Sat, 13 Jan 2018 11:46:45 +0000 (12:46 +0100)]
UMTS MAC: protect against an out of bounds access

Bug: 14339
Change-Id: Idd145b00218fb37c0c193df5af2f89a9503a036e
Reviewed-on: https://code.wireshark.org/review/25297
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
6 years agoPortableApps: Exclude a bunch of files.
Gerald Combs [Fri, 12 Jan 2018 23:14:17 +0000 (15:14 -0800)]
PortableApps: Exclude a bunch of files.

Add

fuzzshark.exe
idl2wrs.exe
lemon.exe
make-
test.exe
uninstall.exe

to the xcopy exlusion patterns.

Change-Id: Ibf7b4711a51b9eca2b5947edc8d3d007c718a395
Reviewed-on: https://code.wireshark.org/review/25291
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years agoieee1905: More changes from the recent bakathon including two more TLVs.
Richard Sharpe [Sat, 13 Jan 2018 01:34:08 +0000 (17:34 -0800)]
ieee1905: More changes from the recent bakathon including two more TLVs.

Change-Id: I010c9aa1a3ad7c599a6de13ac79320233698426b
Reviewed-on: https://code.wireshark.org/review/25293
Petri-Dish: Richard Sharpe <realrichardsharpe@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years agonetfilter: Make sure our bitmask field arrays are NULL terminated.
Gerald Combs [Fri, 12 Jan 2018 22:05:14 +0000 (14:05 -0800)]
netfilter: Make sure our bitmask field arrays are NULL terminated.

Add a trailing NULLs so that we don't read past the end of
hfi_nfct_attr_status_flags and hfi_nfexp_attr_flags_bitfield.

Bug: 14336
Change-Id: I1e96a89f60df2d653c4f3ad63f29cf57eb0224a5
Reviewed-on: https://code.wireshark.org/review/25290
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
6 years agomake-dissectors depends on copy_cli_dlls.
Gerald Combs [Fri, 12 Jan 2018 23:46:38 +0000 (15:46 -0800)]
make-dissectors depends on copy_cli_dlls.

Have the make-dissectors CMake target explicitly depend on copy_cli_dlls,
otherwise we might try to create dissectors.c before libglib-2.0-0.dll
has been copied into place. It looks like this is what's been causing
our random Windows PD failures.

Change-Id: Ia2445f17abd2c73113ab269ba6c606f48e724d93
Reviewed-on: https://code.wireshark.org/review/25292
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
6 years agoQt: fix compilation without pcap.
Dario Lombardo [Fri, 12 Jan 2018 20:16:11 +0000 (21:16 +0100)]
Qt: fix compilation without pcap.

Change-Id: If4ee4908b66a05fba1dba653ba887caa559aa7c2
Reviewed-on: https://code.wireshark.org/review/25288
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Dario Lombardo <lomato@gmail.com>
6 years agoQt: Add some translation hints.
Gerald Combs [Fri, 12 Jan 2018 18:51:33 +0000 (10:51 -0800)]
Qt: Add some translation hints.

Add translation hints for the PrefsModel names.

Change-Id: I003bea668cdb3340182227722cef42f7007bba1e
Reviewed-on: https://code.wireshark.org/review/25287
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
6 years agoctdb: don't dereference a null ptr (CID: 1427427).
Dario Lombardo [Fri, 12 Jan 2018 07:55:14 +0000 (08:55 +0100)]
ctdb: don't dereference a null ptr (CID: 1427427).

Change-Id: Icb20a3c496e76be530a7c72336bf3b866d6edfcd
Reviewed-on: https://code.wireshark.org/review/25274
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
6 years agoQt: add info for extcap disabled in main window.
Roland Knall [Fri, 12 Jan 2018 12:15:58 +0000 (13:15 +0100)]
Qt: add info for extcap disabled in main window.

Add an item to the end of the interface list, if the extcap
interfaces have been disabled.

Change-Id: I2643efb5dda9045e9e00fa3f815014f26a78085f
Reviewed-on: https://code.wireshark.org/review/25218
Reviewed-by: Dario Lombardo <lomato@gmail.com>
Reviewed-by: Roland Knall <rknall@gmail.com>
6 years agoNTP: Decode data of opcodes 8,9,10,11,12
Uli Heilmeier [Fri, 12 Jan 2018 13:04:10 +0000 (14:04 +0100)]
NTP: Decode data of opcodes 8,9,10,11,12

Decode additional data of NTP opcodes 8,9,10,11,12 only as one string.
There's room for improvement to dissect the string for all the
name=value pairs. To do so more samples of different implementations are
needed.

Used reference:
* https://tools.ietf.org/html/draft-ietf-ntp-mode-6-cmds-03
* http://doc.ntp.org/
* sample captures attached to bug

Bug: 14270
Change-Id: I4da537bf2a984b673845333714d8a8cb873f3147
Reviewed-on: https://code.wireshark.org/review/25281
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
6 years ago[Diameter] Add command code 8388637 and 8388638.
AndersBroman [Fri, 12 Jan 2018 13:34:07 +0000 (14:34 +0100)]
[Diameter] Add command code 8388637 and 8388638.

Change-Id: Ia135204ba4931ca0805f49b99b937a6185807ca2
Reviewed-on: https://code.wireshark.org/review/25282
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years agoprefs: init capture_no_extcap.
Dario Lombardo [Fri, 12 Jan 2018 10:21:57 +0000 (11:21 +0100)]
prefs: init capture_no_extcap.

Change-Id: Id5706f5268735e051dbd8e824ab909e91fea691b
Reviewed-on: https://code.wireshark.org/review/25279
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Dario Lombardo <lomato@gmail.com>
Reviewed-by: Roland Knall <rknall@gmail.com>
6 years agoQt: Add InfoProxyModel
Roland Knall [Fri, 12 Jan 2018 12:15:20 +0000 (13:15 +0100)]
Qt: Add InfoProxyModel

Add an identity model, which can be used to display non-selectable
information at the end of any list

Change-Id: Iaca436f34cb8e5b251eb0dc00ea2c0ce1bd9e0e2
Reviewed-on: https://code.wireshark.org/review/25280
Petri-Dish: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Roland Knall <rknall@gmail.com>
6 years agoextcap: add more checks for extcap disabled.
Dario Lombardo [Fri, 12 Jan 2018 09:06:12 +0000 (10:06 +0100)]
extcap: add more checks for extcap disabled.

Change-Id: I914efbb4293518a8a3f8aaa8739c9915c63d941c
Reviewed-on: https://code.wireshark.org/review/25278
Petri-Dish: Roland Knall <rknall@gmail.com>
Reviewed-by: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years agoLustre: add missing NULL terminator to flags lists
Pascal Quantin [Fri, 12 Jan 2018 09:22:07 +0000 (10:22 +0100)]
Lustre: add missing NULL terminator to flags lists

Bug: 14331
Change-Id: I439b1fe36ecb2e063146d7aebf517d842d4f8a4c
Reviewed-on: https://code.wireshark.org/review/25277
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
6 years agoQt: add initializer (CID: 1427425).
Dario Lombardo [Fri, 12 Jan 2018 08:47:58 +0000 (09:47 +0100)]
Qt: add initializer (CID: 1427425).

Change-Id: Id476db10688f8b06bf6e8499a6e011f8605c66c0
Reviewed-on: https://code.wireshark.org/review/25276
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Dario Lombardo <lomato@gmail.com>
6 years agoFP: Removed channels UAT
Nick James [Thu, 11 Jan 2018 16:50:51 +0000 (18:50 +0200)]
FP: Removed channels UAT

This UAT was limited (allowed configuring RACH channels only) and hasn't been extended for 4 years now.
There is also a heuristic dissector for RACH channels so pre-configuring them is unnecessary.

Change-Id: I266d2a0aba179318e1c28e0d5bc2b60860962fb2
Reviewed-on: https://code.wireshark.org/review/25270
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years ago[Thrift] Make it easier to make specific Thrift dissectors
AndersBroman [Thu, 11 Jan 2018 12:47:08 +0000 (13:47 +0100)]
[Thrift] Make it easier to make specific Thrift dissectors

Introduce functionallity simmilar to packet-ber.c

Change-Id: Ibb76e2db870c9a9dd8b26067b59a20044aafbd85
Reviewed-on: https://code.wireshark.org/review/25266
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years agoTest: Fix the plugin check.
Gerald Combs [Thu, 11 Jan 2018 16:27:52 +0000 (08:27 -0800)]
Test: Fix the plugin check.

Change-Id: I9724fa36070635bfd1392167eb362cf8631611fa
Reviewed-on: https://code.wireshark.org/review/25267
Reviewed-by: Gerald Combs <gerald@wireshark.org>
6 years agoQt: Adjust About box column sizing.
Gerald Combs [Wed, 10 Jan 2018 20:43:50 +0000 (12:43 -0800)]
Qt: Adjust About box column sizing.

Setting column sizes when we resize will clobber any adjustments made by
the user. Set them when we show the dialog instead. The plugin text
varies quite a bit from column to column. Resize each column to its
contents instead of setting uniform widths.

Change-Id: I1ed9b115665b4dd99a4ff9ee94701f449b8413de
Reviewed-on: https://code.wireshark.org/review/25250
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>
6 years agowireshark_preference (Qt): fix extra ';' outside of a function is a C++11 extension...
Alexis La Goutte [Thu, 11 Jan 2018 11:14:18 +0000 (11:14 +0000)]
wireshark_preference (Qt): fix extra ';' outside of a function is a C++11 extension [-Wc++11-extra-semi]

Change-Id: Ided4470e26f67f82fc90244560603e97b1d4d4b5
Reviewed-on: https://code.wireshark.org/review/25265
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
6 years agoLNet: fix memory illegal access reported by Coverity (CID 1427262)
Pascal Quantin [Wed, 10 Jan 2018 09:48:28 +0000 (10:48 +0100)]
LNet: fix memory illegal access reported by Coverity (CID 1427262)

Change-Id: Iad925f32364eb9fb21da7032284044469dcbddc5
Reviewed-on: https://code.wireshark.org/review/25241
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
6 years agoAdd message number for wlan eapol 4-way key exchange
Jaap Keuter [Thu, 11 Jan 2018 09:23:50 +0000 (10:23 +0100)]
Add message number for wlan eapol 4-way key exchange

Since the message number isn't explicitly encoded in the protocol there
is no field to filter on. It is however derived from the message
contents and added in the info column.
Adding this as a generated field allows searching for and filtering of
these messages.
As requested before, last at SF'17 EU.

Change-Id: Id77612f0178710d30ea815335b0a54339d5d7b2c
Signed-off-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Reviewed-on: https://code.wireshark.org/review/25257
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>
6 years agoNAS EPS: make some helpers functions static
Pascal Quantin [Thu, 11 Jan 2018 11:06:54 +0000 (12:06 +0100)]
NAS EPS: make some helpers functions static

Change-Id: I6a98c10687a6ffbbe6aa59d91fa52fed47dcae66
Reviewed-on: https://code.wireshark.org/review/25264
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years agoAnother fix for AT_STRINGZ addresses.
Guy Harris [Thu, 11 Jan 2018 09:37:19 +0000 (01:37 -0800)]
Another fix for AT_STRINGZ addresses.

Change-Id: Ib1dc1b59851b87e7e3f83cfc888a494ca94cb289
Reviewed-on: https://code.wireshark.org/review/25261
Reviewed-by: Guy Harris <guy@alum.mit.edu>
6 years agoFor AT_STRINGZ, the length *includes* the null terminator.
Guy Harris [Thu, 11 Jan 2018 09:31:08 +0000 (01:31 -0800)]
For AT_STRINGZ, the length *includes* the null terminator.

The correct length for an AT_STRINGZ address of "" is 1, not 0.  A
length of 0 for an address is valid only if the pointer-to-address-data
is null.

Change-Id: I1da6de5ed402020ed5c8389a911870a54fa8b14a
Reviewed-on: https://code.wireshark.org/review/25258
Reviewed-by: Guy Harris <guy@alum.mit.edu>
6 years agoFix registration.
Guy Harris [Thu, 11 Jan 2018 08:47:38 +0000 (00:47 -0800)]
Fix registration.

Some routines are registered by the standard plugin mechanism, others
are registered internally.  If a first-stage ("register") routine is
registered internally, we must register the second-stage ("reg_handoff")
routine internally as well, otherwise the second-stage routine isn't
recognized by tools/make-plugin-reg.py and is never called.

Bug: 14322
Change-Id: I6eb94c0b74b6fb4d60eb57113d4ada73f4240150
Reviewed-on: https://code.wireshark.org/review/25256
Reviewed-by: Guy Harris <guy@alum.mit.edu>
6 years agoTest: Add a plugin check.
Gerald Combs [Wed, 10 Jan 2018 23:31:03 +0000 (15:31 -0800)]
Test: Add a plugin check.

Add a test for `tshark -G plugins`.

Change-Id: I9ddced8ad5c200bd11433c7b30038f83da8d7460
Reviewed-on: https://code.wireshark.org/review/25253
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years agoUpdate a comment to reflect current reality.
Guy Harris [Thu, 11 Jan 2018 04:06:56 +0000 (20:06 -0800)]
Update a comment to reflect current reality.

All plugin types now have plugin_register() as the registration
function, so it's an entry point for the plugin registration function,
not the particular plugin type.

Clean up white space while we're at it.

Change-Id: I166359deac57512cb6e87b2c7388c4b25cc54e10
Reviewed-on: https://code.wireshark.org/review/25254
Reviewed-by: Guy Harris <guy@alum.mit.edu>
6 years agoh223: fix warning related to circuit_id in circuit_chain_lookup
Peter Wu [Wed, 10 Jan 2018 17:44:28 +0000 (18:44 +0100)]
h223: fix warning related to circuit_id in circuit_chain_lookup

Fixes a build failure when building the wireshark-git package on Arch
Linux using GCC 7.2.1:

    epan/dissectors/packet-h223.c: In function ‘dissect_mux_sdu_fragment’:
    epan/dissectors/packet-h223.c:207:13: error: variable ‘circuit_id’ might be clobbered by ‘longjmp’ or ‘vfork’ [-Werror=clobbered]

Fixes: v2.5.0rc0-1698-g800b26edbe ("Remove circuit API")
Change-Id: I0b63f692e840e852680467b25ba3c3dfd31392ed
Reviewed-on: https://code.wireshark.org/review/25251
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
6 years agoUse an enum for plugin types.
Gerald Combs [Fri, 5 Jan 2018 17:09:40 +0000 (09:09 -0800)]
Use an enum for plugin types.

Make plugins.c the source of truth for plugin names. Where plugins
reside and what they do are two different things, so split the plugin
directory and description into two separate elements.

CMake creates portable[1] builds on Windows and macOS. That is, the
build-time directory layout is the same as the installation directory
layout. Adjust various plugin paths macOS accordingly.

[1] You have to run osx-app.sh on macOS to prepare the application
bundle, but the goal is to create a directory/bundle that can be moved
or copied to a different system and run in the new location.

Change-Id: Icf9d02e61918fdf1404468baf52542910edf2743
Reviewed-on: https://code.wireshark.org/review/25166
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
6 years agoTLS(QUIC): minimal Transport Parameter Length is 22
Alexis La Goutte [Sun, 7 Jan 2018 18:15:52 +0000 (19:15 +0100)]
TLS(QUIC): minimal Transport Parameter Length is 22

only 3 parameters are mandatory, so 3 * 4 (type + length), 2 * 4 (initial_max_stream_data + initial_max_data) + 2 (idle_timeout) = 22

See https://github.com/quicwg/base-drafts/issues/1042

Bug: 13881
Change-Id: I971b0badb81086bb4bf018cb4471973a3950ee50
Reviewed-on: https://code.wireshark.org/review/25184
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years agoCoAP: Shift block mflag so it is 0/1 instead of 0/8
Niels Widger [Wed, 10 Jan 2018 19:01:47 +0000 (14:01 -0500)]
CoAP: Shift block mflag so it is 0/1 instead of 0/8

Shift the value stored in coinfo->block_mflag in
dissect_coap_opt_block so that we store 0/1 instead of 0/8.

Change-Id: I45ac08564ff1fdcaf4e7306692db862b6a70989b
Reviewed-on: https://code.wireshark.org/review/25248
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Niels Widger <niels@qacafe.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
6 years agoImprove handling of VOIP VLAN queries and replies.
Guy Harris [Wed, 10 Jan 2018 20:16:30 +0000 (12:16 -0800)]
Improve handling of VOIP VLAN queries and replies.

For queries, there appear to be two different versions, one with a
2-byte value of some unknown type and one with a 1-byte value that
appears to be an "appliance type" code followed by a 2-byte VLAN ID.

For replies, there only appears to be a version with a 1-byte "appliance
type" followed by a 2-byte VLAN ID, but handle a too-short payload.

Also point to http://www.rhyshaden.com/cdp.htm in some comments.

Change-Id: If1b476d5e6b23c7e0ba027835c6f0c84c8b723b7
Reviewed-on: https://code.wireshark.org/review/25249
Reviewed-by: Guy Harris <guy@alum.mit.edu>
6 years agoLoRaTap: decode as for UDP
Erik de Jong [Wed, 10 Jan 2018 18:13:27 +0000 (19:13 +0100)]
LoRaTap: decode as for UDP

Allow decoding of LoRaTap in UDP packets like used by gr-lora (https://
github.com/rpp0/gr-lora) for instance.

Change-Id: I812c428db840a646b6fb22437037dcb8fab39370
Reviewed-on: https://code.wireshark.org/review/25247
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
6 years agoQUIC: Add new error code from draft-08
Alexis La Goutte [Wed, 10 Jan 2018 07:20:01 +0000 (08:20 +0100)]
QUIC: Add new error code from draft-08

UNSOLICITED_PONG (0xB):  An endpoint received a PONG frame that did
not correspond to any PING frame that it previously sent.

Bug: 13881
Change-Id: I8f3daf46965b93007dd178622f3ebd7c187b11e7
Reviewed-on: https://code.wireshark.org/review/25239
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years agoQUIC: Add PONG frame type from draft-08
Alexis La Goutte [Wed, 10 Jan 2018 07:16:59 +0000 (08:16 +0100)]
QUIC: Add PONG frame type from draft-08

Bug: 13881

Change-Id: I2f67e6f0fa8c517e143b3e352b0bc0297994d439
Reviewed-on: https://code.wireshark.org/review/25238
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years agoNAS EPS: upgrade dissector to v15.1.1
Pascal Quantin [Wed, 10 Jan 2018 10:23:59 +0000 (11:23 +0100)]
NAS EPS: upgrade dissector to v15.1.1

Change-Id: I52a7124cf6f6c6e267525514e44e6c2903a11725
Reviewed-on: https://code.wireshark.org/review/25243
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
6 years agoLustre: capitalize comment to please GCC7
Pascal Quantin [Wed, 10 Jan 2018 10:23:11 +0000 (11:23 +0100)]
Lustre: capitalize comment to please GCC7

Change-Id: I30c31dcdbfdfd99dfe204e2ba67a221f356a5088
Reviewed-on: https://code.wireshark.org/review/25242
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
6 years agoIxVeriWave: Adjust signature timestamp checking.
Gerald Combs [Tue, 9 Jan 2018 17:45:13 +0000 (09:45 -0800)]
IxVeriWave: Adjust signature timestamp checking.

Move the signature timestamp bounds checks inside get_signature_ts. Fix
what appears to be an off-by-one error.

Bug: 14297
Change-Id: I9ca1762a8418e47153f270a1a62b2d0d3a800130
Reviewed-on: https://code.wireshark.org/review/25229
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years agoFix build with GTK+ and without libsmi and GeoIP.
Guy Harris [Wed, 10 Jan 2018 09:17:53 +0000 (01:17 -0800)]
Fix build with GTK+ and without libsmi and GeoIP.

Bug: 14318
Change-Id: I2121f3fec3f366ff77615be5a4d6518e02e4d07d
Reviewed-on: https://code.wireshark.org/review/25240
Reviewed-by: Guy Harris <guy@alum.mit.edu>
6 years agoQt: refresh interfaces on exit if extcap status has changed.
Dario Lombardo [Tue, 9 Jan 2018 12:57:29 +0000 (13:57 +0100)]
Qt: refresh interfaces on exit if extcap status has changed.

Change-Id: I113f5ae3d72f647ddf0783dd4bcbdf42715dcbdc
Reviewed-on: https://code.wireshark.org/review/25223
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Roland Knall <rknall@gmail.com>
6 years agoBGP: Resolve AS23456 to AS_TRANS
Uli Heilmeier [Fri, 5 Jan 2018 21:12:15 +0000 (22:12 +0100)]
BGP: Resolve AS23456 to AS_TRANS

AS23456 is reserved in RFC6793 for 32-bit AS number range as AS_TRANS.
Add an additional text "(AS_TRANS)" to AS 23456 items.

Bug: 14305
Change-Id: I1a0ea9e07c74b7e409cb32e2da55dbf233a2348d
Reviewed-on: https://code.wireshark.org/review/25172
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years agoBGP: Add dissection of data field on BGP NOTIFICATION message (OPEN/Bad Peer AS)
Alexis La Goutte [Tue, 9 Jan 2018 07:20:43 +0000 (08:20 +0100)]
BGP: Add dissection of data field on BGP NOTIFICATION message (OPEN/Bad Peer AS)

Bug: 14304
Change-Id: Ic69b43c58f9e02f91900dc618e4429cfc6ddfcac
Reviewed-on: https://code.wireshark.org/review/25217
Reviewed-by: Uli Heilmeier <openid@heilmeier.eu>
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years agoNR RRC: add initial dissector based on v15.0.0
Pascal Quantin [Tue, 9 Jan 2018 22:38:47 +0000 (23:38 +0100)]
NR RRC: add initial dissector based on v15.0.0

ASN.1 prose imported from the specification and heavily modified
manually to workaround its poor quality.
Some of them are marked with -- WS modification comment, some are not.
Probably useless as-is, but it is an initial start until an updated
version is available.

Change-Id: I19ab6cedb6aa23c8ed57bae525ee4a3391494e32
Reviewed-on: https://code.wireshark.org/review/25235
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years agolustre: fix format 'long unsinged int' error
Uli Heilmeier [Tue, 9 Jan 2018 20:08:03 +0000 (21:08 +0100)]
lustre: fix format 'long unsinged int' error

Change-Id: I764aa32c5571e667917c202feb70612dd877fc40
Reviewed-on: https://code.wireshark.org/review/25231
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years agowiretap: add a parameter to wtap_init() indicating whether plugins must be loaded
Pascal Quantin [Tue, 9 Jan 2018 08:55:37 +0000 (09:55 +0100)]
wiretap: add a parameter to wtap_init() indicating whether plugins must be loaded

g995812c5f1 moved wiretap plugins registration from applications to
wiretap library init function.
As we do not want to load plugins for all users of libwiretap, let's
make it configurable.

Bug: 14314
Change-Id: Id8fdcc484e2d0d31d3ab0bd357d3a6678570f700
Reviewed-on: https://code.wireshark.org/review/25194
Reviewed-by: Dario Lombardo <lomato@gmail.com>
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years agoWCP: Add a length check.
Gerald Combs [Tue, 9 Jan 2018 19:31:40 +0000 (11:31 -0800)]
WCP: Add a length check.

Add a bounds check for the current window. Blind attempt at fixing bug
14251.

Bug: 14251
Change-Id: Ia3775bcabb2dc633b6994547125e53a4fe23451e
Reviewed-on: https://code.wireshark.org/review/25230
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>
6 years agoNTP: Update values for opcode
Uli Heilmeier [Tue, 9 Jan 2018 20:28:12 +0000 (21:28 +0100)]
NTP: Update values for opcode

Used refs:
https://github.com/ntp-project/ntp/blob/stable/include/ntp_control.h
https://tools.ietf.org/html/draft-ietf-ntp-mode-6-cmds-03#section-4

Ping-Bug: 14270
Change-Id: Ie2a30ef316f85313f6f626772c6544c315db5b68
Reviewed-on: https://code.wireshark.org/review/25232
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years agoFix tvbparse recursion limit check.
Stig Bjørlykke [Tue, 9 Jan 2018 14:27:46 +0000 (15:27 +0100)]
Fix tvbparse recursion limit check.

When doing recursion check we must also count down when done.

Bug: 14253
Change-Id: Icacc86e8b25e106e151117dbcc2f132b1bbe898e
Reviewed-on: https://code.wireshark.org/review/25226
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
6 years agolustre: add missing breaks (fix gcc-7 compilation).
Dario Lombardo [Tue, 9 Jan 2018 13:44:24 +0000 (14:44 +0100)]
lustre: add missing breaks (fix gcc-7 compilation).

Change-Id: I00f0901853818df5f6bf67d7d75720067d66ee50
Reviewed-on: https://code.wireshark.org/review/25225
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Nathaniel Clark <nathaniel.clark@misrule.us>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
6 years agoConvert GUI layout preferences to use preference effects.
Michael Mann [Sun, 7 Jan 2018 00:03:36 +0000 (19:03 -0500)]
Convert GUI layout preferences to use preference effects.

Another simple example of how to use preference effects to limit
the times a capture file is redissected unnecessarily.

Also clean up some of the grammar of preference effect descriptions.

Change-Id: I2db92e8e3ee913d3b37162916bd0ef7ac8ecd794
Reviewed-on: https://code.wireshark.org/review/25175
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>
6 years agoproto: Small code cleanup in proto_register_protocol
Stig Bjørlykke [Tue, 9 Jan 2018 12:28:17 +0000 (13:28 +0100)]
proto: Small code cleanup in proto_register_protocol

- Remove unneeded assignments
- Fix some comments and whitespace

Change-Id: I79de66315db29fe7c59fc18f3b3b464ac55121c8
Reviewed-on: https://code.wireshark.org/review/25221
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years agoIncrease PROTO_PRE_ALLOC_HF_FIELDS_MEM
Graham Bloice [Tue, 9 Jan 2018 11:14:40 +0000 (11:14 +0000)]
Increase PROTO_PRE_ALLOC_HF_FIELDS_MEM

We've added more fields, increment the pre-allocation amount

Change-Id: If0e68697c797e8709349a59b86fbcd4397730476
Reviewed-on: https://code.wireshark.org/review/25220
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years agoUpdate libwireshark0.symbols
Pascal Quantin [Tue, 9 Jan 2018 10:06:53 +0000 (11:06 +0100)]
Update libwireshark0.symbols

Change-Id: I3699e8589f5e4fefd7a4cbfad69039f0cfc00fe3
Reviewed-on: https://code.wireshark.org/review/25219
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
6 years agoextcap: add preference to prevent interfaces loading.
Dario Lombardo [Sun, 7 Jan 2018 21:06:13 +0000 (22:06 +0100)]
extcap: add preference to prevent interfaces loading.

Change-Id: Ia5865a40c75e582f28408a0515c5c0b38e43a916
Reviewed-on: https://code.wireshark.org/review/25188
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Roland Knall <rknall@gmail.com>
6 years agoLoRaTap/LoRaWAN: Add decode as and fix field types
Erik de Jong [Mon, 8 Jan 2018 20:09:51 +0000 (21:09 +0100)]
LoRaTap/LoRaWAN: Add decode as and fix field types

Allow LoRaTap syncword field to be used for "decode as".
Fix field types for LoRaWAN EUI fields to display as EUI-64 little endian.

Change-Id: I584f338031a4bc87e127d35a7bf8751a60e93d55
Reviewed-on: https://code.wireshark.org/review/25199
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>
6 years ago[lustre] Initial Lustre support
Nathaniel Clark [Tue, 19 Dec 2017 18:06:46 +0000 (13:06 -0500)]
[lustre] Initial Lustre support

This interperates the main body of Lustre traffic.
This dissects all current Lustre OPCODES (as of Lustre 2.10.2)
This dissects MDS REINT sub-opcodes
This dissects LDLM Intent opcodes
This dissects LLOG EADATA

Conversation matching is just IP based and not IP/port based.
Only one lustre "instance" can be running on a given host at a given time,
and request / reply pairs aren't don't always match by port numbers.

Add exception for lustre_* structure names in PROTOABBREV.
We have several lustre.lustre_* because the internal lustre structre is
named lustre_ (i.e. lustre_handle or lustre_msg_v2)

This is still a work in progress, as there are missing FLAG values
and some LLOG EADATA structures that aren't fully decoded.

Change-Id: If57085e2692565336e49f40fb475ca1035da7a35
Signed-off-by: Nathaniel Clark <nathaniel.l.clark@intel.com>
Reviewed-on: https://code.wireshark.org/review/24800
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years agoClean up dissection of "power requested" and "power available" TLVs.
Guy Harris [Tue, 9 Jan 2018 05:08:32 +0000 (21:08 -0800)]
Clean up dissection of "power requested" and "power available" TLVs.

Fix the addition of power values to the top-level item for the TLV so
that it actually adds power values.

Make the list of power values in that item display correctly, without
extra commas.

Fail if the length of the TLV is less than 8.  (We should really add an
expert info item for that.)

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