Shinjo Park [Mon, 8 Oct 2018 09:10:46 +0000 (11:10 +0200)]
Update the URL of the latest gsmtap.h
Change-Id: I528f769a2981a2cc8113349e69629fc9fc49c7f1
Reviewed-on: https://code.wireshark.org/review/30072
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Stig Bjørlykke [Mon, 8 Oct 2018 08:28:34 +0000 (10:28 +0200)]
Qt: Fix a typo in a tooltip
Change-Id: I71c8193d5352f9ac58541dc56b58cf3e85275f6e
Reviewed-on: https://code.wireshark.org/review/30068
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Stig Bjørlykke [Sun, 7 Oct 2018 17:45:15 +0000 (19:45 +0200)]
Qt: Add clear all button to Decode As
Add a clear all button to easily remove all existing entries.
Change-Id: I76e7ee2b7b85a9b4e5f9f5a788a89f38f70ee8ce
Reviewed-on: https://code.wireshark.org/review/30052
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Stig Bjørlykke [Sun, 7 Oct 2018 20:15:30 +0000 (22:15 +0200)]
Qt: Remove unused pathLabel
Change-Id: Id1c40f231f49f75210af43fa2a5cfbe3937d9ca1
Reviewed-on: https://code.wireshark.org/review/30055
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Guy Harris [Mon, 8 Oct 2018 03:38:51 +0000 (20:38 -0700)]
Put the Windows-specific system library settings in CMakeLists.txt.
We already do that for the macOS-specific system libraries; do it for
the Windows-specific system libraries as well.
Change-Id: I4646cbf5043406a9b6be70307b51df2fbe0329dd
Reviewed-on: https://code.wireshark.org/review/30066
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Guy Harris [Mon, 8 Oct 2018 02:04:50 +0000 (19:04 -0700)]
Bring back arg_list_utf_16to8(), but have it just do UTF-16-to-UTF-8 mapping.
Call it from wmain() in the command-line tools, passing it the input
argument count and vector, and call it from main() in Wireshark, after
getting a UTF-16 argument vector from passing the result of
GetCommandLineW() to CommandLineToArgvW().
Change-Id: I0e51703c0a6c92f7892d196e700ab437bd702514
Reviewed-on: https://code.wireshark.org/review/30063
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Stig Bjørlykke [Sun, 7 Oct 2018 20:26:34 +0000 (22:26 +0200)]
Qt: Clean up indentation
Change-Id: Idbae503b44c207d71431159a3eaf762e1dc79977
Reviewed-on: https://code.wireshark.org/review/30056
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Stig Bjørlykke [Sun, 7 Oct 2018 20:01:23 +0000 (22:01 +0200)]
Qt: Fix Coloring Rules apply as filter button size
Change-Id: I3847f10b8b337b6df4f86b920dcf11b73b35b869
Reviewed-on: https://code.wireshark.org/review/30054
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Pascal Quantin [Sun, 7 Oct 2018 17:20:29 +0000 (19:20 +0200)]
F1AP: upgrade dissector to v15.3.0
Change-Id: Ic9de8506b156c50cc79b8e615da882b22a2408b4
Reviewed-on: https://code.wireshark.org/review/30053
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Guy Harris [Sun, 7 Oct 2018 17:06:00 +0000 (10:06 -0700)]
Use wsetargv.obj, and wmain() rather than main(), on Windows.
Doing so for command-line programs means that the argument list doesn't
ever get converted to the local code page; converting to the local code
page can mangle file names that *can't* be converted to the local code
page.
Furthermore, code that uses setargv.obj rather than wsetargv.obj has
issues in some versions of Windows 10; see bug 15151.
That means that converting the argument list to UTF-8 is a bit simpler -
we don't need to call GetCommandLineW() or CommandLineToArgvW(), we just
loop over the UTF-16LE argument strings in argv[].
While we're at it, note in Wireshark's main() why we discard argv on
Windows (Qt does the same "convert-to-the-local-code-page" stuff); that
means we *do* need to call GetCommandLineW() and CommandLineToArgvW() in
main() (i.e., we duplicate what Qt's WinMain() does, but converting to
UTF-8 rather than to the local code page).
Change-Id: I35b57c1b658fb3e9b0c685097afe324e9fe98649
Ping-Bug: 15151
Reviewed-on: https://code.wireshark.org/review/30051
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Pascal Quantin [Sun, 7 Oct 2018 14:56:14 +0000 (16:56 +0200)]
NGAP: prettify a bit mode fields
Change-Id: Ifcc04d88a4476989eca0fc88ba70b6dc5aa326fd
Reviewed-on: https://code.wireshark.org/review/30050
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Pascal Quantin [Sat, 6 Oct 2018 18:01:58 +0000 (20:01 +0200)]
XnAP: upgrade dissector to v15.1.0
Change-Id: I2e15944580043774176956e896f360eb5a5711c8
Reviewed-on: https://code.wireshark.org/review/30045
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Pascal Quantin [Sun, 7 Oct 2018 08:40:29 +0000 (10:40 +0200)]
NGAP: use port number when matching address
Change-Id: I1a8e1d37b9cf85dbb1a7b5d355251fd5bdd8c173
Reviewed-on: https://code.wireshark.org/review/30048
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Gerald Combs [Sun, 7 Oct 2018 08:29:17 +0000 (08:29 +0000)]
[Automatic update for 2018-10-07]
Update manuf, services enterprise numbers, translations, and other items.
Change-Id: I2d18df70f52949eda05f0b490870fd133866e6cd
Reviewed-on: https://code.wireshark.org/review/30046
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Stig Bjørlykke [Fri, 5 Oct 2018 21:35:14 +0000 (23:35 +0200)]
Qt: Add copy from another profile for IO Graphs
Add a new button to the IO Graphs dialog to copy entries from
another profile. Add a clear all button to easily remove all
existing entries before copying.
Change-Id: I66cb27163663e5f2223d0dd3f8566f0fbebb553c
Reviewed-on: https://code.wireshark.org/review/30043
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Stig Bjørlykke [Sat, 6 Oct 2018 11:47:25 +0000 (13:47 +0200)]
Qt: Use ActionRole for the "copy from profile" button
The correct role for the newly introduced copy from profile button is
ActionRole because it "causes changes to the elements within the dialog".
Change-Id: I8613d00c0fdb33f2873e999aea9a54ea1f49dffb
Reviewed-on: https://code.wireshark.org/review/30044
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Alexis La Goutte [Sat, 6 Oct 2018 09:49:08 +0000 (11:49 +0200)]
ieee80211: Update RSN cipher and key suite
Add new value (used by WPA3)
Issue reported by Philipp Ebbecke
Bug: 15168
Change-Id: Iff4a7332dfc57226b191ec34319f0b7a78e30ede
Reviewed-on: https://code.wireshark.org/review/30040
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Alexis La Goutte [Sat, 6 Oct 2018 10:23:06 +0000 (12:23 +0200)]
radius: sync with FreeRADIUS
commit
d5d9b7d3742c12c28428694a8423ccfea00235c8
Author: Alan T. DeKok <aland@freeradius.org>
Date: Thu Oct 4 16:00:20 2018 -0400
this attribute is text, not binary. Fixes #2322
share/dictionary.rfc5580 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit
8ef2531d10741d8af298e9d2579357eec9477012
Author: Alejandro Perez <alex.perez-mendez@jisc.ac.uk>
Date: Tue Oct 2 13:54:26 2018 +0200
Add Moonshot-OTP-Secret attribute definition
share/dictionary.ukerna | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit
e0f302bcecf57cc5c87f0bc7a219e9322032c17a
Author: Alan T. DeKok <aland@freeradius.org>
Date: Tue Oct 2 09:48:20 2018 -0400
manual merge of commit
b5b27fedba8f
share/dictionary.ukerna | 3 +++
1 file changed, 3 insertions(+)
Change-Id: I2474ffc8717ec48249db6dfbb13f03d38e60d0d6
Reviewed-on: https://code.wireshark.org/review/30041
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Alexis La Goutte [Wed, 12 Sep 2018 05:47:50 +0000 (05:47 +0000)]
radius: sync with FreeRADIUS
commit
8ffdba5aa45427bfc13a1c4638ddbf0d49c7542b
Author: Peter Lemenkov <lemenkov@gmail.com>
Date: Sun Aug 19 20:44:06 2018 +0200
Proper letter case
IP-TOS-Field was renamed to IP-Tos-Field in commit
c6670b1ac3e137df8f0af47103a82d1a575330f3. Let's rename it back to avoid
any confusion.
Similar changes for 3GPP-RAT-Type in dictionary.3gpp and for
Unisphere-PPP-Protocol in dictionary.unisphere.
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
commit
43603a7234821354c69205a16945a19315e6fa4e
Author: Peter Lemenkov <lemenkov@gmail.com>
Date: Sun Aug 19 19:37:08 2018 +0200
Looks like this attribute should be 70
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
commit
070428a01041316c45f4670f709e0f37213a4255
Author: Peter Lemenkov <lemenkov@gmail.com>
Date: Sun Aug 19 19:36:47 2018 +0200
Remove duplicated attribute definitions
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
Change-Id: I71951e0fa677396860f61fcd66922b969054fe06
Reviewed-on: https://code.wireshark.org/review/29625
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Michał Łabędzki [Wed, 18 Apr 2018 15:56:36 +0000 (17:56 +0200)]
Bluetooth: ATT: Implement one FTMS/FTMP characteristic: Machine Status
Add support for "FiTness Machine Service" characteristics:
- 0x2ADA Fitness Machine Status
Change-Id: Ifceae6aba9f1849d1b9f027e54953385c0d1a98c
Reviewed-on: https://code.wireshark.org/review/30042
Petri-Dish: Michal Labedzki <michal.labedzki@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
James Ko [Fri, 5 Oct 2018 01:09:28 +0000 (18:09 -0700)]
Fix Windows dumpcap -i TCP@
Reading from a TCP socket in Windows must not change read state
variables to values required by cap_thread_read on pipes.
Bug: 15149
Change-Id: I1efa9288b5954dc4a18b2c68772c54a098a224e7
Reviewed-on: https://code.wireshark.org/review/29894
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Andrii Vladyka [Sat, 6 Oct 2018 05:44:13 +0000 (22:44 -0700)]
docsis: fixed crash caused by absence of NULL termination of bitmask_list
Change-Id: I41f86330366d939a12d0d70c63fe20e2220b8988
Reviewed-on: https://code.wireshark.org/review/30038
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>
Stig Bjørlykke [Fri, 5 Oct 2018 17:54:59 +0000 (19:54 +0200)]
Qt: Call createIOGraph() when duplicating an existing IO Graph
Call createIOGraph() when adding a new graph by duplicating
an existing to actually create the new graph.
This is a regression from g5b3e3ee5.
Change-Id: If1d8e4386a44dc4867d75fbad2d9ebb2e4b22307
Reviewed-on: https://code.wireshark.org/review/30034
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Émilio Gonzalez [Mon, 1 Oct 2018 14:04:53 +0000 (10:04 -0400)]
T125: Add a heuristic test case.
Looks for common T.125 packet types such as erectDomainRequest and
attachUserRequest. This correctly links COTP with T.125/MCS in case of
RDP traffic, which results in RDP traffic actually being dissected by
the RDP dissector.
Change-Id: I14eecc417cf5038779d78207ac0ccf2dd22a1219
Reviewed-on: https://code.wireshark.org/review/29960
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Pascal Quantin [Fri, 5 Oct 2018 18:02:18 +0000 (20:02 +0200)]
NGAP: prettify dissection
Change-Id: I7da88236143e573fe5ff3e1d39df4643de43129c
Reviewed-on: https://code.wireshark.org/review/30035
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Pascal Quantin [Fri, 5 Oct 2018 17:46:34 +0000 (19:46 +0200)]
S1AP: prettify TrafficLoadReductionIndication IE decoding
Change-Id: I87a861db1ebb931193918821a6c4656c61a91e47
Reviewed-on: https://code.wireshark.org/review/30033
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Pascal Quantin [Fri, 5 Oct 2018 16:01:53 +0000 (18:01 +0200)]
X2AP: fix dissection of SeNB to MeNB Container
Change-Id: I4f5af9d52646d74dfa264583b6f0a79e097527e7
Reviewed-on: https://code.wireshark.org/review/30032
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Pascal Quantin [Thu, 4 Oct 2018 15:53:19 +0000 (17:53 +0200)]
NR RRC: upgrade dissector to v15.3.0
Change-Id: Ie43e784b3bcfe391e2c8fca898ac20ec111f3484
Reviewed-on: https://code.wireshark.org/review/30019
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Peter Wu [Fri, 5 Oct 2018 10:33:13 +0000 (12:33 +0200)]
Do not modify optarg with -zfollow,ssl,ascii,0
Most callers (in tshark.c, ui/commandline.c, etc.) do not modify their
optarg argument, so don't do that here either.
Fixes: v2.9.0rc0-2110-g872b573381 ("Recognize -zfollow,ssl,ascii,0 for compatibility")
Change-Id: I80d56aee7ba80591b684d847a9cc95cf9a96c5dd
Reviewed-on: https://code.wireshark.org/review/30031
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Uli Heilmeier [Fri, 5 Oct 2018 06:54:55 +0000 (08:54 +0200)]
*shark: Update help and manpage for name resolving
Add 'v' option for VLAN ID resolving and get rid of
deprecated 'C' option.
Bug: 14826
Change-Id: I63104f4a465d251048693ad02882ea7eb2c4d926
Reviewed-on: https://code.wireshark.org/review/30029
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Stig Bjørlykke [Fri, 5 Oct 2018 06:33:24 +0000 (08:33 +0200)]
Qt: Add copy from another profile in UAT dialogs
Add a new button to UAT dialogs to copy entries from another profile.
Change-Id: I641ba764d8738f738466529d74d4a21ff13075a0
Reviewed-on: https://code.wireshark.org/review/30028
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Stig Bjørlykke [Fri, 5 Oct 2018 06:28:44 +0000 (08:28 +0200)]
Qt: Add copy from another profile for colorfilters
Add a new button to the Coloring Rules dialog to copy entries from
another profile, or system defaults. The "copy from profile" button
will also be used for other dialogs.
Add a clear all button to easily remove all existing entries before
importing or copying from another profile.
Change-Id: Ia1e66444731018372b4354164c5a722fd73d403b
Reviewed-on: https://code.wireshark.org/review/30008
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Dario Lombardo [Fri, 5 Oct 2018 07:57:06 +0000 (09:57 +0200)]
Qt: add an hint to no interfaces label.
Change-Id: Ifae80b5e3d56ddbea93164ff778196358976360d
Reviewed-on: https://code.wireshark.org/review/30030
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Martin Mathieson [Thu, 4 Oct 2018 13:59:17 +0000 (14:59 +0100)]
RLC-NR: Start to call PDCP dissector for complete SDUs
Change-Id: I1b61e2fb5c44a9f05d71e3605ae6312da41c8553
Reviewed-on: https://code.wireshark.org/review/30015
Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
Stig Bjørlykke [Fri, 5 Oct 2018 06:26:35 +0000 (08:26 +0200)]
wsutil: Add get_profile_dir()
Use this in profile_exists() and copy_persconffile_profile().
Change-Id: I48728038b086a38822ef71766b23db8050deb464
Reviewed-on: https://code.wireshark.org/review/30027
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Peter Wu [Thu, 4 Oct 2018 21:33:33 +0000 (23:33 +0200)]
Recognize -zfollow,ssl,ascii,0 for compatibility
Instead of reporting it as unsupported, silently map ssl to tls.
Change-Id: I4c7436872137749634590a99201f2b8222c69fb4
Fixes: v2.9.0rc0-1819-gcd95e197ca ("Start renaming SSL to TLS.")
Reviewed-on: https://code.wireshark.org/review/30025
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Joakim Karlsson [Thu, 4 Oct 2018 17:09:38 +0000 (01:09 +0800)]
gprscdr: Update to 3GPP TS 32.298 V15.4.0
Change-Id: I3f374191d6494fd77e3cb81299b8aed1eb926131
Reviewed-on: https://code.wireshark.org/review/30022
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Joakim Karlsson [Thu, 4 Oct 2018 16:22:28 +0000 (00:22 +0800)]
pfcp: Update to 3GPP TS 29.244 V15.3.0
Change-Id: I5aa129de90e3f249c42e2fe563e105f26002977d
Reviewed-on: https://code.wireshark.org/review/30021
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Guy Harris [Thu, 4 Oct 2018 18:09:14 +0000 (18:09 +0000)]
Revert "Use CMAKE_EXE_LINKER_FLAGS to set link flags on executables."
This reverts commit
84447550efdad68acfc69281750ed016f7f96716.
Reason for revert: CMake's documentation for the flags variables is
close to content-free, giving no indication what the link flags used
in the link will be, given a combination of various CMAKE.*LINKER_FLAGS
variables and LINK_FLAGS properties. That makes it extremely difficult
to determine why this change happens to cause some executables to
be linked with "/INCREMENTAL" and others to be linked with
"/INCREMENTAL:YES", even though we add "/INCREMENTAL:NO" to
WS_LINK_FLAGS and add WS_LINK_FLAGS to CMAKE_EXE_LINKER_FLAGS - or
why *not* setting CMAKE_EXE_LINKER_FLAGS and instead using LINK_FLAGS
*doesn't* cause that to happen.
Maybe it's an issue of CMAKE_EXE_LINKER_FLAGS vs.
CMAKE_EXE_LINKER_FLAGS_<CONFIG>, but the documentation doesn't
clearly indicate whether, for example, the link flags for a particular
executable target are a combination of CMAKE_EXE_LINKER_FLAGS, the
CMAKE_EXE_LINKER_FLAGS_<CONFIG> flag for the configuration of this
build, and the LINK_FLAGS property of the target, if any. That's
the most *obvious* behavior to implement, but if that's the behavior
that's implemented, I'm not sure why the change being reverted had the
effect it did.
Change-Id: I6a73fe88be65378d506a89460f7362076233f319
Reviewed-on: https://code.wireshark.org/review/30023
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Jeff Morriss [Thu, 4 Oct 2018 14:19:14 +0000 (10:19 -0400)]
ieee80211: register some etts.
Unregistered etts will lead to an assertion/abort when used.
Change-Id: I0322559358b1e286666322fef093e5b5123253a1
Reviewed-on: https://code.wireshark.org/review/30018
Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Jeff Morriss [Thu, 4 Oct 2018 14:07:36 +0000 (10:07 -0400)]
h248_3gpp: register an ett.
Unregistered etts will lead to an assertion/abort when used.
Change-Id: I2837311fcf472417ba36670e42073d15d475afd6
Reviewed-on: https://code.wireshark.org/review/30017
Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
slavka [Thu, 4 Oct 2018 10:56:13 +0000 (12:56 +0200)]
PFCP: Join flags in Usage Report Trigger and Reporting Triggers
Change-Id: Iab281fb3a12344a6a767a64c967f40cf2fc31427
Reviewed-on: https://code.wireshark.org/review/30012
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
AndersBroman [Thu, 4 Oct 2018 10:49:51 +0000 (12:49 +0200)]
IEEE 1909.3: Add PSID values value_string.
Bug: 13766
Change-Id: Ib0635d0748224f673f5349b83bca74a918000cab
Reviewed-on: https://code.wireshark.org/review/30011
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Pascal Quantin [Thu, 4 Oct 2018 11:26:30 +0000 (13:26 +0200)]
LTE RRC: fix RLC configuration for NB-IoT UE
R15 introduced UM mode for DRBs.
Change-Id: Ifd9030a46bcb237d6e6c1909f2dbad3be3a4eb86
Reviewed-on: https://code.wireshark.org/review/30014
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Martin Peylo [Wed, 3 Oct 2018 11:19:52 +0000 (14:19 +0300)]
CMP: adding p10cr PKIbody dissection
Enabled by now-existing PKCS#10 dissector
Change-Id: Ia4b7e998f2c61d482daf3f8b45c141bed31e6653
Reviewed-on: https://code.wireshark.org/review/30009
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Anders Broman [Thu, 4 Oct 2018 11:15:40 +0000 (11:15 +0000)]
Revert "gsm-a-common: Use expert info on "to few bytes left""
This test does not work when looking for optional elements.
This reverts commit
0cc8feb4b6bd5c2576ae5f11e947d172fe1e6cb1.
Change-Id: Ib6794c647f6e1541b7257a59c4717a6a497c3a8a
Reviewed-on: https://code.wireshark.org/review/30013
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Ian Chard [Thu, 4 Oct 2018 09:58:34 +0000 (10:58 +0100)]
XDMCP: fix assertion failure due to tvb not being passed
Bug: 15161
Change-Id: I9884e793fa40dde8c3c097b8d46b92ea012d8fef
Reviewed-on: https://code.wireshark.org/review/30010
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Dario Lombardo [Mon, 1 Oct 2018 20:09:33 +0000 (22:09 +0200)]
Qt: show more infos about why interfaces are not loaded.
Change-Id: Ie5a28587f711282fd5d83b5513b42594c73ca514
Reviewed-on: https://code.wireshark.org/review/29996
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Martin Peylo [Thu, 4 Oct 2018 06:15:16 +0000 (09:15 +0300)]
Add new PKCS#10 support to release notes
Added in commit
2d8e3939616afbcf1a8adc300b2e3e334a0bd768
Change-Id: I9a0daa0eaf24384da3b0ed9d0bc92fe868d02229
Reviewed-on: https://code.wireshark.org/review/30007
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Martin Peylo [Wed, 3 Oct 2018 10:42:29 +0000 (13:42 +0300)]
CMP: cleaning out excessive exports
Change-Id: Icd238a2be0978e02dfd0b3e7bee21c30ebbde6d4
Reviewed-on: https://code.wireshark.org/review/30002
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Gerald Combs [Wed, 3 Oct 2018 23:35:40 +0000 (16:35 -0700)]
Add new file formats to the release notes.
Change-Id: Ib46ce218063cb09a277ca0642a532120c9f27b2a
Reviewed-on: https://code.wireshark.org/review/30006
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Stig Bjørlykke [Wed, 3 Oct 2018 07:39:50 +0000 (09:39 +0200)]
Qt: Show global profiles in Italic
The Configuration Profiles dialog shows global profiles in Italic.
Align the profiles popup menu to also do this.
Change-Id: Ifc22f1bb905cd407682adbdc5e4cbee4c42cb961
Reviewed-on: https://code.wireshark.org/review/29989
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Pascal Quantin [Wed, 3 Oct 2018 20:27:47 +0000 (22:27 +0200)]
LPP: upgrade dissector to v15.1.0
Change-Id: Id11d25be9a86693b61be7dba04f86a4b222cf9d4
Reviewed-on: https://code.wireshark.org/review/30005
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Martin Peylo [Wed, 3 Oct 2018 10:33:21 +0000 (13:33 +0300)]
CRMF: cleaning out excessive exports
Change-Id: If0e95b6114d5a8d94b30d5d6e4bc330d8f43b939
Reviewed-on: https://code.wireshark.org/review/30001
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
AndersBroman [Wed, 3 Oct 2018 15:05:10 +0000 (17:05 +0200)]
IEEE 1909.3: Add version 3 dissection.
Bug: 13766
Change-Id: Ia4d7856d6692961cf0dab773c2a33b4f319add50
Reviewed-on: https://code.wireshark.org/review/29998
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Guy Harris [Wed, 3 Oct 2018 20:03:17 +0000 (13:03 -0700)]
Use CMAKE_EXE_LINKER_FLAGS to set link flags on executables.
Just set CMAKE_EXE_LINKER_FLAGS to include ${WS_LINK_FLAGS}, and also
set it to include setargv.obj on Windows.
This is a bit simpler.
Change-Id: Idf9c632d9d3bff1ec6e70396641319155e08aa4f
Reviewed-on: https://code.wireshark.org/review/30004
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Gerald Combs [Wed, 3 Oct 2018 16:38:44 +0000 (09:38 -0700)]
Tools: Add systemd-devel to rpm-setup.sh.
Change-Id: Ib6599926146b58cff66dda978c61b6a705f7565d
Reviewed-on: https://code.wireshark.org/review/30000
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Martin Mathieson [Wed, 3 Oct 2018 17:24:41 +0000 (18:24 +0100)]
MAC-NR: Update to current RAR PDU format
Change-Id: I802a74148386e972153b3cb9e2a25adb117811d6
Reviewed-on: https://code.wireshark.org/review/30003
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
Dario Lombardo [Mon, 1 Oct 2018 11:58:24 +0000 (13:58 +0200)]
debian: add libsystemd-journal-dev as alternative.
Required for building on ubuntu 14.04.
Change-Id: I2ebdceb1c73d093458adc05cf38629ac0b50c9e4
Reviewed-on: https://code.wireshark.org/review/29990
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Gerald Combs [Wed, 3 Oct 2018 16:30:55 +0000 (09:30 -0700)]
Debian: Add a missing symbol.
Change-Id: Id6135a51a25e22a03de6fd396786658cac9a25a0
Reviewed-on: https://code.wireshark.org/review/29999
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Martin Peylo [Wed, 3 Oct 2018 06:53:43 +0000 (09:53 +0300)]
New PKCS#10 CertificationRequest dissector
Specified in RFC2986
PEM header from RFC 7468
MIME type and .p10 file extension from RFC 5967
.csr file extension from common practice
Change-Id: I7dfe0a19b70eaf3352af2463759a342277d53db6
Reviewed-on: https://code.wireshark.org/review/29994
Reviewed-by: Anders Broman <a.broman58@gmail.com>
moguz [Fri, 28 Sep 2018 16:44:37 +0000 (09:44 -0700)]
PROFINET: ARServerblock is correctly dissected.
ARServerBlock function causes MalformedPacket error.
Padding in the function is fixed.
Change-Id: I498b1f15abcaab2a0be19096939fae5402747b68
Reviewed-on: https://code.wireshark.org/review/29899
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
(cherry picked from commit
c3b0bcaed51b80faaed1bdfbfae111ef162f9672)
Reviewed-on: https://code.wireshark.org/review/29993
Bruno Verstuyft [Wed, 3 Oct 2018 09:14:04 +0000 (11:14 +0200)]
MGCP: added NCS ResourceID
Change-Id: I561df5159243910356abb57624b20e630a2460d7
Reviewed-on: https://code.wireshark.org/review/29992
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Nick Calus [Wed, 3 Oct 2018 12:34:44 +0000 (14:34 +0200)]
epan: add missing comment for function parameter on register_tap_listener
Added parameter documentation that was missing for parameter tap_finish
on function register_tap_listener in epan/tap.h
Bug: 15162
Change-Id: I2b9f2a8816c049647128b317433b7dc21cc44f91
Reviewed-on: https://code.wireshark.org/review/29995
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Dario Lombardo <lomato@gmail.com>
Peter Wu [Wed, 3 Oct 2018 08:43:41 +0000 (10:43 +0200)]
TLS: support RFC 8449 - record_size_limit (28)
As seen in a capture from Firefox Nightly.
Change-Id: I0bb69b716c02df565f91afa2606d0957c79ee6fc
Reviewed-on: https://code.wireshark.org/review/29991
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
basakkal [Wed, 3 Oct 2018 06:49:18 +0000 (23:49 -0700)]
PROFINET: Decoding of DCP SetResBlock
At SetResBlock, the field "Response" should be "Option"
according to specification. It is corrected.
Moreover, hf and display filter are changed.
Change-Id: Ieae38616b130efc118673814f9fcee4241e75f05
Reviewed-on: https://code.wireshark.org/review/29988
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Alexis La Goutte [Sun, 16 Sep 2018 19:07:14 +0000 (19:07 +0000)]
.mailmap: update of September (2018)
Change-Id: Id7a13ba71feb78c87ac87f0acd7a63de15aaf7e3
Reviewed-on: https://code.wireshark.org/review/29684
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Peter Wu [Sat, 29 Sep 2018 17:05:45 +0000 (19:05 +0200)]
Qt/ByteViewTab: document potential pitfall
If ByteViewTab is related to a use-after-free crash, then the issue is
probably related to the backing buffer becoming invalid. Document this.
Change-Id: I7f7c8daaf86b42f00b7886de54507d425e5312f6
Reviewed-on: https://code.wireshark.org/review/29924
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
basakkal [Tue, 2 Oct 2018 11:59:23 +0000 (04:59 -0700)]
s7comm dissector infinite loop error is fixed.
When list_count and list_len are large numbers, their
multiplication exceeds guint16. The multiplication is casted to
guint32. list_len was controlled whether it is 0 or not. However,
list_count should also have been controlled. The control for
list_count is also added to the code. Moreover, if their
multiplication is equal to zero, it should be checked before or in
for loop since it causes infinite loop and it adds more than expected
szl data trees.
Change-Id: I4bb2c076ef830581e529fea05a1d9175feab171c
Reviewed-on: https://code.wireshark.org/review/29979
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Martin Peylo [Tue, 2 Oct 2018 14:08:38 +0000 (17:08 +0300)]
Adding string for "anyPolicy" OID to x509ce
Commonly used in the certificate policies extension of X.509 CA certificates.
Standardized in X.509 (and RFC 5280), existing in CertificateExtensions.asn
Change-Id: I788127e7ccea7a31f9f3419aa425e607e772b97b
Reviewed-on: https://code.wireshark.org/review/29981
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Martin Peylo [Tue, 2 Oct 2018 14:03:08 +0000 (17:03 +0300)]
Adding dissector for OIDs used in TCG X.509 Certificates
OIDs used in Trusted Computing Group X.509 Certificate Profiles are available in
https://www.trustedcomputinggroup.org/wp-content/uploads/Credential_Profile_EK_V2.0_R14_published.pdf
Example Certificates in PEM format are in Appendix A.
The relevant TCG OIDs are mostly used in certificate extensions like:
- subjectAltName
- extKeyUsage
- subjectDirectoryAttributes
Change-Id: Ifd44f598bea0b32b4471dfec2fd3af74f7a9e33e
Reviewed-on: https://code.wireshark.org/review/29983
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Peter Wu [Tue, 2 Oct 2018 17:00:01 +0000 (19:00 +0200)]
wsutil: get_datafile_dir: avoid hard-coded build directory
With autotools, it was possible that the binary was located in a .libs
directory, but with CMake the executables directory and data directory
are the same (except macOS with app bundles). Use this property to get
rid of the hard-coded build directory. Helps with reproducible builds.
Bug: 15163
Change-Id: I5b8807a03783a9919fba7b0cc83f5c162caa8052
Reviewed-on: https://code.wireshark.org/review/29984
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Guy Harris [Tue, 2 Oct 2018 21:06:21 +0000 (14:06 -0700)]
You have to add setargv.obj as a link flag, not as a library.
Change-Id: Iab00c28b8fdb5649a115fb7f006ba176d4a4223e
Reviewed-on: https://code.wireshark.org/review/29986
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Guy Harris [Tue, 2 Oct 2018 20:33:02 +0000 (13:33 -0700)]
We should only link executables with setargv.obj.
Libraries shouldn't be linked with it.
See if this fixes the weird problems I'm having with mergecap -
including, apparently, the mergecap from the buildbots - when run with
wildcard arguments, terminating before it gets to main() (making it hard
to try to debug bug 15151).
Change-Id: Ie793b0ea8157186a121106636ac8b782457c09f5
Reviewed-on: https://code.wireshark.org/review/29985
Reviewed-by: Guy Harris <guy@alum.mit.edu>
AndersBroman [Tue, 2 Oct 2018 14:59:58 +0000 (16:59 +0200)]
llc.c: Check ethertype 0x88DC and call the ethertype dissector.
Bug: 13766
Change-Id: I9e3527cd1a535e08b547925a0f2606da25520386
Reviewed-on: https://code.wireshark.org/review/29982
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
AndersBroman [Mon, 1 Oct 2018 12:52:50 +0000 (14:52 +0200)]
file-pcapng.c: Add the names of block types we know about.
Change-Id: I2c4edbac1cda370b0079492c5775330f9553d5a6
Reviewed-on: https://code.wireshark.org/review/29958
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Guy Harris [Tue, 2 Oct 2018 11:20:19 +0000 (04:20 -0700)]
Clean up some things.
Rename ascend_seek() to ascend_find_next_packet(), to indicate what it
does; it doesn't seek to an arbitrary place, it tries to find the
starting offset of the next packet when reading sequentially.
Don't have it set the header type - that's the job of the parser.
Don't set the "next packet seek start" when doing random access I/O -
that field is only for sequential I/O, and we don't want random I/O
happening at the same time (which can happen in Wireshark) interfering.
Clean up comments.
Change-Id: I2808479eeec074afa16945ffb577b91d8cb356f7
Reviewed-on: https://code.wireshark.org/review/29975
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Guy Harris [Tue, 2 Oct 2018 11:03:28 +0000 (04:03 -0700)]
Don't return TRUE with *err or *err_info set.
Read and seek-read routines shouldn't do that; it causes TShark to
report an error when there was no error.
Change-Id: If564348fa01dce83c6a2317ac56ac8716d514bf7
Reviewed-on: https://code.wireshark.org/review/29972
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Peter Wu [Mon, 1 Oct 2018 22:00:16 +0000 (00:00 +0200)]
TLS: fix reassembly regression when extending a PDU
The fragment identifier was changed, but fragment_set_partial_reassembly
was left unchanged which broke reassembly/decryption when a subdissector
finishes reassembly, but then requests further reassembly (like HTTP
with chunked encoding). This bug results in a faulty "Reassembly error,
protocol TLS: New fragment past old data limits" message.
Bug: 15158
Change-Id: I636ef623dd65c3feb58da29adf7125d8458f038f
Fixes: v2.9.0rc0-2003-gbe16d87c60 ("TLS: fix broken reassembly with multiple PDUs in the same frame")
Reviewed-on: https://code.wireshark.org/review/29967
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Gerald Combs [Mon, 1 Oct 2018 23:28:03 +0000 (16:28 -0700)]
CMake: Add a systemd RPM check.
Change-Id: Ib679994f5af129254865daad211913a6b068de12
Reviewed-on: https://code.wireshark.org/review/29968
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>
Émilio Gonzalez [Mon, 1 Oct 2018 14:05:25 +0000 (10:05 -0400)]
RDP: Changed some RDP info text to better indicate which packet type
we're dealing with.
Change-Id: I2cafefbdbaf6a4235afbae41969ed53f9c2e24c2
Reviewed-on: https://code.wireshark.org/review/29961
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Émilio Gonzalez [Mon, 1 Oct 2018 13:56:38 +0000 (09:56 -0400)]
Add .idea/ and cmake-build-*/ to gitignore (for jetbrains IDEs)
Change-Id: I70d8203cfa0a0c14f4df65d3a4bc9d5a1fbf12ae
Reviewed-on: https://code.wireshark.org/review/29959
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Guy Harris [Mon, 1 Oct 2018 04:23:04 +0000 (21:23 -0700)]
Fix handling of some ISDN calls.
There's no guarantee that there will be two digits after PRI-XMIT or
PRI-RCV; the capture file in bug 3535, for exmaple, has "PRI-XMIT-0/1"
and "PRI-RCV-0".
Require a minimum of 1, not 2, non-{/(:} characters. Leave the maximum
of 20 in place.
Change-Id: Ie8f8f4ff5eb04baf0ee61bf28015e59a1fa43948
Reviewed-on: https://code.wireshark.org/review/29947
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Gerald Combs [Mon, 1 Oct 2018 17:44:16 +0000 (10:44 -0700)]
pcapng: Fix a buffer length.
In pcapng_read_systemd_journal_export_block, increase our buffer length
before appending to it.
Change-Id: I7e0f695c9bf1a6f80bc7e65661bfd5c70cda7d31
Reviewed-on: https://code.wireshark.org/review/29964
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Gerald Combs [Mon, 1 Oct 2018 17:20:38 +0000 (10:20 -0700)]
Release note updates.
Switch the Capture Interfaces section to paragraphs and add one for
sdjournal.
Change-Id: I677a403bf2ea377214c6179f9f22facc9a4ff091
Reviewed-on: https://code.wireshark.org/review/29963
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Peter Wu [Sat, 29 Sep 2018 11:14:18 +0000 (13:14 +0200)]
wtap: fix regression in wtap_read_packet_bytes
The "first_free" pointer is currently only increaseed by
ws_buffer_increase_length (unused) and ws_buffer_append (for writes).
Reading into the buffer should not reduce the available space. Otherwise
the next wtap_read_packet_bytes call will reallocate the buffer.
This reallocation is unexpected by some users of cf_read_record and
results in a use-after-free crash following these steps:
1. Open packet capture.
2. Ignore packet.
3. Open context menu, twice.
This crashes because the ByteViewText class points to the buffer which
is reallocated after calling PacketList::getFilterFromRowAndColumn.
Change-Id: I4f1264a406a28c79491dcd77c552193bf3cdf62d
Fixes: v2.9.0rc0-2001-g123bcb0362 ("Make systemd journal entries events.")
Reviewed-on: https://code.wireshark.org/review/29915
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Alexis La Goutte [Sun, 30 Sep 2018 13:15:37 +0000 (15:15 +0200)]
ieee80211: Display always tag when it is ELEMENT_ID_EXTENSION
and following packet order for field
Change-Id: I724f3d87e02d182021e53eb9f78644420843e593
Reviewed-on: https://code.wireshark.org/review/29936
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Stig Bjørlykke [Mon, 1 Oct 2018 08:28:04 +0000 (10:28 +0200)]
Qt: Update UAT clear button enabling
Check for enabling the clear button when loading a UatDialog.
Also move setting enabled property to false for deleteToolButton,
copyToolButton, moveUpToolButton, moveDownToolButton and clearToolButton
to uat_dialog.ui.
Change-Id: I1ff3ed9906eb541e929297b34abcce2bee4a062c
Reviewed-on: https://code.wireshark.org/review/29953
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Gerald Combs [Wed, 5 Sep 2018 23:29:34 +0000 (16:29 -0700)]
Add a systemd Journal Export extcap.
Add an sdjournal extcap, which reads journal entries using the
sd-journal API and dumps them as journal Export Format records.
Change-Id: I17ccfa88ab5d053c16c869cd26e580d84022502e
Reviewed-on: https://code.wireshark.org/review/29479
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>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Stig Bjørlykke [Mon, 1 Oct 2018 08:14:19 +0000 (10:14 +0200)]
Qt: Set enabled properties in Filter Dialog
Default set enabled property to false for deleteToolButton and
copyToolButton because no item is selected.
Change-Id: I99bfb572abb9bc38cbf49c6b1fabdeefac4f8d90
Reviewed-on: https://code.wireshark.org/review/29951
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Stig Bjørlykke [Mon, 1 Oct 2018 07:56:49 +0000 (09:56 +0200)]
Qt: Set enabled properties in Coloring Rules Dialog
Default set enabled property to false for deleteToolButton and
copyToolButton because no item is selected.
Change-Id: I6ead2fa17cf1fd5bc165526fb76d104af6d5234d
Reviewed-on: https://code.wireshark.org/review/29949
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Adrian Simionov [Mon, 1 Oct 2018 05:46:50 +0000 (15:46 +1000)]
DOCSIS: Fix UCC-REQ
* UCC-REQ does not contain any Annex C TLVs
* Align INFO field for UCC REQ and RSP to similar DOCSIS packets
Change-Id: I2cdad12aaf5036b9130c8af3d131ee3a6b317923
Reviewed-on: https://code.wireshark.org/review/29948
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Peter Wu [Sun, 30 Sep 2018 10:07:49 +0000 (12:07 +0200)]
ieee80211: fix addresses for ToDS=1|FromDS=1 case
For Data frames with ToDs=1|FromDS=1 and a Frame body containing A-MSDU,
the Addr3 and Addr4 fields are not Destination/Source addresses (DA/SA),
but BSSID/BSSID. Use the RA/TA fields for the Hw Dest/Src columns and
add another BSSID field for Addr4 (should match Addr3, but in theory the
wire format could have different values).
While at it, fix the A-MSDU case for other cases to match 802.11-2016
Table 9-26 Address field contents. The "Short A-MSDU" case as used by
DNG STAs are not handled here though.
Tested against a capture with MSDU frames (all but ToDS=1|FromDS=1) and
the test case from the linked bug.
Bug: 15144
Change-Id: Ic832d7cd7b8e05a1408353cb79c07efed0fb19cc
Reviewed-on: https://code.wireshark.org/review/29935
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Peter Wu [Sun, 30 Sep 2018 22:42:21 +0000 (00:42 +0200)]
QUIC: fix trailing data after VN packet
The returned offset must be non-zero or the data dissector is invoked.
Change-Id: Iaff6e1f19fc94e17b41ad06a8be491fbec4835ba
Fixes: v2.9.0rc0-1797-g91c5942c93 ("QUIC: implement packet coalescing (draft >= 11)")
Reviewed-on: https://code.wireshark.org/review/29945
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Guy Harris [Mon, 1 Oct 2018 00:57:39 +0000 (17:57 -0700)]
Put the FILE_T first in the arguments to parse_dbs_etherwatch_packet().
That puts the two arguments to fill in - the wtap_rec and the Buffer -
together.
Change-Id: I8850a7aaccc98e5acd292e3cebc1f37cee8a6ce7
Reviewed-on: https://code.wireshark.org/review/29946
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Guy Harris [Sun, 30 Sep 2018 21:27:45 +0000 (14:27 -0700)]
Fix the type of the packet data argument to get_xdlc_control().
It's a blob of bytes, so the right type is guint8 *, not guchar *.
Change-Id: I74afa95da1e14866af68f1580cfbccd55f08ed65
Reviewed-on: https://code.wireshark.org/review/29944
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Guy Harris [Sun, 30 Sep 2018 21:24:48 +0000 (14:24 -0700)]
Fix the type of the packet buffer argument to a capture dissector.
It's a blob of bytes, so the right type is guint8 *, not guchar *.
(Yes, in practice, they're both typedefs for "unsigned char" - sadly,
C's data types didn't make a distinction between "byte-sized integral
value" and "character" - but given that we have different names, let's
use them to make it clearer what's being done.)
Change-Id: Idb10a208877c84df0432043d69d4aff5a2b2f803
Reviewed-on: https://code.wireshark.org/review/29943
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Guy Harris [Sun, 30 Sep 2018 21:06:37 +0000 (14:06 -0700)]
Show the *per-file* encapsulation in the __tostring method.
We use the per-file encapsulation everywhere else; use it there as well.
Change-Id: I3e3df234a9f541a9d90e54a3c0f41b5019e00bb3
Reviewed-on: https://code.wireshark.org/review/29940
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Guy Harris [Sun, 30 Sep 2018 19:40:48 +0000 (12:40 -0700)]
Remove unnecessary clearing of *err.
wtap_read() clears it for you.
Change-Id: I736509d54ff385e5b80e9393aeb91c6473b02824
Reviewed-on: https://code.wireshark.org/review/29939
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Alexis La Goutte [Sun, 30 Sep 2018 13:34:02 +0000 (15:34 +0200)]
ieee80211: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
Change-Id: I357728e347fca35c73864f4ba81949183d5ba34d
Reviewed-on: https://code.wireshark.org/review/29937
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
git.samba.org / metze / wireshark / wip.git / log