metze/wireshark/wip.git
5 years agotest: reduce further influence from the environment
Peter Wu [Fri, 12 Oct 2018 16:12:01 +0000 (18:12 +0200)]
test: reduce further influence from the environment

Some tests used the default home directory which can have side-effects
(such as loading plugins, loading deprecated preferences). These could
cause tests to fail. Always use a sane environment to fix this.

Change getTsharkInfo to use this clean environment as well
(WIRESHARK_CONFIG_DIR does not exist with master-2.6 and would also not
propagate things like ASAN_OPTIONS=detect_leaks=0).

Change-Id: I1674f71972d35de91d191e0c29fdb59b8a0a56ce
Reviewed-on: https://code.wireshark.org/review/30165
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agotest: fix DeprecationWarning: invalid escape sequence
Peter Wu [Fri, 12 Oct 2018 12:12:41 +0000 (14:12 +0200)]
test: fix DeprecationWarning: invalid escape sequence

Change-Id: I4e0365c1f9d30a033b26f68f815c8209b96d73f5
Reviewed-on: https://code.wireshark.org/review/30164
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agoMAC NR: fix dissection of Long Truncated BSR CE
Pascal Quantin [Fri, 12 Oct 2018 07:50:13 +0000 (09:50 +0200)]
MAC NR: fix dissection of Long Truncated BSR CE

As specified in 3GPP 38.321, in case of Long Truncated BSR CE, the UE
reports the BSR value for the LCG(s) with the logical channels having
data available for transmission following a decreasing order of the
highest priority logical channel (with or without data available for
transmission) in each of these LCG(s), and in case of equal priority,
in increasing order of LCGID.
SO we cannot make any assumption on the LCG being reported without
keeping track of the logical channel priorities currently active.

Change-Id: I148a13446e9dc035bb1bcd79cb15d8570bcefa57
Reviewed-on: https://code.wireshark.org/review/30151
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>

5 years agoieee80211: extend parsing of SAE messages
Joeri de Ruiter [Thu, 11 Oct 2018 10:45:10 +0000 (12:45 +0200)]
ieee80211: extend parsing of SAE messages

- Groups in the SAE exchange are named
- The SAE message type is included explicitly (Commit or Confirm)

Bug: 15197
Change-Id: I8d95dd1603bbb8f46675ec66d60fd0b187787803
Reviewed-on: https://code.wireshark.org/review/30127
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agoQUIC: fix null-ptr dereference in gQUIC version check
Peter Wu [Fri, 12 Oct 2018 11:20:07 +0000 (13:20 +0200)]
QUIC: fix null-ptr dereference in gQUIC version check

Bug: 15201
Change-Id: Idc9964347c251fe7f9599b90abc760f26d85a5ba
Fixes: v2.9.0rc0-2173-g9fcb4af6b6 ("QUIC: gQUIC Q044 always use CHLO from gQUIC (with tag)")
Reviewed-on: https://code.wireshark.org/review/30160
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
5 years agodtn: fix spelling-error-in-binary found by lintian
Alexis La Goutte [Fri, 12 Oct 2018 06:07:20 +0000 (06:07 +0000)]
dtn: fix spelling-error-in-binary found by lintian

Occurance -> Occurrence

Change-Id: I5dbe140f10f7a8b615c40fbf84a5fe2501ed46ff
Reviewed-on: https://code.wireshark.org/review/30140
Reviewed-by: Patricia Lindner <plindner6912@gmail.com>
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
5 years agoAlso need a period at the end of the "Built using" clause.
Guy Harris [Fri, 12 Oct 2018 07:30:44 +0000 (00:30 -0700)]
Also need a period at the end of the "Built using" clause.

Change-Id: Ia872e912f1331ef8d6b54b6751f5c132fbf0b4f3
Reviewed-on: https://code.wireshark.org/review/30148
Reviewed-by: Guy Harris <guy@alum.mit.edu>
5 years agoNeed a space between the VS year number and the toolchain version.
Guy Harris [Fri, 12 Oct 2018 07:23:13 +0000 (00:23 -0700)]
Need a space between the VS year number and the toolchain version.

Change-Id: I5e0047fde7a2d5a98767c6ed440b85575f711b9e
Reviewed-on: https://code.wireshark.org/review/30145
Reviewed-by: Guy Harris <guy@alum.mit.edu>
5 years ago3.0 requires VS 2015 or later.
Guy Harris [Fri, 12 Oct 2018 06:32:44 +0000 (23:32 -0700)]
3.0 requires VS 2015 or later.

