Peter Wu [Wed, 19 Dec 2018 20:35:17 +0000 (21:35 +0100)]
test: enable extra test summary by default
This reports the reason why tests are skipped (for example, if a certain
binary was not built).
Change-Id: I19095f43f69228116d71b52380814a61894754af
Reviewed-on: https://code.wireshark.org/review/31131
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Peter Wu [Wed, 19 Dec 2018 20:19:38 +0000 (21:19 +0100)]
tshark: handle option -c when ENABLE_PCAP=OFF
Option '-c' is not only a capture option, it also affects offline reads
as documented in the tshark manual. Fixes failing tests since
v2.9.1rc0-18-g5bf37f63a8 ("text2pcap: allow to set interface name").
Change-Id: Iffe4fd60f62766282e1a8b02a942673ba4e605f0
Reviewed-on: https://code.wireshark.org/review/31130
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Gerald Combs [Wed, 19 Dec 2018 17:56:22 +0000 (09:56 -0800)]
Qt: Convert more "pressed" signals to "clicked".
Convert the "pressed" signals in the interface toolbar, LTE RLC
statistics dialog, and path chooser delegate to "clicked".
Change-Id: I86de6d2d019133d7ae85c39956388859065a3af2
Reviewed-on: https://code.wireshark.org/review/31126
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Gerald Combs [Wed, 19 Dec 2018 18:24:49 +0000 (10:24 -0800)]
Qt: Switch module preferences to new-style signals and slots.
Switch ModulePreferencesScrollArea to compile time signals and slots.
Change-Id: Ic984c4a0b4538925f97e648695f4dcdc2699675c
Reviewed-on: https://code.wireshark.org/review/31127
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Joakim Karlsson [Mon, 17 Dec 2018 22:52:07 +0000 (23:52 +0100)]
CMake: make use of sdjournal build flag
With this change CMake will not build sdjournal when
feature turned off
Change-Id: I896c8286b95abdf7ec668c4ab6c8dfacc930be03
Reviewed-on: https://code.wireshark.org/review/31086
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Gerald Combs [Wed, 19 Dec 2018 17:20:02 +0000 (09:20 -0800)]
Qt: Open our preference dialogs via "clicked" signals.
In ModulePreferencesScrollArea we create QPushButtons that open modal
UAT and file dialogs. Open them via the "clicked" signal instead of
the "pressed" signal. "clicked" is a general activation signal that
fires after the mouse button has been clicked+released or a keyboard
event. "pressed" fires before "released" and can be problematic in
some cases.
Bug: 15366
Change-Id: Icb353d86ae0a4b4b97e5f63df791ec562070756d
Reviewed-on: https://code.wireshark.org/review/31123
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Steve Osselton [Wed, 19 Dec 2018 08:07:53 +0000 (08:07 +0000)]
Thrift: Update to use guint32 for iterator to eliminate cast
Change-Id: Ida45d01f8349bbd61f31bea0edb16024193c8e69
Reviewed-on: https://code.wireshark.org/review/31116
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Vadim Yanitskiy [Mon, 12 Nov 2018 19:45:15 +0000 (02:45 +0700)]
GSUP/SMS: add READY-FOR-SM message decoding
According to 3GPP TS 29.002, section 12.4, MAP-READY-FOR-SM is
used between the MSC and VLR as well as between the VLR and the
HLR to indicate that a subscriber has memory available for SMS.
This change replicates this service in GSUP as READY_FOR_SM_*.
The only mandatory IE for this service (excluding Invoke ID) is
'Alert Reason' that is replicated by OSMO_GSUP_SM_ALERT_RSN_IE.
For more information, please see:
https://git.osmocom.org/libosmocore/commit/?id=
f9ee8da0cda6a8989c706e618915d09c9cffd0f4
https://git.osmocom.org/osmo-gsm-manuals/commit/?id=
d1596fe75aba94e485b1dfcee32328086bf54e22
Change-Id: Ie7591066af7446b2df8bfdb03ef790b4478d2bc9
Reviewed-on: https://code.wireshark.org/review/30587
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Stig Bjørlykke [Wed, 19 Dec 2018 07:17:33 +0000 (08:17 +0100)]
rfc7468: Fix a memory leak
Read the base64 decoded data into a wmem_alloc memory to avoid
a memory leak for each opened file.
Change-Id: I4cbb2c15dea43183ed741d54ae7c6ea2e83e46c0
Reviewed-on: https://code.wireshark.org/review/31112
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Steve Osselton [Tue, 18 Dec 2018 15:55:39 +0000 (15:55 +0000)]
Thrift: Update to support Set types
Change-Id: I8d513c005b6c6221364b695a584267fd57c5f8b8
Reviewed-on: https://code.wireshark.org/review/31094
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Guy Harris [Wed, 19 Dec 2018 07:13:02 +0000 (23:13 -0800)]
Don't free something before freeing some of its contents.
Free the wspstat_t only after freeing the hash table contained in it.
Change-Id: I2aa31d74b6d0f86e5404a9b614fee8a3f6708938
Ping-Bug: 15365
Reviewed-on: https://code.wireshark.org/review/31108
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Guy Harris [Wed, 19 Dec 2018 06:58:24 +0000 (22:58 -0800)]
Clean up exp_pdu_open() API.
It really shouldn't free the comment passed to it, as the caller
allocated it, and knows how to free it if necessary; it might not even
have been allocated.
Make the comment argument a "const char *" to 1) allow passing string
constants etc. and 2) to catch any attempts to free it in
exp_pdu_open().
Make the callers free it after exp_pdu_open() returns.
(Alternatively, we could have exp_pdu_open() take the file name argument
and generate the comment itself, so that all code paths generate the
same comment.)
Change-Id: I6e6924b05565761b641a6c3b4d9a2e97f4264e1b
Ping-Bug: 15365
Reviewed-on: https://code.wireshark.org/review/31105
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Taisuke Sasaki [Wed, 19 Dec 2018 03:40:23 +0000 (12:40 +0900)]
ISIS: Add Prefix Attribute Flags TLV (rfc7794)
Fix according to review 31069
Change-Id: I03552eaba434597386d8bf386117a3366f2c3446
Reviewed-on: https://code.wireshark.org/review/31101
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Guy Harris [Wed, 19 Dec 2018 06:03:35 +0000 (22:03 -0800)]
Always set *dfp to NULL on an error return from dfilter_compile().
All other error-return code paths set *dfp to NULL; make this one do so
as well.
Change-Id: I4015c1d53bdbac99cdeda158d7d01c8da7bf2562
Reviewed-on: https://code.wireshark.org/review/31102
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Gerald Combs [Tue, 18 Dec 2018 20:47:33 +0000 (12:47 -0800)]
NSIS: Expand our vcredist exit code check.
Along with checking for exit code 3010 (reboot required), check for
other errors and show a warning as needed.
Add a note about the Universal CRT to the User's Guide.
Bug: 15358
Change-Id: Ia49dbdc66edc8ea68f957ec353f1115536002d13
Reviewed-on: https://code.wireshark.org/review/31100
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>
Vadim Yanitskiy [Mon, 12 Nov 2018 19:16:00 +0000 (02:16 +0700)]
GSUP/SMS: add MO-/MT-FORWARD-SM message decoding
According to 3GPP TS 29.002, there are two services:
- MAP-MO-FORWARD-SHORT-MESSAGE (see 12.2),
- MAP-MT-FORWARD-SHORT-MESSAGE (see 12.9),
which are used to forward MO/MT short messages.
This change replicates both services as GSUP messages:
- OSMO_GSUP_MSGT_MO_FORWARD_SM_*,
- OSMO_GSUP_MSGT_MT_FORWARD_SM_*.
For more information, please see:
https://git.osmocom.org/libosmocore/commit/?id=
c2628317cc3482262c80b93cbfb2cbe960772558
https://git.osmocom.org/osmo-gsm-manuals/commit/?id=
f26967aad547e8f79e6726aefe9fe8a69ae2ba4b
Change-Id: Ia46aabc74c00c89c4da53c2ed4b9fd2200a485a0
Reviewed-on: https://code.wireshark.org/review/30586
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Jaap Keuter [Tue, 18 Dec 2018 22:47:33 +0000 (23:47 +0100)]
writecap: rename pcapng_write_session_block to _section_block
The pcapng file format specification speaks of a secion block, not
a session block. Let the function name reflect the proper name of
the block it writes.
Change-Id: Id399fae3648c93f4750fedaa297b18f95f2bb96f
Signed-off-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Reviewed-on: https://code.wireshark.org/review/31099
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Guy Harris [Tue, 18 Dec 2018 22:03:07 +0000 (14:03 -0800)]
Don't assume the filter will be non-null.
There's no guarantee that sp->filter is non-null; if it's null, that
means there's no filter.
Bug: 15369
Change-Id: I2a61db2e134aa70d30c2265b63aabf99c35e362e
Reviewed-on: https://code.wireshark.org/review/31096
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Gerald Combs [Tue, 18 Dec 2018 16:30:27 +0000 (08:30 -0800)]
Lua: Fix compilation with Lua 5.1.
Change-Id: Idd4aa36ee95e985560867094d423128e51aacfb1
Reviewed-on: https://code.wireshark.org/review/31095
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Stig Bjørlykke [Tue, 18 Dec 2018 12:13:00 +0000 (13:13 +0100)]
coap: Add request/response arrows
Change-Id: I72393548f5a51e60f516c0999c8a779e75d0c14a
Reviewed-on: https://code.wireshark.org/review/31093
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Christophe GUERBER [Fri, 14 Dec 2018 21:41:28 +0000 (22:41 +0100)]
ITS facilities message dissector
Dissector for Intelligent Transport System facility messages:
- Cooperative Awareness Message (CAM)
- Decentralized Environmental Notification Message (DENM)
- Infrastructure to Vehicle Information Message (IVIM)
- MAP (topology) Extended Message (MAPEM)
- Signal Phase And Timing Extended Message (SPATEM)
- Signal Request Extended Message (SREM)
- Signal request Status Extended Message (SSEM)
- Electric Vehicle Charging Spot Notification (EVCSN)
- Electric Vehicle - Recharging Spot Reservation (EVRSR)
- Tyre Information System (TIS) and Tyre Pressure Gauge (TPG) interoperability
Subdissectors:
- ITS version if ever the ITS PDU header is changed
- Version << 16 | MessageID to register new message dissectors
- RegionId << 16 | type to register regional extensions
AddGrpC regional additions already provided
TAP:
- its TAP with ItsPduHeader fields provided
Bug: 15148
Change-Id: I4c71d4dfa1d5d63cb57f61a4e1436a60a3482205
Reviewed-on: https://code.wireshark.org/review/31049
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Guy Harris [Tue, 18 Dec 2018 08:49:21 +0000 (00:49 -0800)]
Treat the strings for simple dialogs as UTF-8 on Windows.
On Windows, filename strings inside Wireshark are UTF-8 strings, so
error messages containing file names are UTF-8 strings. Convert from
UTF-8, not from the local code page.
Bug: 15367
Change-Id: I52f3de2606ec6a592e7cb82b1a9aaeeef8acecef
Reviewed-on: https://code.wireshark.org/review/31090
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Christophe GUERBER [Mon, 17 Dec 2018 22:59:16 +0000 (23:59 +0100)]
Provide data to inner dissector for PER open type
When an open type is decoded in ASN.1 PER, one can define a dissector
for the content of the open type. Providing data to the inner dissector
is only possible through packet info private data or global vars.
Use the private_data field from ASN.1 context as the data for the inner
dissector. This avoids using packet info private data to communicate
with the inner dissector, especially if the data to be provided are only
"local" matter.
Ping-Bug: 15148
Change-Id: I8fd2cb69d52e371e7d713afe2cc4b2856fb39f7c
Reviewed-on: https://code.wireshark.org/review/31087
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
dennis.lanov [Mon, 17 Dec 2018 21:41:42 +0000 (21:41 +0000)]
Added AVPs: Idle-To-Connected-Transition-Count and Connected-Duration
Change-Id: I4a647e6a6373cdd4fbf9e286e06a9f0b95d27d05
Reviewed-on: https://code.wireshark.org/review/31077
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Pascal Quantin [Tue, 18 Dec 2018 06:08:05 +0000 (07:08 +0100)]
XnAP: remove a useless variable from private data
Change-Id: Ie485067ff6a75841850da84c24f6d3d939b815c1
Reviewed-on: https://code.wireshark.org/review/31089
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Christophe GUERBER [Mon, 17 Dec 2018 23:14:24 +0000 (00:14 +0100)]
Do not create a tvbuff on zero-length open type
When decoding an open type in ASN.1/PER and the content length is zero,
do not try to create a buffer. Doing so triggers an error in tvbuff.c.
Ping-Bug: 15148
Change-Id: If892e8c6a84cdfb268e3f6c50af0f7e30a89c59b
Reviewed-on: https://code.wireshark.org/review/31088
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Pascal Quantin [Mon, 17 Dec 2018 22:45:58 +0000 (23:45 +0100)]
X2AP: fix dissection of MeNBtoSgNBContainer in SgNBModificationConfirm message
Bug: 15368
Change-Id: I99307f6af961e91059111e699c7d43fa364f28f0
Reviewed-on: https://code.wireshark.org/review/31080
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>
Pascal Quantin [Mon, 17 Dec 2018 22:17:04 +0000 (23:17 +0100)]
Windows: upgrade Npcap to 0.99-r8
While we are at it, let's propose by default to upgrade to Npcap when WinPcap
is intalled.
Change-Id: Id9aeb3a507127b5956185fba2b74c60cf1dfdf96
Reviewed-on: https://code.wireshark.org/review/31079
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Joakim Karlsson [Mon, 17 Dec 2018 17:55:01 +0000 (18:55 +0100)]
gtpv2: Update Security Capability in MM Context
According to TS 29.274, ch8.38. the UE NR security capability coding
is specified in clause 9.9.3.53 of 3GPP TS 24.501
Change-Id: I4e5352bf7a5c75a3766b2d1162d8d85c3566da86
Reviewed-on: https://code.wireshark.org/review/31074
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Guy Harris [Mon, 17 Dec 2018 18:57:20 +0000 (10:57 -0800)]
Add routines to load Lua programs that assume the path is UTF-8 on Windows.
Add ws_dofile() and ws_loadfile(), which are like the substitute
dofile() and loadfile() we provide, but that, on Windows, take a UTF-8
path rather than a path in the local code page.
Use that to load console.lua.
This means we can load console.lua on Windows even if the full path to
it includes non-ASCII characters.
Bug: 15118
Change-Id: Iaa00639563fe53a34e1e24e42022f3886a38e7c5
Reviewed-on: https://code.wireshark.org/review/31075
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Joakim Karlsson [Mon, 17 Dec 2018 16:06:37 +0000 (17:06 +0100)]
pfcp: correction of name QFII
QFFI -> QFII
Change-Id: Iff0d4977620b2c98f25fe5cd0390043968659ccf
Reviewed-on: https://code.wireshark.org/review/31073
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Pascal Quantin [Mon, 17 Dec 2018 17:03:26 +0000 (18:03 +0100)]
GSM A DTAP: add UMTS EVS to supported codecs list IE
Change-Id: I248bf8722beebda5007a542323d4b188ed50ae52
Reviewed-on: https://code.wireshark.org/review/31072
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Taisuke Sasaki [Mon, 17 Dec 2018 02:51:53 +0000 (11:51 +0900)]
ISIS: Add Prefix Attribute Flags TLV (rfc7794)
Also add the below minor fixes/enhancements:
- Fix O-bit in MT TLV (rfc5120)
- Add IPv4/IPv6 prefix string in a parent subtree
- Modify the IPv6 Reachability TLV dissector so that it would dissect in TLV format order
- Add a new SR Local Block TLV dissector (draft-ietf-isis-segment-routing-extensions-21)
- Fix offset in SID/Label sub-TLV
Change-Id: Ie317f094ff8f2ed3352e844c212eb59a677e18c6
Reviewed-on: https://code.wireshark.org/review/31069
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Dario Lombardo [Sun, 16 Dec 2018 20:59:32 +0000 (21:59 +0100)]
wsutil: improve plugins list output format.
Change-Id: Id1ead7b12d437d2d4983733b34d45cad8b5c3bf2
Reviewed-on: https://code.wireshark.org/review/31067
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Jaap Keuter [Sun, 16 Dec 2018 21:00:45 +0000 (22:00 +0100)]
Qt: import hexdump into a pcapng file
When creating the temporary capture file to store the imported data in
the file is created with the pcap format. To conform to the change to
using pcapng format by default it is only reasonable to generated a
temporary pcapng format file as well.
Change-Id: I842431c1449751f8f2f3b85a47cab731de794c8a
Signed-off-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Reviewed-on: https://code.wireshark.org/review/31066
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Jaap Keuter [Sun, 16 Dec 2018 20:54:49 +0000 (21:54 +0100)]
wiretap: use appropriate extension for temporary files
With the change from Wireshark's default capture file format from
pcap to pcapng the suffix of the temporary file created in wiretap
was also changed from .pcap to .pcapng. This irrespective of the
actual file type requested. This change retrieves the registered
extension for the requested file type (in its uncompressed form)
and used that for the suffix. File types without a defined default
extension will get .tmp as suffix.
Change-Id: If809fef4325e483072c1fa4ee962125d991a197e
Signed-off-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Reviewed-on: https://code.wireshark.org/review/31065
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Gerald Combs [Sun, 16 Dec 2018 19:53:51 +0000 (11:53 -0800)]
macOS: Fix a .dmg build path.
Fix the "Read me first" path.
Change-Id: I6d1a13a26db2023a30b7ae72caca86500d00f5b7
Reviewed-on: https://code.wireshark.org/review/31064
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Gerald Combs [Sun, 16 Dec 2018 17:11:56 +0000 (09:11 -0800)]
CMake: More VERSION_GREATER_EQUAL fixes.
Change-Id: Id6cc4f05f564383b2844aa00ebd21d204e4320db
Reviewed-on: https://code.wireshark.org/review/31063
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Gerald Combs [Sun, 16 Dec 2018 02:19:16 +0000 (18:19 -0800)]
CMake: VERSION_GREATER_EQUAL didn't appear until 3.7.
Change-Id: Ib650129bfc4d686f49e8f2cf58f4978ef98dc5c0
Reviewed-on: https://code.wireshark.org/review/31059
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>
Jaap Keuter [Sat, 15 Dec 2018 19:50:13 +0000 (20:50 +0100)]
text2pcap: make IP ID endianess independant
Just as IP addresses the IP ID is also an entity that is endianess
sensitive. Select the appropriate value in the same way as the IP
addresses.
Change-Id: Ib2f07ea7820b443d0bf6e58fdc5afd7fc429fe22
Signed-off-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Reviewed-on: https://code.wireshark.org/review/31054
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Gerald Combs [Sun, 16 Dec 2018 08:24:12 +0000 (08:24 +0000)]
[Automatic update for 2018-12-16]
Update manuf, services enterprise numbers, translations, and other items.
Change-Id: Iafc95a8b4a651033480dc82de7ecd839cc8fa46c
Reviewed-on: https://code.wireshark.org/review/31060
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Gerald Combs [Sat, 15 Dec 2018 22:44:10 +0000 (14:44 -0800)]
CMake: Fixup some logic in CMakeLists.txt
Fix the check for !APPLE && CMAKE_OSX_DEPLOYMENT_TARGET.
Change-Id: Ib6b33935062a03e2f53180431de2c0a3c8005fe5
Reviewed-on: https://code.wireshark.org/review/31058
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Dylan Ulis [Fri, 14 Dec 2018 21:43:57 +0000 (16:43 -0500)]
CIP: Minor code cleanup
dissect_cip_cm_data() was getting hard to read so:
1. Pull out some some logic into separate functions
dissect_cip_cm_unconnected_send_req
dissect_cip_cm_fwd_close_req
dissect_cip_cm_fwd_close_rsp_success
2. Reduce the scope of some variables.
No functional changes
Change-Id: I40c3dd5d2505b29991589ede4752c383348006ec
Reviewed-on: https://code.wireshark.org/review/31051
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Michael Mann [Sat, 15 Dec 2018 01:06:33 +0000 (20:06 -0500)]
VOIP: Always use frame number when hashing sequence analysis.
Change-Id: Id720d7857328c1f464c4568b0a279a864921b031
Reviewed-on: https://code.wireshark.org/review/31052
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Gerald Combs [Fri, 14 Dec 2018 19:30:39 +0000 (11:30 -0800)]
CMake: Make sure we use the same minimum macOS version everywhere.
Add a MIN_MACOS_VERSION variable. Update it and sanity check it
according to CMAKE_OSX_DEPLOYMENT_TARGET and our Qt version. Use it to
set our minimum macOS version in various places.
Change-Id: Icaf0dbe463f34d182986868021e2b56d2239da38
Reviewed-on: https://code.wireshark.org/review/31048
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>
Christophe GUERBER [Sun, 2 Dec 2018 02:07:52 +0000 (03:07 +0100)]
IMAP: Reassemble message elements and add request/response tracking
1. Reassemble TCP segment so that IMAP dissector is called on message elements.
Content of fetched messages are parsed by IMF dissector. Dissected fields
are available to "Export Objects" menu item.
2. Request/Response tracking with timestamp between request and response in response frame.
Bug: 15090
Change-Id: Icdbef8c237965d2a59aa7726c5e6a681602c71ce
Reviewed-on: https://code.wireshark.org/review/30876
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Michael Mann [Fri, 14 Dec 2018 22:01:42 +0000 (17:01 -0500)]
packet-geonw.c: Add #include <stdlib.h> to fix Debug build on Windows
Change-Id: I22450f09490f3d508f3865984d710469a8d119f0
Reviewed-on: https://code.wireshark.org/review/31050
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
Gerald Combs [Thu, 13 Dec 2018 17:42:23 +0000 (09:42 -0800)]
UI: Make sure we always have interface statistics.
Ensure that capture_stat_start always returns a non-NULL if_stat_cache_t
pointer. This keeps InterfaceTreeModel::updateStatistic from repeatedly
running dumpcap when we're unable to gather statistics, e.g. when we
don't have capture permissions.
Bug: 14284
Change-Id: Id408714a934abab2abdee1d4bb5e4bed872af016
Reviewed-on: https://code.wireshark.org/review/31038
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Anders Broman [Fri, 14 Dec 2018 13:27:07 +0000 (14:27 +0100)]
PFCP: Calculate the length of Network Instance.
In IE User Plane IP Resource Information. If Associated Source Interface is present the length of Network Instance
is 1 octet less than the remaining length.
Change-Id: I4fc74f8ab69d0c441947d3d0149fe9e2106a2bc7
Reviewed-on: https://code.wireshark.org/review/31046
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Andreas Schultz <andreas.schultz@travelping.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Peter Wu [Fri, 14 Dec 2018 11:31:33 +0000 (12:31 +0100)]
secrets: clarify debug message, fix endianess swap
Change-Id: If02448925f906ae60ab1ad793d7a5069bf8ed10d
Reviewed-on: https://code.wireshark.org/review/31044
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Peter Wu [Fri, 14 Dec 2018 11:49:32 +0000 (12:49 +0100)]
travis,appveyor: display tshark --version output
This reveals the actual build configuration.
Change-Id: Ie49cea4a07faaa1b942ff6a973b03893f36ca16f
Reviewed-on: https://code.wireshark.org/review/31043
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Peter Wu [Thu, 13 Dec 2018 11:04:20 +0000 (12:04 +0100)]
travis: upgrade to Xenial
Travis now supports Ubuntu 16.04 (Xenial):
https://blog.travis-ci.com/2018-11-08-xenial-release
Simplify the environment:
- Clang 7 is default, https://docs.travis-ci.com/user/languages/c/
(ubuntu-toolchain-r-test is still needed because GCC 5.4 is default)
- libnghttp2-dev, libssh-gcrypt-dev and libmaxminddb-dev are available.
(No longer requires ppa:wireshark-dev/stable)
Upgrading to Xenial will also enable Libgcrypt 1.6 tests and includes
GnuTLS 3.4.10 which will be useful for future PKCS #11 tests.
Gitlab's rpm-centos-7 still covers Libgcrypt 1.5.3 and GnuTLS 3.3.29.
Coverage will be lost for GnuTLS 3.2.11 (Ubuntu 14.04, Trusty).
Change-Id: Ic28bf23707c75b2c97bedad66206e9c1f129164c
Reviewed-on: https://code.wireshark.org/review/31039
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Martin Mathieson [Fri, 14 Dec 2018 13:26:29 +0000 (13:26 +0000)]
DCT2000: Pass NR NAS payload to dissector with S1AP framing
Change-Id: I2aa7a7f347e897b1a455ff3eb8ae126982ecc681
Reviewed-on: https://code.wireshark.org/review/31045
Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
Anders Broman [Fri, 14 Dec 2018 11:49:17 +0000 (12:49 +0100)]
GeoNetworking: Change cast to guint8 to fix win32 build.
Change-Id: I6692bfc0beecb7d023b5b69bd58729147a72d3f3
Reviewed-on: https://code.wireshark.org/review/31042
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Jonathan Fleming [Fri, 30 Nov 2018 17:41:05 +0000 (09:41 -0800)]
Added multiple new field dissectors for the BACnet-APDU protocol.
Replaced global vars with fPresentValue and wrapper functions.
Split bacapp.present_value dissector based on datatype for filtering.
Replaced char array buffers with wmem api calls.
Rebased commit onto latest master branch.
Removed date and time present_value field dissectors.
dissectors added:
bacapp.object_name
bacapp.to_state
bacapp.from_state
bacapp.notify_type
bacapp.error_code
bacapp.error_class
bacapp.event_type
present_value dissectors added:
bacapp.present_value.null
bacapp.present_value.boolean
bacapp.present_value.uint
bacapp.present_value.int
bacapp.present_value.real
bacapp.present_value.octet_string
bacapp.present_value.char_string
bacapp.present_value.bit_string
bacapp.present_value.enum_index
Change-Id: I3ba9327ee22787da59190204e808f8c10dc8fabd
Reviewed-on: https://code.wireshark.org/review/30847
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Jaap Keuter [Tue, 11 Dec 2018 22:45:36 +0000 (23:45 +0100)]
text2pcap: allow to set interface name
When generating a capture file from a text file it can be helpfull
to be able to set the capture interface name in the generated IDB.
This can be especially true if later on the generated captures are
merged and the individual IDB's have to be compared. Without a name
every IDB of the same datalink type will be equal and subject to
merge. Also it keeps the individual streams identifiable for the
end user.
Change-Id: I70224379d88f516a0a356bf0b46aebafb69665f0
Signed-off-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Reviewed-on: https://code.wireshark.org/review/31015
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Christophe GUERBER [Thu, 13 Dec 2018 15:43:33 +0000 (16:43 +0100)]
GeoNetworking, BTP dissectors (ITS-V2X)
Implements V2X protocol dissectors:
* Geonetworking (network layer):
Dissector is registered on top of Ethernet (ethertype=0x8947). Secured
Packets are dissected up to the basic header, the rest is shown as data.
GN_ADDR address type is registerd and provides resolution of station
type and country code in the address. MID is shown as an ethernet address.
All the fields are dissected for non Secured Packets.
A subdissector table named "geonw.ch.nh" is provided on the next header
field. IPv6 is automatically registered. Heuristic dissectors is not
supported. If no dissector is foundd, payload is shown as data.
A preference boolean allows to enable/disable sequence number checking.
Tap "geonw" gets headers of all packets (with most fields).
Expert info tests if and provide feedback on:
- version is zero (no other version possible),
- reserved fields are zeros,
- payload_len matching with reported length of buffer,
- Remaining Hop Limit is 1 for Beacon and SHB,
- low RHL or RHL > Max Hop Limit,
- country code is less than 999 (3 digits ITU-T E.164),
- latitude, longitude, heading and angle limits,
- (suspected) duplicate packets,
- LS_REQUEST/LS_REPLY matching.
* Basic Transport Portocol:
BTP-X (X=A or B) dissectors are registered on top of Geonetworking.
Subdissector tables "btpx.port" allow to register for a given port,
while heuristic dissector can register to "btpx.payload". Decode as
capability is supported.
"btpx" taps get headers of all packets with ports/@ infos.
"btpx_follow" taps get the payload.
Bug: 15148
Change-Id: Iab5f4486d4c38068d9ad4361e77296b747f9b1bb
Reviewed-on: https://code.wireshark.org/review/30992
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Martin Mathieson [Thu, 13 Dec 2018 20:34:46 +0000 (20:34 +0000)]
DCT2000: Call nas-5gs dissector
Change-Id: Iddca3571097210a7a0e090b506538bbf8ec64c07
Reviewed-on: https://code.wireshark.org/review/31040
Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
Joakim Karlsson [Thu, 13 Dec 2018 16:46:27 +0000 (17:46 +0100)]
diameter: Added Secondary-RAT-Type
Group RAN-Secondary-RAT-Usage-Report and decoding of Secondary-RAT-Type
Change-Id: I33c1a0e21be64b5b5b4b9a4a40e9e718d89c9943
Reviewed-on: https://code.wireshark.org/review/31036
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Martin Mathieson [Thu, 13 Dec 2018 17:47:22 +0000 (17:47 +0000)]
DCT2000: skip optional carrier type in LTE RRC primitive header
Change-Id: I495e5b2da1b7c9a066294564837df471e25fbb73
Reviewed-on: https://code.wireshark.org/review/31037
Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
Anders Broman [Thu, 13 Dec 2018 13:24:30 +0000 (14:24 +0100)]
SIP: Add the generated Call Id to the tree.
Change-Id: I0fd5aff70452062d24cc777c002b6d02f7c5a691
Reviewed-on: https://code.wireshark.org/review/31032
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Peter Wu [Thu, 13 Dec 2018 11:23:52 +0000 (12:23 +0100)]
secrets: fix build with GnuTLS 3.4.0 and older
Change-Id: Ie6bd309134ebbd27e90b2bf92a2df1abfdfe45a5
Fixes: v2.9.1rc0-3-g4803390686 ("Add new "rsa_keys" UAT for storage of RSA private keys")
Reviewed-on: https://code.wireshark.org/review/31031
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Olaf Flaschel [Wed, 12 Dec 2018 23:07:27 +0000 (00:07 +0100)]
IEEE802.11: Prevent BoundsError for packets with captured len < packet len
This fix prevents that a BoundsError is thrown in function try_decrypt for
packets with captured length less than packet length. Otherwise, some data
is not dissected.
Change-Id: I0dcd89b85b959f5712ff58b184bfa2e064746d0b
Reviewed-on: https://code.wireshark.org/review/31026
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Olaf Flaschel [Wed, 12 Dec 2018 10:34:13 +0000 (11:34 +0100)]
IEEE802.11: Fixed dissector bug with wlan.ext_tag.ess_report.ess_info.thresh
Type of field wlan.ext_tag.ess_report.ess_info.thresh
must be FT_INT8 instead of FT_UINT8.
Change-Id: Icd1a121832d6a660550023a91d0b732385f68b60
Reviewed-on: https://code.wireshark.org/review/31016
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Anders Broman [Thu, 13 Dec 2018 09:53:29 +0000 (10:53 +0100)]
E164: Add a valuestring with the country name abbreviated ISO3166.
Change-Id: Ib39cc33e84a4ee70fbc2f3ebdccf84391a556b2f
Reviewed-on: https://code.wireshark.org/review/31030
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Anders Broman [Wed, 12 Dec 2018 14:50:42 +0000 (15:50 +0100)]
GeoNetworking: Add ethertype 0x8947
Change-Id: I6205bf865827c1b6f26e07d8ad2fc97bc7efe28d
Reviewed-on: https://code.wireshark.org/review/31022
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Jim Young [Mon, 10 Dec 2018 00:00:50 +0000 (19:00 -0500)]
macOS: fixup qt_base_path in macos-setup.sh
Recent Qt installations include the entire 3-tuple version string
(e.g. 5.9.7) for the parent folder name directly above the clang_64
folder. Use the entire version string when constructing the
recommended build environment export statements.
Change-Id: I779d487a3b794dde57214639a79727edb111835f
Reviewed-on: https://code.wireshark.org/review/30983
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Uli Heilmeier [Mon, 10 Dec 2018 14:00:55 +0000 (15:00 +0100)]
sFlow: Dissect output interface according to spec
v5 of sFlow has another bitmask for output interface
as v2 and v4.
This commit dissects v5 output interface according to
https://sflow.org/sflow_version_5.txt
Bug: 15325
Change-Id: I1c0f1958e5491a7683c716538e103a5d6b49869e
Reviewed-on: https://code.wireshark.org/review/30999
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Hannes Mezger [Wed, 12 Dec 2018 11:25:45 +0000 (12:25 +0100)]
opcua: show invalid OPC UA messages when 'opcua' filter is set
Change-Id: Ia9d14c14c20ef35aefbb0e6b3853450074b4c0a3
Reviewed-on: https://code.wireshark.org/review/31020
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Luis Rosa [Thu, 29 Nov 2018 16:34:21 +0000 (16:34 +0000)]
pcomtcp: new built-in dissector for PCOM protocol
New built-in dissector for PCOM protocol (ASCII and binary modes included)
Bug: 15315
Change-Id: Ie13da6bfd7fefefbc5bb5df3461c7fc18261df81
Reviewed-on: https://code.wireshark.org/review/30823
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Peter Wu [Sun, 9 Dec 2018 16:28:48 +0000 (17:28 +0100)]
Add new "rsa_keys" UAT for storage of RSA private keys
This should eventually replace the "ssl_keys" UAT which additionally
contains a useless address, port and protocol field. This prepares for
HSM support through PKCS #11.
Change-Id: I59409c98aeedf260d19266d18e14ef7d9b40b582
Reviewed-on: https://code.wireshark.org/review/30977
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Guy Harris [Thu, 13 Dec 2018 02:16:15 +0000 (18:16 -0800)]
Move more version-info-related stuff to version_info.c.
Have a ws_init_version_info() routine that, given an application name
string:
constructs the app-name-and-version-information string, and
saves it;
adds the initial crash information on platforms that support it,
and saves it.
Have show_version() use the saved information and take no arguments.
Add a show_help_header() routine to print the header for --help
command-line options, given a description of the application; it prints
the application name and version information, the description, and the
"See {wireshark.org URL}" line.
Use those routines in various places, including providing the
"application name" string in pcapng SHBs.
Change-Id: I0042a8fcc91aa919ad5c381a8b8674a007ce66df
Reviewed-on: https://code.wireshark.org/review/31029
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Guy Harris [Wed, 12 Dec 2018 10:53:08 +0000 (02:53 -0800)]
Put the main() and wmain() routines for CLI programs into a separate file.
That means that code is only in one place, rather than having copies of
it in each of those programs.
CLI programs that, on Windows, should get UTF-8 arguments rather than
arguments in the local code page should:
include the top-level cli_main.h header;
define the main function as real_main();
be built with the top-level cli_main.c file.
On UN*X, cli_main.c has a main() program, and just passes the arguments
on to real_main().
On Windows, cli_main.c has a wmain() function that converts the UTF-16
arguments it's handed to UTF-8 arguments, using WideCharToMultiByte() so
that it doesn't use any functions other than those provided by the
system, and then calls real_main() with the argument count and UTF-8
arguments.
Change-Id: I8b11f01dbc5c63fce599d1bef9ad96cd92c3c01e
Reviewed-on: https://code.wireshark.org/review/31017
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Gerald Combs [Thu, 13 Dec 2018 00:39:20 +0000 (16:39 -0800)]
2.9.0 → 2.9.1.
Change-Id: I5c1a26f234289edeb9e29f5b8a8bdd220bd49ecf
Reviewed-on: https://code.wireshark.org/review/31028
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Gerald Combs [Wed, 12 Dec 2018 23:25:31 +0000 (15:25 -0800)]
Build 2.9.0.
Change-Id: Id2fb03127c3f4e371a11ba7788a5a3439bafc651
Reviewed-on: https://code.wireshark.org/review/31027
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Gerald Combs [Wed, 12 Dec 2018 22:57:19 +0000 (22:57 +0000)]
Release notes: Add a note about Qt 5.12.0.
Change-Id: Ibe72b940bff14729d06dd46651a5205bd0ddcafe
Reviewed-on: https://code.wireshark.org/review/31025
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Pascal Quantin [Wed, 12 Dec 2018 20:35:52 +0000 (21:35 +0100)]
GSM A: detect buffer overrun when decoding MS Classmark 3 IE
Change-Id: I12d372afd8a50b9a04f92c53077e79116db6c255
Reviewed-on: https://code.wireshark.org/review/31024
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Gerald Combs [Wed, 12 Dec 2018 20:37:21 +0000 (12:37 -0800)]
NSIS: Increase our verbosity.
Pass /V4 to makensis so that we can see what files are in our package.
Change-Id: I4d1225f8cfce66945d086bc6481f739a56f16549
Reviewed-on: https://code.wireshark.org/review/31023
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Gerald Combs [Fri, 7 Dec 2018 01:23:54 +0000 (01:23 +0000)]
Packaging: Add initial support for AppImage.
Add an "appimage" target that will create an AppImage package. Current
AppImage tools assume that you only have one executable, so add
a custom AppRun wrapper that will let you run our associated CLI
utilities via symlinks, e.g.
ln -s ./Wireshark-3.2.1-x86.appimage capinfos
./capinfos --help
Packaging requires both linuxdeployqt and appimagetool, although we
might be able to reduce this to just linuxdeployqt:
https://github.com/probonopd/linuxdeployqt
https://github.com/AppImage/AppImageKit
I haven't done much testing beyond running Wireshark and
capinfos. There are undoubtedly issues that need to be fixed.
Bug: 14464
Change-Id: Ic004ba1962e6a8630ebb017349d9b2c0462fd5fe
Reviewed-on: https://code.wireshark.org/review/30953
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Hannes Mezger [Wed, 12 Dec 2018 11:04:12 +0000 (12:04 +0100)]
opcua: fix typo, use the commonly used 'Endpoint' instead of 'EndPoint'
Change-Id: I403673962987e4da0711896e8ae3e60af34acb4e
Reviewed-on: https://code.wireshark.org/review/31019
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Hannes Mezger [Wed, 12 Dec 2018 11:00:39 +0000 (12:00 +0100)]
opcua: add support for new reverse hello message
The reverse hello message type was added in OPC UA specification 1.04.
Change-Id: I00095e35049b8f38ab183ded1b96af51d788d986
Reviewed-on: https://code.wireshark.org/review/31018
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Sergey Rak [Tue, 11 Dec 2018 10:19:14 +0000 (13:19 +0300)]
HPAV: Expanding support for HPGP
Added support for different OUI: ST/IoTecha and Qualcomm-Atheros
Signed-off-by: Sergey Rak <sergrak@iotecha.com>
Bug: 15348
Change-Id: If71479339b95b5c26e84ffceb2f00307b3de680c
Reviewed-on: https://code.wireshark.org/review/30969
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>
Guy Harris [Wed, 12 Dec 2018 05:19:09 +0000 (21:19 -0800)]
Properly convert command-line arguments to UTF-8 on Windows.
Do the same thing we do for most other command-line programs - on
Windows, have wmain() rather than main(), convert the UTF-16 argument
lists to UTF-8, and pass them on to real_main(), otherwise just have
main() call real_main(). That way, they never pass through the local
code page on Windows.
Change-Id: Ib74176dd0586c012eabaa3376c1d7dcba8838978
Reviewed-on: https://code.wireshark.org/review/31014
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Guy Harris [Wed, 12 Dec 2018 03:09:32 +0000 (19:09 -0800)]
Add the VCS version number to the appname option if it's a Git build.
Change-Id: I193db5d5c7bd3668d096c72dc231ea43fa4894ec
Reviewed-on: https://code.wireshark.org/review/31013
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Jaap Keuter [Tue, 11 Dec 2018 22:38:30 +0000 (23:38 +0100)]
mergecap: set full name as capture application
When mergecap is generating a PCAPNG capture file it sets its name
("mergecap") as the capture application. This seems rather limited,
compared to e.g., text2pcap. This change sets the capture application
name to "mergecap" with full details, the same as text2pcap:
"mergecap (Wireshark) 2.9.0 (
v2.9.0rc0-2798-g47d5a923)"
Change-Id: Ia08717a9f2bcaa3fa1dc8ce13afcdaa8a0bc0c66
Signed-off-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Reviewed-on: https://code.wireshark.org/review/31011
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Gerald Combs [Tue, 11 Dec 2018 23:17:53 +0000 (15:17 -0800)]
Update the release notes.
Clean up the release notes in preparation for 2.9.0 and 3.0.
Change-Id: I7feb37846ce0b1c3caf248f616943b0f80cf60f3
Reviewed-on: https://code.wireshark.org/review/31012
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Taisuke Sasaki [Tue, 11 Dec 2018 14:37:58 +0000 (23:37 +0900)]
ISIS: add dissection of Node/Link MSD (rfc8491)
Revert a wording Sub-TLV back to SubCLV according to review 30985.
Change-Id: I1f7a2a586d45fe8548c1589baa2803616cf5bd20
Reviewed-on: https://code.wireshark.org/review/31008
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Graham Bloice [Tue, 11 Dec 2018 17:30:14 +0000 (17:30 +0000)]
DNP3: Fix events with relative time
The calculation for relative times incorrectly converted ms to ns.
Change-Id: I4357d89e45b3f31a5c222e4b8f82edc720766a6e
Reviewed-on: https://code.wireshark.org/review/31009
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Uli Heilmeier [Tue, 11 Dec 2018 12:15:25 +0000 (13:15 +0100)]
BGP: Decode MCAST-VPN safi for IPv6
Bug: 15351
Change-Id: Iaac74d6e1e78a4dde2a2f807b909177c733fd05f
Reviewed-on: https://code.wireshark.org/review/31007
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>
Sergey Rak [Tue, 11 Dec 2018 08:11:46 +0000 (11:11 +0300)]
HPAV: fix whitespaces in dissector
Changed modelines: c-basic-offset: 4 to keep consistency between files
Also added style for emacs as it is the most common for this file
Signed-off-by: Sergey Rak <sergrak@iotecha.com>
Change-Id: I62b6e16d614ebe2bacce330e3aaa12796d6b248b
Reviewed-on: https://code.wireshark.org/review/30988
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Anders Broman [Tue, 11 Dec 2018 08:59:38 +0000 (09:59 +0100)]
ASNI MAP: AnalogRedirectRecord is OPTIONAL in QualificationRequest
Bug: 15350
Change-Id: Ibe7f085daa2981168b3c5201256d674feb4cb7e5
Reviewed-on: https://code.wireshark.org/review/31004
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Dylan Ulis [Mon, 10 Dec 2018 21:45:15 +0000 (16:45 -0500)]
CIP: Show more unparsed data
Extra data could be an indicator of a problem, or it could be that we
haven't added support in Wireshark for it yet. Either way, it's helpful
to show it, instead of hiding it.
Changes:
1. Show unparsed data in the CIP CM dissector
2. Clean up some offsets
Change-Id: Ieebe208aab1f293f97a8774a6a4de5d5dbd3df67
Reviewed-on: https://code.wireshark.org/review/31003
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Dylan Ulis [Mon, 10 Dec 2018 21:24:06 +0000 (16:24 -0500)]
ENIP: Add more error checking
1. Added a check that the Common Packet Format Item Length < remaining
data for that layer.
2. Added a check that there should always be at least 4 bytes available
for each Common Packet Format item (Type ID + Length)
Change-Id: Ie6f2b7904d52d8699c06cfef6844cf0032293d97
Reviewed-on: https://code.wireshark.org/review/31002
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Dylan Ulis [Mon, 10 Dec 2018 21:15:03 +0000 (16:15 -0500)]
CIP Safety: Minor additions
1. Add 2x new Safety Supervisor services
2. Add more enum types for Device Status
3. Match field names to current spec
4. Add some BASE_UNIT_STRING units
Change-Id: I8fedb7cea55fb44eccf641ca60ab849847db2620
Reviewed-on: https://code.wireshark.org/review/31001
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Bruno Verstuyft [Mon, 10 Dec 2018 15:29:27 +0000 (16:29 +0100)]
DOCSIS: Added some additional tlvs
TLV 26.13 PHS Dynamic Bonding Change Action
TLV 48.4.2 Receive Module Adjacent Channels
TLV 64.3 Static Multicast CMIM Encoding
Change-Id: I3a48e0092e7fe523adfdff5b155dcdbb88720f41
Reviewed-on: https://code.wireshark.org/review/30997
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Dario Lombardo [Mon, 10 Dec 2018 12:42:17 +0000 (13:42 +0100)]
json_dumper: add support to convert dots in underscores.
This is needed for ek json compatibility.
Change-Id: I75c74a1dc7996f3f4c17071508655ae6e3c6b94c
Reviewed-on: https://code.wireshark.org/review/30993
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Pau Espin Pedrol [Mon, 10 Dec 2018 13:57:10 +0000 (14:57 +0100)]
packet-rsl: Add Establishment Cause from Channel Request to proto tree
Change-Id: I41709466bdb8427b759d236406505081d7d6f283
Reviewed-on: https://code.wireshark.org/review/30996
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Jim Walker [Mon, 10 Dec 2018 10:18:00 +0000 (10:18 +0000)]
couchbase: Add durable DCP commands
Adding DCP prepare, seqno-ack, commit and abort
Change-Id: Ife7726c91962ab7fc41bc981ee98418474d33385
Reviewed-on: https://code.wireshark.org/review/30989
Reviewed-by: Dave Rigby <daver@couchbase.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Dylan Ulis [Mon, 10 Dec 2018 00:31:16 +0000 (19:31 -0500)]
CIP: Add Connection Index
Add cip.connection. This works just like tcp.stream, but for CIP
connections. This is added to CIP connected messages and the Forward
Open/Close messages.
Change-Id: Ib358c00dc0a4fd61065cb22b0e9b574ac43a44a4
Reviewed-on: https://code.wireshark.org/review/30984
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Anders Broman [Mon, 10 Dec 2018 12:42:37 +0000 (13:42 +0100)]
Diameter: Sort application id numerically.
Change-Id: I83e80fc2fcdd020556df59badcad4205c0f39c75
Reviewed-on: https://code.wireshark.org/review/30995
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>