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>
Taisuke Sasaki [Mon, 10 Dec 2018 05:06:31 +0000 (14:06 +0900)]
ISIS: add dissection of Node/Link MSD (rfc8491)
Also add Strict SPF in SR-Algorithm Sub-TLV (draft-ietf-isis-segment-routing-extensions-21)
Change-Id: Icc564f093075d2d6edf5b25ac90e41c987ea71e8
Reviewed-on: https://code.wireshark.org/review/30985
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Stig Bjørlykke [Sun, 9 Dec 2018 20:54:18 +0000 (21:54 +0100)]
p_mul: Detect Data PDU sequence number 0
Data PDU sequence number 0 is illegal, add an expert info for this.
Don't include this packet in SEQ/ACK analysis.
Bug: 15337
Change-Id: I476088531e8a3605393ee1dedf1e8b159dac342b
Reviewed-on: https://code.wireshark.org/review/30980
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Michael Mann [Sun, 9 Dec 2018 14:27:31 +0000 (09:27 -0500)]
Multicast Statistics Dialog: Clear list when redrawing
The multicast statistics tap provides a continually updating list which the draw function just has to iterate through.
Bug: 15271
Change-Id: I270e7ca9460ec9568756b6c8d98f4f17653c8cad
Reviewed-on: https://code.wireshark.org/review/30976
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
Peter Wu [Sun, 9 Dec 2018 17:52:00 +0000 (18:52 +0100)]
enip: rearrange struct member to avoid -Wmissing-braces warning
Fix false positive warning:
epan/dissectors/packet-cipsafety.c:1960:37: warning: suggest braces around initialization of subobject [-Wmissing-braces]
enip_conn_val_t eip_conn_info = {0};
This is a Clang bug: https://bugs.llvm.org/show_bug.cgi?id=39931
Change-Id: I9f3040ae6bd4d5a2fafe21a37ac4b504933eabcf
Reviewed-on: https://code.wireshark.org/review/30979
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Dylan Ulis <daulis0@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Dario Lombardo [Sat, 8 Dec 2018 22:54:57 +0000 (23:54 +0100)]
json_dumper: support 'null' json object.
Allow the function json_puts_string() to be called with the NULL
argument that translates to 'null' json object.
Change-Id: I3d2aafad446962d3342ab30b9d509f054d393c64
Reviewed-on: https://code.wireshark.org/review/30978
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Gerald Combs [Sun, 9 Dec 2018 08:23:03 +0000 (08:23 +0000)]
[Automatic update for 2018-12-09]
Update manuf, services enterprise numbers, translations, and other items.
Change-Id: I29aca5c44e8371ffede8b66eebbb366aac7ac4f9
Reviewed-on: https://code.wireshark.org/review/30973
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Dylan Ulis [Tue, 27 Nov 2018 20:23:41 +0000 (15:23 -0500)]
CIP: Improve connected data information
1. For each connected data message, display generated connection
information including:
a. Connection Path from the initial connection
b. API values
c. Forward Open packet number. (This already existed, but moving it to a
consistent place in the tree)
2. Display O->T or T->O in the Info column depending on the direction of data.
3. Remove cip.conn_path_class filter. This was originally added to show
which type of data is in a given packet. But, it's not really needed
anymore because we have the generated connection path in each connected
data packet now.
4. Ensure dummy structs used for Decode As menus are zeroed out.
5. memset -> zero initialization
pcaps from the following bug reports are good examples:
Bug: 14939
Bug: 6617
Bug: 14916
Bug: 14958
Change-Id: I63885a5ca41f95e04f855a1e1dcd9ab3684f7eec
Reviewed-on: https://code.wireshark.org/review/30808
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
John Bankier [Fri, 7 Dec 2018 23:18:47 +0000 (23:18 +0000)]
packet-nfs.c: Bugfix NFSv4 ACCESS reply
Both NFSv3 and NFSv4 ACCESS reply dissection will be
sensible when the ACCESS request is not available (because the packet
containing the request was either not capture or truncated).
Bug: 15343
Change-Id: I5bf7b9905e85b1c1eb30e2949b9b246b54f9ec68
Reviewed-on: https://code.wireshark.org/review/30965
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 [Mon, 3 Dec 2018 03:54:12 +0000 (22:54 -0500)]
Add tvb_get_token_len
This is intended to be a replacement for get_token_len (from strutil.h) when its used on a tvb. It should be a little safer and remove the need for a dissector to use tvb_get_ptr.
Change-Id: Ib2d4a79718b6fba4eb9acc0129b13be6c8199a43
Reviewed-on: https://code.wireshark.org/review/30892
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Lee Serin [Sat, 8 Dec 2018 16:51:13 +0000 (01:51 +0900)]
BitTorrent:Add Fast Extension Message(Bep06) analysis
Add message type named 'fast extension' to analyze unprocessed messages
Bug: 15345
Change-Id: I62fce2b753899cb4f2ba833a58388906c9f0d2d3
Reviewed-on: https://code.wireshark.org/review/30954
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Peter Wu [Sat, 8 Dec 2018 11:11:23 +0000 (12:11 +0100)]
CMake: allow nested structures to be initialized via { 0 }
This is already permitted since C89 and popular compilers seem to
support it (including Clang 3.0 - 7.0, GCC 4.1.2 - 8.2 and MSVC 2015).
GCC used to be buggy: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=53119
C89 6.5.7. Initialization: "only enough initializers from the list are
taken to account for the members of the subaggregate".
Change-Id: Ic59b9fe71e2d3ce60b4b7d1074f8d84af01a817a
Reviewed-on: https://code.wireshark.org/review/30968
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Dario Lombardo [Sat, 8 Dec 2018 21:58:32 +0000 (22:58 +0100)]
proto: make ws_type_to_elastic static.
Change-Id: I15d1075a1447a6f550d600f765e6abc8dae862ad
Reviewed-on: https://code.wireshark.org/review/30972
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
Martin Kaiser [Sat, 8 Dec 2018 14:30:26 +0000 (15:30 +0100)]
cattp: use the version bits in the heristic check
The CAT-TP specification says explicitly that the version bits must be
zero. Fail the heuristic check if they aren't.
I checked ETSI TS 102 127 V15.0.0 from
https://www.etsi.org/deliver/etsi_ts/102100_102199/102127/15.00.00_60/ts_102127v150000p.pdf
Bug: 15342
Change-Id: I05a886ccd5811f367abdb9faead4983d137c12c6
Reviewed-on: https://code.wireshark.org/review/30970
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Petri Dish Buildbot
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Gerald Combs [Fri, 7 Dec 2018 21:55:39 +0000 (13:55 -0800)]
Remove some unused images.
Change-Id: Id53cf3f120af755e296262ee5caa9dbf84ea1194
Reviewed-on: https://code.wireshark.org/review/30964
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Bruno Verstuyft [Fri, 7 Dec 2018 14:07:22 +0000 (15:07 +0100)]
DOCSIS: bugfix: correct dissection of encrypted Mac Specific frame
Change-Id: Id7e300cafe90c965f5eb94f035e872ff6a8231b7
Reviewed-on: https://code.wireshark.org/review/30960
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
Jim Walker [Fri, 7 Dec 2018 11:58:31 +0000 (11:58 +0000)]
couchbase: Improve key decoder
Using the recent updates occasional 'trailing' byte warnings
occur if the key encodes a collection-ID, with these changes
we now get much better key decoding, without the warnings
with and without collections.
Change-Id: I9fc1e0d807c8054065a7346a09b0ce99d05f1e63
Reviewed-on: https://code.wireshark.org/review/30956
Reviewed-by: Dave Rigby <daver@couchbase.com>
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
Anders Broman [Fri, 7 Dec 2018 14:51:59 +0000 (15:51 +0100)]
RTP: Check that we have p_conv_data before accessing it.
Bug: 15346
Change-Id: Ia6ad53423e674832ebb3ccd7c755dd60fecc2cb1
Reviewed-on: https://code.wireshark.org/review/30962
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Bruno Verstuyft [Fri, 7 Dec 2018 12:55:07 +0000 (13:55 +0100)]
DOCSIS: better decoding for unknown tlvs
Previous decoding showed "Unknown TLV: <TLV value>". This was confusing, because people interpreted the value as the type of the unknown TLV.
Change-Id: Ia9259db547fca393c248f78ea7c758969b69548e
Reviewed-on: https://code.wireshark.org/review/30959
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Peter Wu [Fri, 7 Dec 2018 12:51:59 +0000 (13:51 +0100)]
dof: remove unnecessary uat_load calls
UATs are loaded at startup, no need to do it again. Call chain:
epan_load_settings -> read_prefs -> init_prefs -> uat_load_all.
Change-Id: I57caabafb16b0b46fcb6d1621dd6b503154c805c
Reviewed-on: https://code.wireshark.org/review/30958
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Anders Broman [Fri, 7 Dec 2018 12:09:32 +0000 (13:09 +0100)]
GTP: Use correct length for gtp.cgi_ci, gtp.sai_sac and gtp.rai_rac
Change-Id: I405bdac11283b83672433995285988c43766e4ab
Reviewed-on: https://code.wireshark.org/review/30957
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Jaap Keuter [Thu, 6 Dec 2018 23:24:29 +0000 (00:24 +0100)]
PCAP/PCAPNG: Be consistent in documentation, etc
1) The default build configuration is to select PCAPNG as
output format, but it can be selected as PCAP. Some of the
command line tools have the option to select the output
format and default towards the build configuration.
This has to be reflected in their help output also.
2) Various documentation files are still stating that PCAP is
the default format of various tools. With the default build
configuration being PCAPNG these have to be adjusted as well.
(with lack of dynamic content the documentation can only refer
to the default build configuration format).
Change-Id: I51d19642a7ed8c99817971c1f25d20972095021e
Signed-off-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Reviewed-on: https://code.wireshark.org/review/30951
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Gerald Combs [Thu, 6 Dec 2018 19:20:48 +0000 (11:20 -0800)]
WSMP: Make sure our PSID is initialized.
Fixes a scan-build warning.
Change-Id: I5e6b94240e87684fc41ef1a4daf4272d429f00d4
Reviewed-on: https://code.wireshark.org/review/30952
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>
Peter Wu [Fri, 7 Dec 2018 01:01:28 +0000 (02:01 +0100)]
Revert "CMake: Fix Windows help install target"
This reverts commit
8992760c68f3e508a0e5a25307c246a75f7c2ae2.
Breaks the "make clean" target as it tries to remove the "help"
directory. Since this change, the macOS builds started failing tests as
well (init.lua and colorfilters seems not to be applied).
Change-Id: I3fce346e04875e667680a4ed9ba3beca8054a168
Reviewed-on: https://code.wireshark.org/review/30950
Reviewed-by: João Valverde <j@v6e.pt>
Peter Wu [Thu, 6 Dec 2018 20:31:01 +0000 (21:31 +0100)]
CMake: limit -Wextra-semi to C++ only
Saves a check and removes a GCC warning from CMakeError.log:
cc1: warning: command line option ‘-Wextra-semi’ is valid for C++/ObjC++ but not for C
Change-Id: I76d027e7b5703b06237ac70eb340c4a09322e09e
Fixes: v2.9.0rc0-958-g866ddb1b18 ("Add -Wextra-semi to (clang) C and C++ flags to make sure the buildbots will find this.")
Reviewed-on: https://code.wireshark.org/review/30948
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: João Valverde <j@v6e.pt>
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Bruno Verstuyft [Thu, 6 Dec 2018 16:05:25 +0000 (17:05 +0100)]
DOCSIS: Added Partial Service Downstream Channels TLV 49.6
Change-Id: Iac09d71a56024440a826ff9ca870c05eeee3a77b
Reviewed-on: https://code.wireshark.org/review/30942
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Guy Harris [Thu, 6 Dec 2018 16:36:43 +0000 (08:36 -0800)]
Update comments, get rid of IMPORT_MAX_PACKET.
Get rid of the IMPORT_MAX_PACKET #define; just directly use
WTAP_MAX_PACKET_SIZE_STANDARD, to match what text2pcap.c does.
Update comments in text2pcap.c and ui/text_import.c to say the maximum
packet size is WTAP_MAX_PACKET_SIZE_STANDARD.
Change-Id: I34118f76426d1416fccf43b2a356ad8d200de19b
Ping-Bug: 15292
Reviewed-on: https://code.wireshark.org/review/30945
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Richard Sharpe [Wed, 5 Dec 2018 02:41:17 +0000 (21:41 -0500)]
ieee80211: Fix the handling of A-Control and improve AP Tx Power.
1. Correctly print out the AP Tx Power level.
2. The A-Control UL MU Response field was renamed to the TR Response field.
3. Handle padding correctly in the A-Control field.
Change-Id: I33000aa28b9e00ab97ca30d53907685e302c49c2
Reviewed-on: https://code.wireshark.org/review/30918
Petri-Dish: Richard Sharpe <realrichardsharpe@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Jaap Keuter [Thu, 6 Dec 2018 12:49:04 +0000 (13:49 +0100)]
Qt: Fix tooltip on import size
Import size is increased to 256kiB, but tooltip says 64kB.
Adjust text according to limit set bt code.
Change-Id: I586248fd25a96e4ffe0936babc90b4150c14f118
Ping-Bug: 15292
Signed-off-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Reviewed-on: https://code.wireshark.org/review/30940
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Bruno Verstuyft [Thu, 6 Dec 2018 10:20:54 +0000 (11:20 +0100)]
DOCSIS: Added Modem Capabilities 54-62 and TLV 49.8
Change-Id: I24815d5ec5dc288066712318e12f75a9cc6a9495
Reviewed-on: https://code.wireshark.org/review/30938
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Pau Espin Pedrol [Wed, 5 Dec 2018 20:31:05 +0000 (21:31 +0100)]
packet-rsl: Show cause value string of Cause IE
Related: https://osmocom.org/issues/3705
Change-Id: Ib7f985c2107d33b01640f31673c23d7fb4e54627
Reviewed-on: https://code.wireshark.org/review/30934
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Pau Espin Pedrol [Wed, 5 Dec 2018 20:29:35 +0000 (21:29 +0100)]
packet-rsl: Move rsl_class_vals into its correct spec section
Change-Id: Ia7554ed4d9926159ab3dbcdc6fd64d5bd09efc67
Reviewed-on: https://code.wireshark.org/review/30933
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Pau Espin Pedrol [Wed, 5 Dec 2018 19:33:20 +0000 (20:33 +0100)]
packet-rsl: Parse missing Cause IE in ip.access specific messages
Related: https://osmocom.org/issues/3705
Change-Id: I4c05387a952dd07344d373f4abe0f03b456439a5
Reviewed-on: https://code.wireshark.org/review/30932
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Pau Espin Pedrol [Wed, 5 Dec 2018 19:19:53 +0000 (20:19 +0100)]
packet-rsl: Fix parsing values of some IE in ip.access specific messages
Those IEs have specific dissect methods that expect offset to point to
the IE type, not to its value. Furthermore, those methods already add a
subtree, so no need to create it for them.
Related: https://osmocom.org/issues/3705
Change-Id: Ia63253b95678b799f59ed945d1381f4eb01be636
Reviewed-on: https://code.wireshark.org/review/30931
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Pascal Quantin [Thu, 6 Dec 2018 10:38:24 +0000 (11:38 +0100)]
HI2Operations: update auto generated file and remove unused template
Change-Id: If31c0fdfac9c450871accba53715dc4d0e6468a6
Reviewed-on: https://code.wireshark.org/review/30939
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Anders Broman [Thu, 6 Dec 2018 08:57:55 +0000 (09:57 +0100)]
SIP: Try to fix ASAN build crash.
Bug: 15328
Change-Id: Iefc057c74f234592adca1f7816a3e9fac99b48be
Reviewed-on: https://code.wireshark.org/review/30937
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Ba?ak Kalfa [Thu, 6 Dec 2018 06:18:46 +0000 (22:18 -0800)]
PROFINET: PDPortDataReal_block dissection is changed.
According to specification, PortState is renamed and dissected
as "LinkState.Link" and "LinkState.Port" which are both 8 bits.
Change-Id: I1eff258f48d6fd76286ae08a7d2d80793ea23f12
Reviewed-on: https://code.wireshark.org/review/30913
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Jaap Keuter [Wed, 5 Dec 2018 15:43:45 +0000 (16:43 +0100)]
Doc: add mentioning of ip link to get interfaces
With the introduction of the ip command (from iproute2) on modern
Linux systems it becomes common to see this tool available,
gradually replacing tools like netstat and ifconfig.
Change-Id: I1fb309e741c07c93271b61a35c4833d36bcc5cb8
Signed-off-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Reviewed-on: https://code.wireshark.org/review/30924
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Gerald Combs [Thu, 6 Dec 2018 00:30:18 +0000 (16:30 -0800)]
OER: Always initialize a variable.
Always initialize our length in dissect_oer_length_determinant. Its
callers assume that this happens and doing so should fix some scan-build
warnings.
Change-Id: I67abc19417e6437b9302b880164140fb8a773204
Reviewed-on: https://code.wireshark.org/review/30935
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>
Pau Espin Pedrol [Wed, 5 Dec 2018 18:27:25 +0000 (19:27 +0100)]
packet-rsl: Use defines for ip.access value_string
Change-Id: I447a30068e5a4b9a510abec75498691e17cbaa32
Reviewed-on: https://code.wireshark.org/review/30927
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Gerald Combs [Wed, 5 Dec 2018 17:11:02 +0000 (17:11 +0000)]
Debian: Add a Lintian override for l16_mono.
Add an override for:
library-not-linked-against-libc usr/lib/x86_64-linux-gnu/wireshark/plugins/2.9/codecs/l16mono.so
Change-Id: Id053892125301fcd66349c1a571ff6e3d64463c9
Reviewed-on: https://code.wireshark.org/review/30925
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>
Gerald Combs [Wed, 5 Dec 2018 17:59:23 +0000 (09:59 -0800)]
Fix some spelling errors found by Lintian.
Change-Id: If6fc3aab7ad4fc634567121f7b9541bc6f6c5766
Reviewed-on: https://code.wireshark.org/review/30926
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 [Wed, 5 Dec 2018 15:08:06 +0000 (16:08 +0100)]
text2pcap: extend snap length
The snaplength as saved in the capture file is set to the original
PCAP file length of 65535. In reality the package size can grow to
256kiB. Make use of the correct constant when writing the PCAP file.
Bug: 15292
Change-Id: Ib7710e4151cdc712f3344c1436252f9b3bfb556c
Signed-off-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Reviewed-on: https://code.wireshark.org/review/30923
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Anders Broman [Wed, 5 Dec 2018 14:01:34 +0000 (15:01 +0100)]
HI2Operations: Remove the not needed .h file.
Change-Id: Iabb24aae94814d4a10fdfa998f870b5e2cd3a8d8
Reviewed-on: https://code.wireshark.org/review/30921
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Anders Broman [Wed, 5 Dec 2018 14:27:16 +0000 (15:27 +0100)]
SIP: Use differtent hf variables for the "real" and generated Call-id
It's not allways good to pick up frames for related call legs when
filtering.
Make different hf:s for the two use cases.
Change-Id: I33c640636a76173f3a7952f4a740491ccfac276d
Reviewed-on: https://code.wireshark.org/review/30922
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Anders Broman [Wed, 5 Dec 2018 12:41:11 +0000 (13:41 +0100)]
Add dissection of HI3CCLinkData
Change-Id: I002c31972c4bcc231527eeaa2c6b21c3b1a9636a
Reviewed-on: https://code.wireshark.org/review/30920
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Pascal Quantin [Wed, 5 Dec 2018 10:39:23 +0000 (11:39 +0100)]
Diameter: add 3GPP MCPTT-Identifier and MCVideo-Identifier AVPs
Change-Id: Iabc8d91a149b3dd20cd5ff1cebbeae505a3c55ca
Reviewed-on: https://code.wireshark.org/review/30919
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Gerald Combs [Wed, 5 Dec 2018 01:48:50 +0000 (17:48 -0800)]
Debian: Add missing symbols.
Change-Id: Id05eb1e6060d60892ffdd65aa5a2e0aad42215f0
Reviewed-on: https://code.wireshark.org/review/30917
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>
Anders Broman [Tue, 4 Dec 2018 14:43:04 +0000 (15:43 +0100)]
Hart-ip: Add simple heuristic.
To stop accepting SIP messages on the
hart-ip port.
Change-Id: Ifc653f4a3defb823336914e8be6f20453aedb6fe
Reviewed-on: https://code.wireshark.org/review/30914
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
João Valverde [Tue, 4 Dec 2018 01:46:01 +0000 (01:46 +0000)]
wsutil: Rename DATAFILE_DIR variable
Rename DATAFILE_DIR to be closer to CMake and avoid mixing
with the staging dir path variable of the same name.
Change-Id: I7b1e02152d8bde14cca210fbfae4acbdba7d78d7
Reviewed-on: https://code.wireshark.org/review/30916
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot
Reviewed-by: João Valverde <j@v6e.pt>
Pascal Quantin [Tue, 4 Dec 2018 17:44:50 +0000 (18:44 +0100)]
KRB5: update auto generated file
Change-Id: Ie78cc2609cd117622eb0e0e900d6e4e1a29efd2b
Reviewed-on: https://code.wireshark.org/review/30915
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Bruno Verstuyft [Tue, 4 Dec 2018 11:16:57 +0000 (12:16 +0100)]
DOCSIS: Added QAM modulation support tlvs
Change-Id: I18dc306b23a042e137c703cc8b14c45c66de10d2
Reviewed-on: https://code.wireshark.org/review/30912
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Isaac Boukris [Tue, 4 Dec 2018 02:41:23 +0000 (04:41 +0200)]
krb5: fix asn1 error when dissecting PA-FX-FAST in TGS request
Change-Id: If42e54b05def7a09e37f7c0283103bb6db8126db
Signed-off-by: Isaac Boukris <iboukris@gmail.com>
Reviewed-on: https://code.wireshark.org/review/30910
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Isaac Boukris [Tue, 4 Dec 2018 01:30:56 +0000 (03:30 +0200)]
krb5: do not dissect PA-S4U-X509-USER inside encrypted-pa-data
According to MS-SFU 2.2.2 PA_S4U_X509_USER checksum section;
PA-S4U-X509-USER may be returned inside encrypted-pa-data, but
it contains just the checksum data so do not try to dissect it.
Quote:
The padata of type 130 in the encrypted-pa-data field contains
the checksum value in the S4U request concatenated with the
checksum value in the S4U reply.
Change-Id: Ia124f56914ef2fefd5b0a64fccd176911321f246
Signed-off-by: Isaac Boukris <iboukris@gmail.com>
Reviewed-on: https://code.wireshark.org/review/30908
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Jim Walker [Mon, 3 Dec 2018 11:38:24 +0000 (11:38 +0000)]
couchbase: Update for recent collection changes
Add support for decoding a collection-ID from the
key-bytes.
Update DCP as collection_len is no longer in the
protocol and the system events have changed.
Change-Id: Ib910083d929a906729e2bba2b0f07ba23e093cf5
Reviewed-on: https://code.wireshark.org/review/30895
Reviewed-by: Dave Rigby <daver@couchbase.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
ismaelrti [Mon, 3 Dec 2018 18:38:40 +0000 (19:38 +0100)]
RTPS: Added dissection of Support Type Object LB
Added dissection of Support Type Object LB type.
Change-Id: I7e654faed4874a87865f1d94a372eb8f00dde412
Reviewed-on: https://code.wireshark.org/review/30903
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Jim Walker [Mon, 3 Dec 2018 11:37:54 +0000 (11:37 +0000)]
couchbase: Update FlexFrame dissector to include requests
Update the couchbase packet dissector with some re-factoring of the
FlexFrame dissector and then extra functionality for:
* FlexFrame on requests (magic 0x08)
* Durability
* Out-Of-Order requests
* DCP Stream ID
Additional checks are added to warn/error for invalid frame lengths and
for the case where the FlexFrame byte0 is 0xff, which is not defined by
the protocol.
Change-Id: I5f1fec8293284dadbdef717d02fa1eef27da7a0c
Reviewed-on: https://code.wireshark.org/review/30894
Reviewed-by: Dave Rigby <daver@couchbase.com>
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
João Valverde [Tue, 4 Dec 2018 01:34:25 +0000 (01:34 +0000)]
Clean up memory allocation
Fixes an issue where sometimes datafile_dir is not freed
before exiting.
Change-Id: I2ff7d1b8ea4e20a1ce98e5e11965073eb479bb03
Reviewed-on: https://code.wireshark.org/review/30909
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Gerald Combs [Thu, 29 Nov 2018 16:46:29 +0000 (08:46 -0800)]
Qt: Display filter toolbar updates.
Don't set the display filter combo's minimum size. This lets us show
more filter expression buttons.
Clear the filter expression toolbar before redrawing it. This gets rid
of a leftover artifact here on macOS.
Change-Id: Iab944e8992caf554e024521df52d0089a4501674
Reviewed-on: https://code.wireshark.org/review/30902
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>
João Valverde [Mon, 3 Dec 2018 05:32:17 +0000 (05:32 +0000)]
CMake: Use $ORIGIN with RPATH
Make our package relocatable on Unix systems.
Linux, Solaris and FreeBSD are known to support $ORIGIN.
Change-Id: Ibcdda33d62c075bfa867d006cb6aaf5824609011
Reviewed-on: https://code.wireshark.org/review/30896
Petri-Dish: João Valverde <j@v6e.pt>
Reviewed-by: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
João Valverde [Mon, 3 Dec 2018 19:23:35 +0000 (19:23 +0000)]
CMake: Simplify CMAKE_INSTALL_DATADIR usage
Change-Id: I414aa551b8e9315a654f4da62b882e787d4f6d53
Reviewed-on: https://code.wireshark.org/review/30904
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot
Reviewed-by: João Valverde <j@v6e.pt>
Thomas Wiens [Mon, 3 Dec 2018 19:29:35 +0000 (20:29 +0100)]
s7comm: fix using wrong offset variable
Change-Id: I9cfd8394e6cbb3f627f7f312fa19fc5baa62f6fc
Reviewed-on: https://code.wireshark.org/review/30905
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Gerald Combs [Mon, 3 Dec 2018 17:41:23 +0000 (09:41 -0800)]
maxminddb: Expand a comment.
Change-Id: Iac0d158ccc56c40c87ccc8399a8a5b16af768e12
Reviewed-on: https://code.wireshark.org/review/30901
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Gerald Combs [Mon, 3 Dec 2018 17:08:26 +0000 (17:08 +0000)]
Revert "maxmind: Simplify our read logic."
This reverts commit
4154e35cde9c863ace57598cabc37034dab2ab1c.
Apparently we do need to call PeekNamedPipe on Windows.
Change-Id: I9c9bbcb56bf1e1c2e6ae240ac5056b8a80674f15
Reviewed-on: https://code.wireshark.org/review/30900
Reviewed-by: Gerald Combs <gerald@wireshark.org>
ismaelrti [Mon, 3 Dec 2018 13:08:21 +0000 (14:08 +0100)]
RTPS: Acknack analysis hidden when dissecting GAP field.
GAP field dissection shows an acknack analysis. This analysis doesn't
make any sense in the GAP field.
Change-Id: I9c4cca2b722390112b6a350bd2310b48874e5c9d
Reviewed-on: https://code.wireshark.org/review/30897
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Jaap Keuter [Mon, 3 Dec 2018 16:15:27 +0000 (17:15 +0100)]
CDMA2000: Improper offset handling
Somewhere in the code the handling of the offset goes wrong.
Instead of incrementing the offset it's the pointer to the offset
which is being incremented, leading to all sorts of problems.
Add a dereference to these few statements which lack them.
Bug: 15322
Change-Id: If575711a5b120f25f0172e0efb26e01f07244e8b
Signed-off-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Reviewed-on: https://code.wireshark.org/review/30899
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Anders Broman [Mon, 3 Dec 2018 14:04:51 +0000 (15:04 +0100)]
RTP: Restructure call id handling.
Change-Id: Id5471ad6e7051a7e00fd82d25d58912ef8ad886e
Reviewed-on: https://code.wireshark.org/review/30898
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Anders Broman [Mon, 3 Dec 2018 05:42:34 +0000 (06:42 +0100)]
SDP: Show callid from all call legs with the same RTP cpnversation.
Change-Id: If17732c2bd0b23e7f62b7464b9f154c317019f16
Reviewed-on: https://code.wireshark.org/review/30893
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Alexis La Goutte [Sat, 1 Dec 2018 16:58:39 +0000 (17:58 +0100)]
Qt: Add Russian translation
Change-Id: I06044953bbf6040f8a0bb291c2b3e9cbf87c39f4
Reviewed-on: https://code.wireshark.org/review/30869
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Alexis La Goutte [Sat, 1 Dec 2018 16:15:52 +0000 (17:15 +0100)]
update-tx: fix typo
Change-Id: I7ba88e9f1764a8d01c3754e032de1abd940a365c
Reviewed-on: https://code.wireshark.org/review/30868
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Alexis La Goutte [Sat, 1 Dec 2018 14:46:07 +0000 (15:46 +0100)]
transifex: Update .tx/config
Change-Id: I158c5203f54630ec061a79d6519deabcd9d906f2
Reviewed-on: https://code.wireshark.org/review/30867
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Martin Kaiser [Sun, 2 Dec 2018 16:18:22 +0000 (18:18 +0200)]
nl80211: dissect the mac attribute as address
use an hf variable of type FT_ADDR
Change-Id: Ice88965825d05ee10825b1a7dc91475ffaa75cb2
Reviewed-on: https://code.wireshark.org/review/30890
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Gerald Combs [Sun, 2 Dec 2018 22:27:24 +0000 (14:27 -0800)]
Release notes: We now ship with Npcap.
Change-Id: Ibb4f886eb061502a141160af5c595adba8205dbc
Reviewed-on: https://code.wireshark.org/review/30891
Reviewed-by: Gerald Combs <gerald@wireshark.org>
git.samba.org / metze / wireshark / wip.git / log