Change-Id: I20c40ea923df12747f6aec9dd672b3a9a1d6403f
Reviewed-on: https://code.wireshark.org/review/30144
Reviewed-by: Guy Harris <guy@alum.mit.edu>
5 years agoClean up MSVC version string generation.
Guy Harris [Fri, 12 Oct 2018 05:12:29 +0000 (22:12 -0700)]
Clean up MSVC version string generation.

Don't bother with versions prior to VS 2010; as of Wireshark 2.4, we
don't support them.

Show it as "Visual Studio (year)", followed by the toolchain version
(not to be confused with the compiler version - or with the Visual
Studio version!).

Do the same thing for the clang/C2 compiler; just append the clang
version stuff after that.

Indent the #if/#elif/#else/#endif to make it a little clearer how
they're nested.

Change-Id: Ib7a3af3251e6375d267b3b5da9f8e26a377ceeac
Reviewed-on: https://code.wireshark.org/review/30138
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>
5 years agoDCOM: always NUL-terminate dissect_dcom_BSTR results
Peter Wu [Thu, 11 Oct 2018 11:04:03 +0000 (13:04 +0200)]
DCOM: always NUL-terminate dissect_dcom_BSTR results

All of the six users in plugins/epan/profinet/packet-dcom-cba.c expect
the string to be NUL-terminated, so ensure this to avoid reading
uninitialized memory for the Info column.

Bug: 15130
Change-Id: Ibc922068d14b87ce324af3cec22a5f8343088b40
Reviewed-on: https://code.wireshark.org/review/30128
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agowmem_tree: fix crash with wmem_tree_destroy and NULL scope
Peter Wu [Thu, 11 Oct 2018 10:14:00 +0000 (12:14 +0200)]
wmem_tree: fix crash with wmem_tree_destroy and NULL scope

The function was documented for use with a NULL scope, but it actually
crashes since callbacks are not available for NULL scopes. git master
is unaffected, but the GTK+ protocol dialog in 2.4 and 2.6 do crash.

Bug: 14349
Change-Id: I54350e112192394797cf85eaac4f30194178d7c4
Fixes: v2.3.0rc0-2597-gb7d6cca4ae ("Add wmem_tree_destroy")
Reviewed-on: https://code.wireshark.org/review/30126
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agoDCERPC: fix memleak by removing dummy element from ndr_pointer_list
Peter Wu [Wed, 10 Oct 2018 13:41:42 +0000 (15:41 +0200)]
DCERPC: fix memleak by removing dummy element from ndr_pointer_list

Instead of creating the pointers list early, defer it to the point when
a new list item is added. This avoids the need for a dummy element.

This happens to fix the memory leak in bug 14735 as well (verified with
both ASAN and valgrind).

Change-Id: I3b169dfc447bd7465d06c26e0bd9dfd4225b1307
Bug: 14735
Reviewed-on: https://code.wireshark.org/review/30115
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agoDCERPC: simplify pointer list tracking
Peter Wu [Wed, 10 Oct 2018 12:46:14 +0000 (14:46 +0200)]
DCERPC: simplify pointer list tracking

Observe that the "current_depth" and "len_ndr_pointer_list" just track
the length of the current singly linked list in order to insert (append)
or remove [the last] element (a linked list of lists and a linked list
of pointers respectively). Replace these callers by equivalents that do
not require explicit length tracking, internally they both have to do a
O(n) lookup anyway.

There used to be a case where "current_depth" could run out-of-sync, no
longer tracking the actual list length: when the callback (tnpd->fnct or
tnpd->callback) triggers an exception. I believe this was unintentional.

No functional change intended, but this should make further changes to
the data structures easier.

Change-Id: I3cb13aba22caa87dc7baba411cf34f47792f7bb7
Ping-Bug: 14735
Fixes: v2.5.0rc0-292-g6bd87bdd5d ("dcerpc: improve greatly the speed of processing of DCERPC packets")
Reviewed-on: https://code.wireshark.org/review/30114
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agotvbuff_composite: fix buffer overflow due to wrong offset adjustment
Peter Wu [Wed, 10 Oct 2018 22:02:26 +0000 (00:02 +0200)]
tvbuff_composite: fix buffer overflow due to wrong offset adjustment

The tvb_offset method should return the offset of the buffer within the
backing tvb (ds_tvb). The currently returned non-zero offset is valid
for tvbuff_subset.c, but not for the composite TVB. The backing tvb is
the tvb itself, so the offset should be zero (or "counter" for
consistency with tvbuff_real.c and others).

This bug is observable with the capture from the bug. In tshark, the
data field in the PDML output has value "field length invalid!" and the
position attribute ("pos") is too large. With the -V option it even
crashes with a buffer overflow (read). In the GUI, the bytes tab shows
range 3199-19642 even if the data source is only 16444 bytes while the
selection should have been 0-16443.

Bug: 14466
Change-Id: I01399ff500321dba262eb60b67c4cddb173b4679
Reviewed-on: https://code.wireshark.org/review/30124
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agoieee802154: Show FCF reserved bit
Stig Bjørlykke [Thu, 11 Oct 2018 19:54:08 +0000 (21:54 +0200)]
ieee802154: Show FCF reserved bit

Change-Id: Ibd18e988a3c0692c1a5eccb2db1abf87947f3c03
Reviewed-on: https://code.wireshark.org/review/30131
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agoTools: Compress our tarball using threads.
Gerald Combs [Thu, 11 Oct 2018 22:08:23 +0000 (15:08 -0700)]
Tools: Compress our tarball using threads.

Check to see if xz supports threads and enable them if that's the case.

Change-Id: I8a0e7100fec98e5b7d7ccd9a987f7782bf7c7512
Reviewed-on: https://code.wireshark.org/review/30137
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agoeap: don't dissect the identity as IMSI unless that's the case.
Dario Lombardo [Thu, 11 Oct 2018 12:20:22 +0000 (14:20 +0200)]
eap: don't dissect the identity as IMSI unless that's the case.

The identity in SIM/AKA/AKA' is IMSI (permanent identity) in some cases only.
Others contain a pseudonym or a fast reauthentication username. Dissect the
formers as flat usernames.

Bug: 15196
Change-Id: Ia4491431b6ff557a248271b743c1e37c4e6c0b24
Reviewed-on: https://code.wireshark.org/review/30129
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
5 years agotext2pcap: Fix TCP, UDP or SCTP headers over IPv6
Vasil Velichkov [Tue, 9 Oct 2018 21:40:04 +0000 (00:40 +0300)]
text2pcap: Fix TCP, UDP or SCTP headers over IPv6

When the IPv6 (-6) option was specified together with either TCP (-T),
UDP (-u) or SCTP (-s/-S) option the generated packet was invalid because
an IPv4 option was implied an a wrong header was added.

Bug: 15194
Change-Id: I5a7b83d8aa3f3ad56f0c8110e598090945e60225
Reviewed-on: https://code.wireshark.org/review/30107
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
5 years agowsutil: Add config_file_exists_with_entries()
Stig Bjørlykke [Wed, 10 Oct 2018 12:33:40 +0000 (14:33 +0200)]
wsutil: Add config_file_exists_with_entries()

The purpose of this function is to check if a configuration file exists
and has at least one entry which is not a comment.

Use this when building the list of profiles where the user can copy
configuration from, to avoid listing profiles with empty files or files
with only comments.

Change-Id: If45f52025959818fb1213ffac488cd59441e9fce
Reviewed-on: https://code.wireshark.org/review/30113
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
5 years agoDCERPC: remove unused variable and mark another global as static
Peter Wu [Wed, 10 Oct 2018 13:57:16 +0000 (15:57 +0200)]
DCERPC: remove unused variable and mark another global as static

dcerpc_hooks_init_protos is unused since v1.11.3-rc1-34-g01c8945438.
uuid_dissector_table was added in v2.1.0rc0-391-ge0e574d167 and was not
used outside the file, so mark it as static.

Change-Id: I6113fbaf1f2e2e6241b91b659711986d6e6ded66
Reviewed-on: https://code.wireshark.org/review/30116
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
5 years agoQUIC: gQUIC Q044 always use CHLO from gQUIC (with tag)
Alexis La Goutte [Mon, 10 Sep 2018 20:35:10 +0000 (22:35 +0200)]
QUIC: gQUIC Q044 always use CHLO from gQUIC (with tag)

Bug: 15131
Change-Id: I26af8d31939725824fd57000bc9ce57e8034def9
Reviewed-on: https://code.wireshark.org/review/29575
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
5 years agoMAC NR: call NR RRC dissector for broadcast and common channels
Pascal Quantin [Wed, 10 Oct 2018 16:38:31 +0000 (18:38 +0200)]
MAC NR: call NR RRC dissector for broadcast and common channels

Change-Id: I70b7356e15023400189a4ab57a41473da7363374
Reviewed-on: https://code.wireshark.org/review/30121
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
Tested-by: Petri Dish Buildbot
5 years agoMAC NR: upgrade dissector to v15.3.0
Pascal Quantin [Wed, 10 Oct 2018 14:57:00 +0000 (16:57 +0200)]
MAC NR: upgrade dissector to v15.3.0

Change-Id: I017c04d44ed156ced140bb96e153a8738f143f62
Reviewed-on: https://code.wireshark.org/review/30117
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
5 years agoWindows: Make our program details more consistent.
Gerald Combs [Mon, 8 Oct 2018 23:34:39 +0000 (16:34 -0700)]
Windows: Make our program details more consistent.

Use a single template file for most of our program resources. Encode
our resource files as UTF-8. Add resources to extcap/*.exe.

Replace a regex with concatenation.

Change-Id: I0ed49086618127ca4fdef69272f849d8f16e4dab
Reviewed-on: https://code.wireshark.org/review/30088
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
5 years agoDiameter: add a few more AVPs from 3GPP 29.272 v15.5.0
Pascal Quantin [Wed, 10 Oct 2018 11:12:33 +0000 (13:12 +0200)]
Diameter: add a few more AVPs from 3GPP 29.272 v15.5.0

Change-Id: Id01c2c79b0923eb469ab03f7cbc7fe9e0be59a3d
Reviewed-on: https://code.wireshark.org/review/30112
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
5 years agoQUIC: fix UAF crash related to the Info column for Long Header messages
Peter Wu [Tue, 9 Oct 2018 20:01:16 +0000 (22:01 +0200)]
QUIC: fix UAF crash related to the Info column for Long Header messages

Packet 2478 in capture 15142 triggers a UAF crash since val_to_str is
packet-scoped and by the time tshark reads the column, it is destroyed.

Bug: 15142
Change-Id: If8df858c6a295fbac57c758577fb51b288e7f44a
Reviewed-on: https://code.wireshark.org/review/30104
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agocoap: ensure that piv_len matches piv
Peter Wu [Tue, 9 Oct 2018 17:18:34 +0000 (19:18 +0200)]
coap: ensure that piv_len matches piv

In frame 121, piv_len was 1 while piv was NULL. Ensure that both piv and
piv_len are reset to avoid this. Adjust another check to ensure that piv
and piv_len are in sync (probably not necessary, but it seems the
intention).

Bug: 15172
Change-Id: If8636d32f3273d6707749c807bd7d676ca9ab96d
Fixes: v2.5.2rc0-9-g830ea5731a ("CoAP: Hooks to OSCORE")
Reviewed-on: https://code.wireshark.org/review/30100
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agoQt: Add back pathLabel in some dialogs
Stig Bjørlykke [Tue, 9 Oct 2018 09:46:00 +0000 (11:46 +0200)]
Qt: Add back pathLabel in some dialogs

Add the pathLabel for Coloring Rules, Decode As, Display Filters
and Capture Filter. Put the absolute file path into the pathLabel
if the file exists. This aligns with UAT dialogs and frames.

Change-Id: I72bd06e31bab220de0a0ef8df99df9a4daed667c
Reviewed-on: https://code.wireshark.org/review/30089
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agoQt: Use regular size buttons on macOS
Stig Bjørlykke [Tue, 9 Oct 2018 17:09:27 +0000 (19:09 +0200)]
Qt: Use regular size buttons on macOS

Use regular size buttons in dialogs on macOS.

Change-Id: Iad769190b7f62297343eea4299e3f03ea6be4b1e
Reviewed-on: https://code.wireshark.org/review/30099
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agoexcept: detect exception stack corruption
Peter Wu [Tue, 9 Oct 2018 17:58:10 +0000 (19:58 +0200)]
except: detect exception stack corruption

Valgrind found an invalid read in the capture from Bug 15173 which was
not detected by ASAN, probably because 'top' pointed to a valid stack
address. Try to catch such issues with an explicit invariant check.

Change-Id: I3e2d90f053209c133ea2edc9c7990a2fd39bd236
Ping-Bug: 15189
Reviewed-on: https://code.wireshark.org/review/30101
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agocheckAPIs.pl: check for return/goto in TRY/CATCH blocks
Peter Wu [Tue, 9 Oct 2018 15:39:05 +0000 (17:39 +0200)]
checkAPIs.pl: check for return/goto in TRY/CATCH blocks

As documented in epan/exceptions.h, return/goto should never be used in
a TRY/CATCH/FINALLY block as ENDTRY must be executed first. Additionally
clamp the exit code since values larger than 255 will wrap around. Use a
small value as shells typically use 128+signal for termination signals.

Verified against packet-t125.c and ftype-protocol.c while they suffered
from the return bug. Tested against packet-gssapi.c for lack of false
positives (goto with labels within the function) and against:

    int main() {
        TRY {
            goto bar;
            goto omg;
            goto bar;
            goto barrie;
    barrie: ;
        } ENDTRY;
    bar: meh;
    }

Change-Id: I44484add34e238e07a84fc2c74b69f50ba6dc3f3
Ping-Bug: 15189
Reviewed-on: https://code.wireshark.org/review/30097
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agoT125: avoid returning from TRY/CATCH in dissect_t125_heur
Peter Wu [Tue, 9 Oct 2018 15:23:44 +0000 (17:23 +0200)]
T125: avoid returning from TRY/CATCH in dissect_t125_heur

Doing so corrupts the exceptions stack and causes crashes elsewhere.
Move the heuristics check after get_ber_identifier as dissect_t125
calls that check too.

Bug: 15189
Change-Id: I816fcd693141c5e9e2979348f58bf5a8112290da
Fixes: v2.9.0rc0-2122-gf710f21833 ("T125: Add a heuristic test case.")
Reviewed-on: https://code.wireshark.org/review/30096
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Émilio Gonzalez <egg997@gmail.com>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agoOSITP: do not call subdissector if there is no data
Peter Wu [Tue, 9 Oct 2018 19:25:35 +0000 (21:25 +0200)]
OSITP: do not call subdissector if there is no data

None of the current heuristics dissectors for "cotp" accept the packet,
so just skip calling subdissectors if the packet is empty.

Change-Id: Ie26f05d472b4d184d5229ceab8b143a88cc921fc
Reviewed-on: https://code.wireshark.org/review/30103
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Émilio Gonzalez <egg997@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agoftype-protocol: do not return from TRY/CATCH
Peter Wu [Tue, 9 Oct 2018 15:14:11 +0000 (17:14 +0200)]
ftype-protocol: do not return from TRY/CATCH

TRY/CATCH are macros, before returning the ENDTRY block must be executed
or the weirdest crashes can occur.

Change-Id: Ic56871322f8567263e2b8a81cce5a3c7042301b7
Fixes: v2.1.0rc0-2939-g5493fe0167 ("Convert ftype-tvbuff.c to ftype-protocol.c")
Reviewed-on: https://code.wireshark.org/review/30095
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agosteam-ihs: fix memleak on exception
Peter Wu [Tue, 9 Oct 2018 16:16:11 +0000 (18:16 +0200)]
steam-ihs: fix memleak on exception

When protobuf_dissect_unknown_field throws an exception,
steamdiscover_dissect_body_status will leak memory as
wmem_destroy_allocator is not called. Capture fuzz-2018-10-06-3104.pcap
from the linked bug leaks 64kiB memory in each frame 14 and 36.

Bug: 15171
Change-Id: I930d0738fde61799ab4ef2310f8ff11c1bcb032b
Fixes: v2.5.1rc0-130-g7ae954c7ac ("steam-ihs: Add dissector for the Steam IHS Discovery Protocol")
Reviewed-on: https://code.wireshark.org/review/30098
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agoxdmcp: fix indent
Alexis La Goutte [Tue, 2 Oct 2018 10:23:31 +0000 (12:23 +0200)]
xdmcp: fix indent

Change-Id: I97c95c30653771d6d144836408b2b2b8b3259421
Reviewed-on: https://code.wireshark.org/review/30102
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agoNAS EPS: upgrade dissector to v15.4.0
Pascal Quantin [Tue, 9 Oct 2018 14:47:35 +0000 (16:47 +0200)]
NAS EPS: upgrade dissector to v15.4.0

Change-Id: I7c392269b4f6ec38d12b2f6d637276b4e6a3c8c0
Reviewed-on: https://code.wireshark.org/review/30093
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
5 years agoNAS EPS: upgrade dissector to v15.4.0
Pascal Quantin [Tue, 9 Oct 2018 13:45:32 +0000 (15:45 +0200)]
NAS EPS: upgrade dissector to v15.4.0

Change-Id: I43c75c92beac87674bb1293ee4951e47560721d2
Reviewed-on: https://code.wireshark.org/review/30091
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
5 years agoLTE RRC: add missing lte_rrc.bcch_bch.nb.tdd dissector
Pascal Quantin [Tue, 9 Oct 2018 14:05:34 +0000 (16:05 +0200)]
LTE RRC: add missing lte_rrc.bcch_bch.nb.tdd dissector

Bug: 15190
Change-Id: Id3560dbc2bd539534f1750c3b8079a2f1e149375
Reviewed-on: https://code.wireshark.org/review/30092
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
5 years agoE1AP: upgrade dissector to v15.1.0
Pascal Quantin [Mon, 8 Oct 2018 10:03:41 +0000 (12:03 +0200)]
E1AP: upgrade dissector to v15.1.0

Change-Id: If0b27d7f70c15c7b760d1686a3cc9f78a3a2b24e
Reviewed-on: https://code.wireshark.org/review/30071
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>
5 years agoDOCSIS: Requested bytes in request frame is in units of N bytes, where N is a service...
Bruno Verstuyft [Mon, 8 Oct 2018 08:31:14 +0000 (10:31 +0200)]
DOCSIS: Requested bytes in request frame is in units of N bytes, where N is a service flow specific multiplier.

Change-Id: I5cd769bc170491215c25083420ec8b8b8d58c47f
Reviewed-on: https://code.wireshark.org/review/30069
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agosharkd: free initalized wtap_rec when wtap failed to read frame.
Jakub Zawadzki [Mon, 8 Oct 2018 20:50:41 +0000 (22:50 +0200)]
sharkd: free initalized wtap_rec when wtap failed to read frame.

Change-Id: I564a3704c0ea1b0df85f3cafacf790ed24591232
Reviewed-on: https://code.wireshark.org/review/30086
Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Jakub Zawadzki <darkjames-ws@darkjames.pl>
5 years agoQt: Add copy from another profile for UAT frames
Stig Bjørlykke [Mon, 8 Oct 2018 19:12:41 +0000 (21:12 +0200)]
Qt: Add copy from another profile for UAT frames

Add a new button to UAT frames to copy entries from another profile.

Change-Id: I9decb5ed5d67e97388ee7b22a15cacae4d5a3621
Reviewed-on: https://code.wireshark.org/review/30084
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
5 years agoQt: Refactor copy from profile widget
Stig Bjørlykke [Mon, 8 Oct 2018 18:57:19 +0000 (20:57 +0200)]
Qt: Refactor copy from profile widget

Refactor CopyFromProfile class from Button to Menu to make it
usable for existing buttons, both QPushButton and QToolButton.

Change-Id: I7d23b4225dbe45f961fb05e73dbb4dd51e6f8ea1
Reviewed-on: https://code.wireshark.org/review/30083
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
5 years agoRelease note updates.
Stig Bjørlykke [Mon, 8 Oct 2018 09:47:52 +0000 (11:47 +0200)]
Release note updates.

Add an entry for the copy from profile feature for coloring rules,
IO graphs and protocol preference tables.

Change-Id: I79a191c1ec13e96fcb1b5fb04dd28c95dd034aca
Reviewed-on: https://code.wireshark.org/review/30070
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agosharkd: prefer sharkd_json_value_string() over sharkd_json_value_stringf().
Jakub Zawadzki [Mon, 8 Oct 2018 11:19:20 +0000 (13:19 +0200)]
sharkd: prefer sharkd_json_value_string() over sharkd_json_value_stringf().

Don't use sharkd_json_value_stringf() if there is no need for it.

Change-Id: Ie375be1d91fc3bd20fae68df282ec14310055eba
Reviewed-on: https://code.wireshark.org/review/30075
Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Jakub Zawadzki <darkjames-ws@darkjames.pl>
5 years agoGSMTAP: update description of types
Shinjo Park [Mon, 8 Oct 2018 10:29:38 +0000 (12:29 +0200)]
GSMTAP: update description of types

Change-Id: Idf0b7b81192827e8c71876c47a66e275f31f32cb
Reviewed-on: https://code.wireshark.org/review/30074
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
5 years agoGSMTAP: add definitions for new LTE RRC channels
Shinjo Park [Mon, 8 Oct 2018 09:21:48 +0000 (11:21 +0200)]
GSMTAP: add definitions for new LTE RRC channels

Later release of 3GPP TS 36.331 added new LTE RRC channels. This commit
additionally defines LTE RRC message types existing in Release V15.3.0.

Change-Id: If20710c15823ed879bddde17355704c769845d0d
Reviewed-on: https://code.wireshark.org/review/30073
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
5 years agoUpdate the URL of the latest gsmtap.h
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>
5 years agoQt: Fix a typo in a tooltip
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>
5 years agoQt: Add clear all button to Decode As
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>
5 years agoQt: Remove unused pathLabel
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>
5 years agoPut the Windows-specific system library settings in CMakeLists.txt.
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>
5 years agoBring back arg_list_utf_16to8(), but have it just do UTF-16-to-UTF-8 mapping.
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>
5 years agoQt: Clean up indentation
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>
5 years agoQt: Fix Coloring Rules apply as filter button size
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>
5 years agoF1AP: upgrade dissector to v15.3.0
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>
5 years agoUse wsetargv.obj, and wmain() rather than main(), on Windows.
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>
5 years agoNGAP: prettify a bit mode fields
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>
5 years agoXnAP: upgrade dissector to v15.1.0
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>
5 years agoNGAP: use port number when matching address
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>
5 years ago[Automatic update for 2018-10-07]
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>
5 years agoQt: Add copy from another profile for IO Graphs
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>
5 years agoQt: Use ActionRole for the "copy from profile" button
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>
5 years agoieee80211: Update RSN cipher and key suite
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>
5 years agoradius: sync with FreeRADIUS
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>
5 years agoradius: sync with FreeRADIUS
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>
5 years agoBluetooth: ATT: Implement one FTMS/FTMP characteristic: Machine Status
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>
5 years agoFix Windows dumpcap -i TCP@
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>
5 years agodocsis: fixed crash caused by absence of NULL termination of bitmask_list
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>
5 years agoQt: Call createIOGraph() when duplicating an existing IO Graph
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>
5 years agoT125: Add a heuristic test case.
É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>
5 years agoNGAP: prettify dissection
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>
5 years agoS1AP: prettify TrafficLoadReductionIndication IE decoding
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>
5 years agoX2AP: fix dissection of SeNB to MeNB Container
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>
5 years agoNR RRC: upgrade dissector to v15.3.0
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>
5 years agoDo not modify optarg with -zfollow,ssl,ascii,0
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>
5 years ago*shark: Update help and manpage for name resolving
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>
5 years agoQt: Add copy from another profile in UAT dialogs
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>
5 years agoQt: Add copy from another profile for colorfilters
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>
5 years agoQt: add an hint to no interfaces label.
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>
5 years agoRLC-NR: Start to call PDCP dissector for complete SDUs
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>
5 years agowsutil: Add get_profile_dir()
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>
5 years agoRecognize -zfollow,ssl,ascii,0 for compatibility
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>
5 years agogprscdr: Update to 3GPP TS 32.298 V15.4.0
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>
5 years agopfcp: Update to 3GPP TS 29.244 V15.3.0
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>
5 years agoRevert "Use CMAKE_EXE_LINKER_FLAGS to set link flags on executables."
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
5 years agoieee80211: register some etts.
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>
5 years agoh248_3gpp: register an ett.
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>
5 years agoPFCP: Join flags in Usage Report Trigger and Reporting Triggers
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>
5 years agoIEEE 1909.3: Add PSID values value_string.
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>
5 years agoLTE RRC: fix RLC configuration for NB-IoT UE
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>
5 years agoCMP: adding p10cr PKIbody dissection
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>
5 years agoRevert "gsm-a-common: Use expert info on "to few bytes left""
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>
5 years agoXDMCP: fix assertion failure due to tvb not being passed
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>
5 years agoQt: show more infos about why interfaces are not loaded.
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>
5 years agoAdd new PKCS#10 support to release notes
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>
5 years agoCMP: cleaning out excessive exports
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>
5 years agoAdd new file formats to the release notes.
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>