Peter Wu [Thu, 30 Nov 2017 02:05:07 +0000 (02:05 +0000)]
Rename dissectors.c.in and fix CMake on removals
"dissectors.c.in" is an input file for "make-dissectors" which outputs
"dissectors.c", but does not contain C code. Rename it to
"dissectors.in.txt" instead.
When a dissector is removed from the list, the dissectors.c file was not
properly generated even if CMake was re-run. Fix this by adding an
additional dependency on the input file. autotools likely suffers from
the same problem with removed files, I have not tried to fix that.
Restore's João's original approach using file(GENERATE) to avoid using
configure_file, this requires CMake 2.8.12.
Change-Id: Id07cd8ef502186a90d41b3bb77ed0d9c94845af9
Fixes: v2.5.0rc0-1763-gfe0c2b0485 ("Rewrite make-dissector-reg.py in C")
Reviewed-on: https://code.wireshark.org/review/24659
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: João Valverde <j@v6e.pt>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Martin Mathieson [Sun, 24 Dec 2017 09:10:29 +0000 (09:10 +0000)]
ieee80211: hide unused value_string variable
packet-ieee80211.c:2326:27: error: ‘vht_max_mpdu_in_amsdu’ defined but not used [-Werror=unused-const-variable=]
static const value_string vht_max_mpdu_in_amsdu[] = {
Change-Id: If4cc416b7fe92dc7915e26d2d89abaa17b081c09
Reviewed-on: https://code.wireshark.org/review/24977
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
Gerald Combs [Sun, 24 Dec 2017 08:10:37 +0000 (08:10 +0000)]
[Automatic update for 2017-12-24]
Update manuf, services enterprise numbers, translations, and other items.
Change-Id: Ia4acffe0372de93476cb677b1859509cec39216a
Reviewed-on: https://code.wireshark.org/review/24974
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Alexis La Goutte [Sun, 24 Dec 2017 07:11:34 +0000 (08:11 +0100)]
QUIC: fix 'num_ts' may be used uninitialized in this function [-Werror=maybe-uninitialized]
with some old (and buggy) compiler (gcc 4.8.5)
Change-Id: Ie5e4f71d3f4a12f786f2c8b139bba7a0688a8d29
Reviewed-on: https://code.wireshark.org/review/24973
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Michael Mann [Sat, 23 Dec 2017 01:05:44 +0000 (20:05 -0500)]
Add Service Response Time dialog for SCSI.
SCSI requires parameter data to be passed into the tap. Provide
a new dialog that can handle SCSI commands.
Bug: 14144
Change-Id: I4561f251ec38753a28befee33b8b994b04b92230
Reviewed-on: https://code.wireshark.org/review/24955
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Richard Sharpe [Sun, 24 Dec 2017 01:05:23 +0000 (17:05 -0800)]
ieee80211: More support for IEEE802.11 2016 around Extended Capabilities.
This change handles both 8-byte and 9-byte extended capabilities fields
by handling them as an 8-bit field if there are only 8 bytes, but handling
them as a 16-bit field if there are 9 bytes. This is because one field
straddles the bytes, but I have seen captures where only 8 bytes are
present.
Change-Id: I624fe34dd9c8ba7f25a451a172048897d867fcb5
Reviewed-on: https://code.wireshark.org/review/24971
Petri-Dish: Richard Sharpe <realrichardsharpe@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Richard Sharpe [Sat, 23 Dec 2017 15:31:19 +0000 (07:31 -0800)]
ieee80211-radiotap: Add definitions for HE information and dissect it.
Now that HE Information is starting to be used in radiotap headers we need to
start defining and showing these. More will be comming, especially the dissection
of the header itself and carrying info in the ieee_802_11_phdr structure.
Change-Id: I94c2184e83243656764147029295ad4ce4254416
Reviewed-on: https://code.wireshark.org/review/24945
Petri-Dish: Richard Sharpe <realrichardsharpe@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Dario Lombardo [Sat, 23 Dec 2017 20:52:20 +0000 (21:52 +0100)]
airpdcap: check return value for gcry_mac_read (CID:
1420699).
Change-Id: Ifdf044d99e912ac90044aca7be503fdf39b4fe74
Reviewed-on: https://code.wireshark.org/review/24967
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Dario Lombardo [Sat, 23 Dec 2017 20:24:15 +0000 (21:24 +0100)]
Qt: add initializer (CID:
1412975).
Change-Id: I5a161a98a90efb7dda95646c4f025c34623b0327
Reviewed-on: https://code.wireshark.org/review/24965
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Peter Wu [Sun, 24 Dec 2017 01:04:44 +0000 (02:04 +0100)]
mip: properly advance offset if !tree
The offset must be advanced or else dissection of the following
extensions will result in a malformed packet exception.
Bug: 14292
Change-Id: I8b5cb2f377c8d3e01677b76f5bb6c3126dea64f9
Reviewed-on: https://code.wireshark.org/review/24970
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Guy Harris [Sat, 23 Dec 2017 22:16:10 +0000 (14:16 -0800)]
Update symbols.
Change-Id: I9f4c20cdfc276a6c1faff2ee988846f0bbdc99a5
Reviewed-on: https://code.wireshark.org/review/24968
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Guy Harris [Sat, 23 Dec 2017 08:05:21 +0000 (00:05 -0800)]
Put special pipe-handling code into libwsutil.
Ask, in a comment, why we're doing PeekNamedPipe() when we're trying
to read everyting in the pipe, up to the EOF, into a string.
On UN*X, do the same "read up to an EOF and then NUL-terminate the
result" stuff that we did on Windows; nothing guarantees that, on all
UN*Xes, in all circumstances, until the end of time, world without end,
amen, we can do one read and get the entire string.
Change-Id: I578802b23fec1051139eaefd9a09fe2a6de06a11
Reviewed-on: https://code.wireshark.org/review/24959
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Alexis La Goutte [Wed, 15 Nov 2017 06:20:36 +0000 (07:20 +0100)]
QUIC: STOP_SENDING error code is now application error code (with 2 bytes)
Change-Id: I14ce4dc790da6d0b59514a5dcf28504d780934ea
Reviewed-on: https://code.wireshark.org/review/24434
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Alexis La Goutte [Wed, 15 Nov 2017 06:02:22 +0000 (07:02 +0100)]
QUIC: RST_STREAM error code is now application error code (with 2 bytes)
Change-Id: I2f5702069d494f535e4b1b8743e76a9e0a3e5945
Reviewed-on: https://code.wireshark.org/review/24433
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Martin Mathieson [Sat, 23 Dec 2017 14:58:29 +0000 (14:58 +0000)]
LTE RLC stats: supply fields for Save As..
Also use double rather than float for bandwidth
calculations.
There is an issue where TapParameterDialog is not showing
the last 2 column headings - most likely because
2 of the column headings are not used by UE entries
(only channel entries). Will investigate after this.
Change-Id: I3f691990b723434176060916153786665034b8d1
Reviewed-on: https://code.wireshark.org/review/24960
Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
Alexis La Goutte [Wed, 15 Nov 2017 05:57:08 +0000 (06:57 +0100)]
QUIC: not longer Timestamp Section/block with draft07
Change-Id: I37061bfc49324a1c621c9211571c7bbc26c26474
Reviewed-on: https://code.wireshark.org/review/24432
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Alexis La Goutte [Tue, 14 Nov 2017 22:09:44 +0000 (23:09 +0100)]
QUIC: Update Error Code (and not it is only 16 bytes)
and update FT_CONNECTION_CLOSE
Change-Id: I2758fb5b2b036d01c4fce3ef90bcafa0b000ee7d
Reviewed-on: https://code.wireshark.org/review/24431
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Alexis La Goutte [Tue, 14 Nov 2017 21:49:45 +0000 (22:49 +0100)]
QUIC: Add APPLICATION_CLOSE (0x03) from draft07
Change-Id: Ief1a569659cfd4f2aeae5fd46d2de9548df5124a
Reviewed-on: https://code.wireshark.org/review/24430
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Alexis La Goutte [Tue, 14 Nov 2017 21:31:13 +0000 (22:31 +0100)]
QUIC: Add conversation support (to store version)
and not for draft >= 07, display Cleartext Protected Payload (don't decrypt Cleartext AEAD yet...)
Change-Id: I7f581d58371710c50d7d4631ad1c55da41e57444
Reviewed-on: https://code.wireshark.org/review/24425
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Alexis La Goutte [Wed, 20 Dec 2017 20:40:11 +0000 (20:40 +0000)]
plugins: fix no previous prototype for function 'plugin_register' [-Wmissing-prototypes]
Change-Id: I84f1fd02f99e7d4757e418539f932c550e409f92
Reviewed-on: https://code.wireshark.org/review/24920
Petri-Dish: João Valverde <j@v6e.pt>
Reviewed-by: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Roland Knall [Fri, 22 Dec 2017 12:58:02 +0000 (13:58 +0100)]
Qt: Redesign signal/slot concept of capture_file
This is in preparation to make it easier for other classes
to get the right signals from the capture file. Also the decision
on what signals to listen to now resides with the final classes,
not main window, and it no longer needs to be changed if the
statusbar or wsapp needs additional signals.
Change-Id: If366d42b07dc822636404ac44ba2306ec4418b4e
Reviewed-on: https://code.wireshark.org/review/24941
Petri-Dish: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Roland Knall <rknall@gmail.com>
Craig Jackson [Thu, 14 Dec 2017 22:43:17 +0000 (17:43 -0500)]
TDS: Dissect TDS4/5 login packet
Add dissection of the TDS_BUF_LOGIN (aka TDS4/TDS5 login) packet.
Add some support routines to remember the endian nature of each connection.
Dissecting the TDS5 login requires dissecting the TDS_CAPABILITY token as well.
Change-Id: Id92dedeaf4b5d192bab7ec99775e371f229db3e3
Reviewed-on: https://code.wireshark.org/review/24831
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Michalis Kapsalakis [Fri, 22 Dec 2017 22:06:09 +0000 (23:06 +0100)]
EtherCAT: Fix unreached register
This commit fixes the order of register 0x0012 in ecat_esc_registers array
after the changes in 24949
Change-Id: If63921a5e3eb845e470b608161946f0477ff6e21
Reviewed-on: https://code.wireshark.org/review/24953
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Pascal S. de Kloe [Sat, 23 Dec 2017 01:08:41 +0000 (02:08 +0100)]
IEC104: add section 7 [security] cause of transmission & type identifiers
Change-Id: I960c1e1860bf4ec80260a105b7a5abbf5d8db386
Reviewed-on: https://code.wireshark.org/review/24958
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
Dario Lombardo [Fri, 22 Dec 2017 16:21:25 +0000 (17:21 +0100)]
extcap: null terminate the string that will be used in strlen (CID
1364684).
Change-Id: Ie4c7eed2ac24327292af9a45ffc7e4630338a6b4
Reviewed-on: https://code.wireshark.org/review/24948
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
Dario Lombardo [Fri, 22 Dec 2017 22:43:59 +0000 (23:43 +0100)]
Qt: close file exiting from scope (CID:
1418343).
Change-Id: Ie54fcf5c16f98addd512ef8efcfadfebac56177a
Reviewed-on: https://code.wireshark.org/review/24954
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
Michael Mann [Fri, 22 Dec 2017 20:50:16 +0000 (15:50 -0500)]
RPC Service Response Time dialog: Fix crash
There were a few use-after-free situations. Fix one by using epan API
to get program name for tap structure.
tap structure shouldn't be deleted because it's needed. Will be freed
by the tap reset/free function.
Change-Id: Ia18d84340362839926036c777106ca1c6d1b18f5
Ping-Bug: 14141
Reviewed-on: https://code.wireshark.org/review/24950
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
Alexis La Goutte [Fri, 22 Dec 2017 20:49:05 +0000 (21:49 +0100)]
coap: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
Change-Id: Ib23241887ef91ef44a31703445a0ce6d31104b8e
Reviewed-on: https://code.wireshark.org/review/24951
Reviewed-by: Michael Mann <mmann78@netscape.net>
Michalis Kapsalakis [Fri, 22 Dec 2017 10:04:06 +0000 (11:04 +0100)]
Fix unreached registers and typos
This commit fixes the following
-- changes the order of registers in ecat_esc_register array
because they cannot be reached by the dissect_esc_register function.
-- typos in registers' information
Change-Id: Ia73823412abba26377f57fa59ad637879b5b9da1
Reviewed-on: https://code.wireshark.org/review/24949
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
Justin J. Novack [Fri, 22 Dec 2017 03:16:11 +0000 (22:16 -0500)]
Added ArtTrigger dissection
The ArtTrigger packet is used to send trigger macros to the network. The
most common implementation involves a single controller broadcasting to
all other devices.
Please see page 41 of the referenced PDF for the packet definition of
the ArtTrigger OpCode.
https://www.artisticlicence.com/WebSiteMaster/User%20Guides/art-net.pdf
Change-Id: Iec2e749732e5462cf04b9c6942df7379e4247255
Reviewed-on: https://code.wireshark.org/review/24936
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Dario Lombardo [Fri, 22 Dec 2017 14:44:36 +0000 (15:44 +0100)]
Qt: add missing break (CID:
1426884).
Change-Id: I2fb495ca59ca5f6a659287f7140328f8850f732b
Reviewed-on: https://code.wireshark.org/review/24944
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Dario Lombardo <lomato@gmail.com>
Pascal Quantin [Fri, 22 Dec 2017 13:44:56 +0000 (14:44 +0100)]
byte_view_text.cpp: add initializers to please GCC 7.2.1
Even if a code review suggests that they are not required, it silence 2
compiler warnings.
Change-Id: I9ea45dd6759275dd8a2b8fc48fc41d0a9cecbcc2
Reviewed-on: https://code.wireshark.org/review/24942
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
Mališa Vučinić [Thu, 14 Dec 2017 16:56:40 +0000 (11:56 -0500)]
CoAP: Various improvements
1. Add Object-Security option handling to CoAP.
2. Add RFC8132 defined codes.
3. Fix indentation.
4. Use macros for masks.
Change-Id: I48c71513db14e79133fe323578123f99946cbaa9
Reviewed-on: https://code.wireshark.org/review/24913
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
Andreas Schultz [Fri, 22 Dec 2017 12:44:14 +0000 (13:44 +0100)]
[PFCP] Fixed User Plane IP Resource IE
* TEIDIR should use the UINT8 type (its only 3 bit really)
* Network Instance length needs to take the already decoded
bytes into account
3GPP TS 29.244 Section 8.2.82
Change-Id: I6772ca726f5e5d65c68a6d3dae8eff43e72196e0
Reviewed-on: https://code.wireshark.org/review/24940
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Andreas Schultz [Fri, 22 Dec 2017 11:56:17 +0000 (12:56 +0100)]
[PFCP] Fixed decoding length of Vendor Specific IEs
The Enterprise ID is included in the length. Don't skip it twice.
3GPP TS 29.244 Section 8.1.1.
Change-Id: If601309c0008775268e399bbedf7ab956ae0ec6b
Reviewed-on: https://code.wireshark.org/review/24939
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Andreas Schultz [Fri, 22 Dec 2017 11:54:27 +0000 (12:54 +0100)]
[PFCP] Fixed length of CSID entry in FQ-CSID
PDN Connection Set Identifier is two bytes.
3GPP TS 29.244 Section 8.2.43
Change-Id: I6ac1dab341e4ae54cbbdcbcbe8583a6a49293269
Reviewed-on: https://code.wireshark.org/review/24938
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Andreas Schultz [Fri, 22 Dec 2017 11:48:35 +0000 (12:48 +0100)]
[PFCP] Fixed length of DNS labels in Node ID IE
Node ID is encoded as DNS label according to RFC 1035. That RFC
states that a label can have maximum length of 63 characters.
3GPP TS 29.244 Section 8.2.38 and RFC 1035 Section 2.3.4.
Change-Id: I54ba4a204e2bf010b5b61b4be7f6ca483d7210b9
Reviewed-on: https://code.wireshark.org/review/24937
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Gerald Combs [Thu, 21 Dec 2017 22:28:07 +0000 (14:28 -0800)]
Qt: Lighten non-printable byte view characters.
Draw non-printable characters using a lighter foreground color in the
byte view.
Change-Id: Ib97a1f9f897fa6f78e33ff80c7efea21f68ef2d5
Reviewed-on: https://code.wireshark.org/review/24935
Reviewed-by: Roland Knall <rknall@gmail.com>
Martin Mathieson [Thu, 21 Dec 2017 21:09:55 +0000 (21:09 +0000)]
LTE MAC stats: save to file, ue entries only
Change-Id: I25f3b1b793861aeb066739290db5e9ebd0e0b596
Reviewed-on: https://code.wireshark.org/review/24934
Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
Gerald Combs [Thu, 21 Dec 2017 17:02:06 +0000 (09:02 -0800)]
Qt: Add back byte view hover.
Add back the byte view hover behavior. Draw an overline+underline when
hovering to make it a bit less distracting and to make hovered vs marked
modes more obvious. Update names to match.
Change-Id: I554d1cad98199f08f1c19796b14d158ad41706b4
Reviewed-on: https://code.wireshark.org/review/24932
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Roland Knall <rknall@gmail.com>
Matej Tkac [Thu, 21 Dec 2017 14:21:09 +0000 (15:21 +0100)]
[PFCP] Fixed Usage Report Trigger and Reporting Trigger IEs
Adjusted bitmask in both IEs to correct order of bytes
3GPP TS 29.244 Sections 8.2.19 and 8.2.41
Change-Id: Ia9409c0d33b8821d459faf1d502f833883416b40
Reviewed-on: https://code.wireshark.org/review/24929
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Matej Tkac <matej.tkac.mt@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Matej Tkac [Thu, 21 Dec 2017 11:00:11 +0000 (12:00 +0100)]
[PFCP] Fixed header field info for CP Function Features
HF is related only to single -5th- octet
3GPP TS 29.244 Section 8.2.58
Change-Id: Id0d4dd644cc4f94dec2a7ab73cea7b02bff1fc9f
Reviewed-on: https://code.wireshark.org/review/24926
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Matej Tkac [Thu, 21 Dec 2017 10:34:38 +0000 (11:34 +0100)]
[PFCP] Fixed order of IPv4 and IPv6 in PDI IE
In accordance with 3GPP TS 29.244 Section 8.2.62
Change-Id: Id3663817f64cab60713e02ca9e9a26349fe1a29a
Reviewed-on: https://code.wireshark.org/review/24925
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
AndersBroman [Thu, 21 Dec 2017 10:00:09 +0000 (11:00 +0100)]
[BSSAP] Fix mandatory IEs in Uplink Tunnle request(add IMSI)
Bug: 14289
Change-Id: I720b31a6275b4b9a9eeff34b5fd0554cd6fcb7d3
Reviewed-on: https://code.wireshark.org/review/24924
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Marouen Ghodhbane [Tue, 19 Dec 2017 17:02:19 +0000 (18:02 +0100)]
ieee1722: Add dissectors for Compressed Video format (H264 and MJPEG)
This dissector is implemented according to "IEEE Std 1722-
2016 Parag 8: Compressed Video Format"
Change-Id: I39668e7b8665f6b11461d55f16b40bf3942c9c8d
Signed-off-by: Marouen Ghodhbane <marouen.ghodhbane@nxp.com>
Reviewed-on: https://code.wireshark.org/review/24914
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>
Anton Glukhov [Mon, 18 Dec 2017 15:25:18 +0000 (16:25 +0100)]
Add IEEE 802.3br Frame Preemption Protocol dissector
Bug: 14280
Change-Id: I25444b069af4bb78db6ae5ff649596599eba2a0c
Signed-off-by: Anton Glukhov <anton.a.glukhov@gmail.com>
Reviewed-on: https://code.wireshark.org/review/24881
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>
Sergey Avseyev [Wed, 20 Dec 2017 21:24:35 +0000 (00:24 +0300)]
couchbase: uncompress snappy payloads
Change-Id: I70de47512dfe8ff1a390a243688ef13f012561fa
Reviewed-on: https://code.wireshark.org/review/24921
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Michael Mann [Thu, 21 Dec 2017 00:23:21 +0000 (19:23 -0500)]
NULL check some g_log statements for extcap.
"Yes, on *most* UN*Xes, that causes "(null)" to be printed, but it causes a crash on at
least some versions of Solaris, so Don't Do It." - Guy Harris
Bug: 14194
Change-Id: Iff0d59803d78b1e87a564e8bcdc5c84af485eea6
Reviewed-on: https://code.wireshark.org/review/24922
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
Paul Thomas [Wed, 20 Dec 2017 17:51:28 +0000 (12:51 -0500)]
DNP3: Fix timestamps on command event objects
Before if (al_obj & 0x02) was incorrectly being used to test if it was a
variation with a timestamp.
Now it is done in the same manor as Object 21 with a switch statement
that falls through if it isn't a timestamp variation.
Change-Id: I9adaf9c0be3ad01f1cf87ba09f47257daeadb47c
Reviewed-on: https://code.wireshark.org/review/24915
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
Alexis La Goutte [Wed, 20 Dec 2017 20:32:48 +0000 (20:32 +0000)]
ipsec: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
Change-Id: Ic599195cbbcdbf229b126a7f95ef5a4de8aea0ec
Reviewed-on: https://code.wireshark.org/review/24919
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
Alexis La Goutte [Tue, 19 Dec 2017 15:48:24 +0000 (16:48 +0100)]
fuzzshark: fix no previous prototype for function 'LLVMFuzzerTestOneInput/LLVMFuzzerInitialize' [-Wmissing-prototypes]
Change-Id: If5f425dda3cd793a63a69680c12aba12a20ed12e
Reviewed-on: https://code.wireshark.org/review/24917
Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
Dario Lombardo [Wed, 20 Dec 2017 08:44:50 +0000 (09:44 +0100)]
gitlab-ci: use custom wireshark image.
Change-Id: I1f305c818c4985009d98f6b64b8b649704d6a5f9
Reviewed-on: https://code.wireshark.org/review/24909
Reviewed-by: Dario Lombardo <lomato@gmail.com>
Richard Sharpe [Tue, 19 Dec 2017 05:10:20 +0000 (21:10 -0800)]
ieee80211: Make Extended Capabilities bits more in line with 802.11 2016.
A number of the bits have become reserved and what were reserved fields now
have meaning.
I will have to deal with bytes 8 and 9 differently because there is a 2-bit
field that spans those two bytes now, but it is clear some STAs don't include
byte 9. If not included those two bits probably have no meaning.
Change-Id: I5ea17d7d6710a693f9153a3370813dbb3ae01fa1
Reviewed-on: https://code.wireshark.org/review/24887
Petri-Dish: Richard Sharpe <realrichardsharpe@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Roland Knall [Wed, 20 Dec 2017 10:26:52 +0000 (11:26 +0100)]
Qt: Filter Dissector tables properly
Also cleanup the code a little bit
Change-Id: I53097478fafa46249fa6ecb52508d9bc5b963caa
Reviewed-on: https://code.wireshark.org/review/24908
Petri-Dish: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Reviewed-by: Roland Knall <rknall@gmail.com>
Stig Bjørlykke [Wed, 20 Dec 2017 09:49:56 +0000 (10:49 +0100)]
Qt: Improve ColumnEditorFrame stretching
Use more free space in the ColumnEditorFrame for the Fields entry.
Change-Id: I6bdf2c6ce187dbd2aae08da00d99bda683dc5970
Reviewed-on: https://code.wireshark.org/review/24907
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Nathaniel Clark [Mon, 6 Nov 2017 15:40:18 +0000 (10:40 -0500)]
Infiniband: Fix number of bytes exported if ip_cm_sid
If parse_CM_Req parses a IP_CM_Req_Msg, export just the payload,
instead of the ip_cm_sid and the payload.
Change-Id: I67258d2f6d240885e48ea537906d2769eafe3bae
Signed-off-by: Nathaniel Clark <nathaniel.l.clark@intel.com>
Reviewed-on: https://code.wireshark.org/review/24796
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
Gerald Combs [Tue, 19 Dec 2017 22:53:51 +0000 (14:53 -0800)]
Qt: Fix DataPrinter hex conversions.
Add casts so that we call the unsigned version of QString::arg. We
aren't modifying the byte array and want to avoid deep copies so
constify it.
Change-Id: I2dcdeeab87bb0f810ffd4d36d41d1e47256d487e
Reviewed-on: https://code.wireshark.org/review/24901
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
D. W. Poon [Wed, 20 Dec 2017 00:53:18 +0000 (16:53 -0800)]
Swapped expert item fields in sample dissector
The sample dissector was inconsistent with the definition of
expert_field_info in epan/expert.h.
Change-Id: I533537e52bbcfa7f0cd7ff42e4233f17f40f8bab
Reviewed-on: https://code.wireshark.org/review/24902
Reviewed-by: Michael Mann <mmann78@netscape.net>
Stig Bjørlykke [Wed, 20 Dec 2017 08:08:16 +0000 (09:08 +0100)]
Qt: Add new keyboard shortcuts
Add Ctrl+Shift+I for "Apply as Column"
Add Ctrl+Shift+O for "Show Packet Bytes"
Also added "Show Packet bytes" to the "Analyze" menu.
Change-Id: I03e39bf92c254cf33bef73b1356ad576c92241d2
Reviewed-on: https://code.wireshark.org/review/24906
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Dario Lombardo [Mon, 18 Dec 2017 10:51:14 +0000 (11:51 +0100)]
gitlab-ci: build noextcap and nopcap in gcc7 and clang6 only.
Change-Id: I1893a9bde0c77ec2e1ae6edd50ea3eee1109d7ae
Reviewed-on: https://code.wireshark.org/review/24905
Reviewed-by: Dario Lombardo <lomato@gmail.com>
Dario Lombardo [Mon, 18 Dec 2017 10:47:48 +0000 (11:47 +0100)]
gitlab-ci: rework the gcc jobs to speed up the builds.
Change-Id: I3e19c11677e5094e76d2d6f1f67a48426821620a
Reviewed-on: https://code.wireshark.org/review/24904
Reviewed-by: Dario Lombardo <lomato@gmail.com>
Dario Lombardo [Mon, 18 Dec 2017 09:35:13 +0000 (10:35 +0100)]
gitlab-ci: add retry.
Due to some network failures, add a retry to all jobs.
Change-Id: Ic7737db3348b5e43a30680a7f8e7c2e3850116c3
Reviewed-on: https://code.wireshark.org/review/24903
Reviewed-by: Dario Lombardo <lomato@gmail.com>
Gerald Combs [Tue, 19 Dec 2017 00:55:37 +0000 (16:55 -0800)]
Avoid ASN.1 frame.protocols duplication.
Some of the ASN.1 dissectors process their data indirectly through
dissector tables. Add dissector_try_string_new so that they can do so
without appending duplicate entries to frame.protocols.
Change-Id: If9e12d81f9d0cc5b3bf19816e675a0fb79d904a6
Reviewed-on: https://code.wireshark.org/review/24886
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
Michael Mann [Tue, 19 Dec 2017 13:32:23 +0000 (08:32 -0500)]
Convert Dissector Tables dialog to use model
Now with searchability!
Change-Id: I6ab4e89d4080d3599d522807d39de80cc46e7360
Reviewed-on: https://code.wireshark.org/review/24898
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Roland Knall <rknall@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Stig Bjørlykke [Tue, 19 Dec 2017 09:52:01 +0000 (10:52 +0100)]
Qt: Avoid using cmd+H as keyboard shortcut on macOS
The keyboard shortcut Ctrl+H (cmd+H) is used on macOS to "Hide Wireshark".
Change shortcut for "Export Packet Bytes" to Ctrl+Shift+X.
Change-Id: I2d39911f83bc2aaf20930cda303741fa89738767
Reviewed-on: https://code.wireshark.org/review/24895
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Michael Mann [Tue, 19 Dec 2017 20:13:54 +0000 (15:13 -0500)]
Fix some copy/paste errors with new models.
Change-Id: Ic018fafece38ef0e49321ef9ea5351848d5dd486
Reviewed-on: https://code.wireshark.org/review/24899
Reviewed-by: Michael Mann <mmann78@netscape.net>
Alexis La Goutte [Tue, 19 Dec 2017 15:08:03 +0000 (15:08 +0000)]
plugin: fix extra ';' outside of a function [-Wextra-semi]
Change-Id: I923e4a4f84e8786523333daf372fc5d7cc7ad729
Reviewed-on: https://code.wireshark.org/review/24897
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: João Valverde <j@v6e.pt>
Dario Lombardo [Tue, 19 Dec 2017 09:31:44 +0000 (10:31 +0100)]
Qt: add initializers (CID:
1426703).
Change-Id: Ib75685a099449672b55d63b647fd0f579ad1e5f6
Reviewed-on: https://code.wireshark.org/review/24893
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Stig Bjørlykke [Tue, 19 Dec 2017 08:40:08 +0000 (09:40 +0100)]
wslua: Fix logger after g6a5e90f2
The Qt log output changes in g6a5e90f2 changed the Qt message handler
to use g_log. Lua logging already used g_log. The Qt variant of
funnel logger, which is used by Lua as g_log backend, is currently
using qDebug and this gives recursive calls to g_log and thus an assert.
Rewrite the lua logging to not use g_log.
Change-Id: Icf4f0022a11cb32d2b4f413f76d946f2506e283d
Reviewed-on: https://code.wireshark.org/review/24888
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
AndersBroman [Tue, 19 Dec 2017 08:47:21 +0000 (09:47 +0100)]
[SIP] Add dissection of oc-seq as time stamp.
Change-Id: I0273f8bff7693a7dc7416932649c083c360bc098
Reviewed-on: https://code.wireshark.org/review/24890
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Roland Knall [Tue, 19 Dec 2017 09:06:13 +0000 (10:06 +0100)]
Qt: Fix sorting of enabled protocols description
Change-Id: Ifa7b6e61927615c342839b6c2e7d012198a5f939
Reviewed-on: https://code.wireshark.org/review/24892
Petri-Dish: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Roland Knall <rknall@gmail.com>
Michael Mann [Sun, 17 Dec 2017 02:51:33 +0000 (21:51 -0500)]
Convert Enabled protocols dialog to use model.
Change-Id: I618df2f2608adcd1be5da02262c5296e4d86cfba
Reviewed-on: https://code.wireshark.org/review/24866
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Roland Knall <rknall@gmail.com>
Michael Mann [Mon, 18 Dec 2017 21:42:12 +0000 (16:42 -0500)]
Bugfix capture_info_open() folded into ui/capture.c
Id302e88bed4da8b9b457049fb78b0bc7d7ffabe3 forgot to add brackets around
functionality
Change-Id: I3aa2ed6e927a6daca93846650645d76b0d62043e
Reviewed-on: https://code.wireshark.org/review/24885
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>
Stig Bjørlykke [Mon, 18 Dec 2017 20:02:52 +0000 (21:02 +0100)]
Qt: Resolve duplicate keyboard shortcuts
Two Edit->Copy methods are using the same keyboard shortcut as other
functionality:
1. Ctrl+Shift+D is used for "Copy this item's description" and
"Ignore All Displayed packets"
2. Ctrl+Shift+F is used for "Copy this item's field name" and
"Reload as File Format/Capture"
Resolve this by changing the Copy methods to use Ctrl+Alt+Shift as modifier.
Add a keyboard shortcut for "Copy all visible items" while here.
Change-Id: I0d963501055e63963d93e211f592aa9e82801d3c
Reviewed-on: https://code.wireshark.org/review/24884
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Stig Bjørlykke [Mon, 18 Dec 2017 09:25:03 +0000 (10:25 +0100)]
Qt: Add Collapse Subtrees
This item is missing from the Qt port.
Change-Id: Iacc18a7c2eb2368d6566622788a4e900868d446e
Reviewed-on: https://code.wireshark.org/review/24879
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Florian Bezold [Thu, 7 Dec 2017 08:00:13 +0000 (09:00 +0100)]
androiddump: Fix adb tcpdump PTY CR/LF handling
Devices running Android >= 7 have a different adb shell handling than
before:
- Before Android 7, adb always runs shell commands in a PTY
(pseudoterminal), which automatically converts all \n to \r\n
- Since Android 7, adb no longer uses a PTY if a command is directly
started (like 'tcpdump' in our case).
The original androiddump code reversed the PTY \r\n handling as for
older devices. Commit
66507b9 for bug 13510 removed that which supported
newer devices while breaking all older devices.
This fix tries to support both by first trying to use the new
"shell,raw:" adb command syntax. If that succeeds, adb/device must
support non-PTY shells and we don't reverse any \r\n.
If that fails, it's most likely an older device, and we fall back to the
original "shell:" command and enable \r\n reversal.
(To prevent misleading error popups in Wireshark, the warning log in
adb_send when the first attempt fails is changed to a debug log).
Ping-Bug: 13510
Change-Id: I7e0a4f594ebe5dde682cceb667330459337a0c9c
Reviewed-on: https://code.wireshark.org/review/24721
Reviewed-by: Mikael Kanstrup <mikael.kanstrup@gmail.com>
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
AndersBroman [Mon, 18 Dec 2017 09:18:05 +0000 (10:18 +0100)]
[SIP] Make a filter for Overload Control Value.
Change-Id: I8ee552d331388a1fa748bff765afe5b53508f63f
Reviewed-on: https://code.wireshark.org/review/24878
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Marko Hrastovec [Fri, 8 Dec 2017 11:12:38 +0000 (12:12 +0100)]
asterix: special processing for field item I021/150
There is a problem where one field decodes differently
depending on another fields content.
A code has been added to save information for 021_150_IM field.
When the next field 021_150_ASPD is decoded, the
stored information determines how it shall be scaled.
This is a special case for I021/150 only.
The same way as this change, other changes shall be done for
fields that are dependent on other fields.
Bug: 14076
Change-Id: I51f2c8f79bc6bde9efc0429e54fbea36818e9b36
Reviewed-on: https://code.wireshark.org/review/24734
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Florian Bezold [Mon, 4 Dec 2017 16:38:46 +0000 (17:38 +0100)]
Fix SOCKS5 state machine for authentication, two-pass dissection
1. SOCKSv5 dissection was broken if authentication was used since the
used state machine states were initialized, but not saved correctly, and
the first server state transition was wrong.
I also fixed the GSSAPI variant analogously, but could not verify this
since I have no traces of this.
2. SOCKSv5 actually has a different "subnegotiation field" for the
authentication messages. This is added, and the original SOCKS version
is added as a generated field (i.e. for filtering).
3. Info column setting is moved to the *_display_socks_* routines to fix
two-pass dissection (as used by GUI Wireshark), since only here the
correct per-packet state is used. The hash_info (as used by the
*_state_machine_* functions) is already fully populated on second pass.
Change-Id: Ib39434dafce08188cd2da347118d0509a7613915
Reviewed-on: https://code.wireshark.org/review/24712
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Gerald Combs [Fri, 15 Dec 2017 21:40:34 +0000 (13:40 -0800)]
-1 is a valid tree_type value.
Adjust tree_expanded and FieldInformation::treeType accordingly.
Change-Id: I9b12c28550ba2639f636531a7ea1841df0638b5e
Reviewed-on: https://code.wireshark.org/review/24844
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Richard Sharpe [Mon, 18 Dec 2017 00:05:51 +0000 (16:05 -0800)]
ieee80211: Remove notices about D3.1 of IEEE802.11ac.
These items are now in 802.11 2016 so they are no longer draft items.
Change-Id: I89b694f30700e08d9edc2e3707f36f8cf30dd0f2
Reviewed-on: https://code.wireshark.org/review/24877
Petri-Dish: Richard Sharpe <realrichardsharpe@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Gerald Combs [Sun, 17 Dec 2017 22:40:06 +0000 (14:40 -0800)]
Qt: Process our event loop less often at startup.
Add back info_update_freq_ and use it to skip event loop processing.
Change-Id: Id36b4786c5ff1458abbf12f4e9ded13c56e14d57
Reviewed-on: https://code.wireshark.org/review/24876
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 [Sun, 17 Dec 2017 20:51:36 +0000 (12:51 -0800)]
Qt: Handle RecentFileStatus destruction manually.
Restore the "deleteLater" behavior removed in
889aacae6e so that we
don't trigger an assert in debug builds.
Move the itemStatusFinished connection to RecentFileStatus while we're
here.
Bug: 14279
Change-Id: I79bc74d77fb3ad970c7c8a71037f680d55eac47c
Reviewed-on: https://code.wireshark.org/review/24875
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
Uli Heilmeier [Sun, 17 Dec 2017 09:47:30 +0000 (10:47 +0100)]
QT: Fix qUtf8Printable error
macro qUtf8Printable() has been defined with QT 5.4
therefore we need qt_ui_utils.h included
Change-Id: I6301d5eda124d2033033c6a91447b15736cdc8c2
Reviewed-on: https://code.wireshark.org/review/24870
Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Petri Dish Buildbot
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
João Valverde [Sun, 17 Dec 2017 12:44:50 +0000 (12:44 +0000)]
autotools: Fixup plugins Custom.*.example
plugin_ldadd was removed in
262a84c384353b2a88a6e81cdc499ab94a8316c2.
Change-Id: I516aa1be3466433bf8db83ab3d1773bf88082e8c
Reviewed-on: https://code.wireshark.org/review/24850
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot
Reviewed-by: João Valverde <j@v6e.pt>
João Valverde [Sun, 17 Dec 2017 12:26:26 +0000 (12:26 +0000)]
CMake: Replace generator expression with variable
Should fix OSX buildbot.
Change-Id: I52abdeab8c547079edc8aec6a0c6e12e928838c6
Reviewed-on: https://code.wireshark.org/review/24873
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot
Reviewed-by: João Valverde <j@v6e.pt>
João Valverde [Fri, 15 Dec 2017 00:49:31 +0000 (00:49 +0000)]
plugins: Remove moduleinfo.h
Micro version bump for mate to homogenize it between CMake and autotools.
The cmake macro doesn't handle the "a" suffix and it doesn't seem worth
implementing.
Change-Id: Ib022c6aa170623b83a9700e4fa098c60a9cddfab
Reviewed-on: https://code.wireshark.org/review/24847
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot
Reviewed-by: João Valverde <j@v6e.pt>
João Valverde [Fri, 15 Dec 2017 22:13:59 +0000 (22:13 +0000)]
plugin.rc.in: Cleanup some unnecessary code
Also add comment noting that MSVC_VARIANT is not the same thing as
CMAKE_GENERATOR.
Change-Id: Icc0f4a491786e4045c650509957655ef41352b29
Reviewed-on: https://code.wireshark.org/review/24846
Reviewed-by: João Valverde <j@v6e.pt>
Gerald Combs [Sun, 17 Dec 2017 08:16:56 +0000 (08:16 +0000)]
[Automatic update for 2017-12-17]
Update manuf, services enterprise numbers, translations, and other items.
Change-Id: Ideac9831381dbf6411af0e1d8bfa4fef6a1d7769
Reviewed-on: https://code.wireshark.org/review/24867
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Gerald Combs [Sat, 16 Dec 2017 22:24:24 +0000 (14:24 -0800)]
Qt: Update our recent status sooner at startup.
Update our recent file status as soon as we read recent_common.
Run recent stats updates in the global thread pool.
Revert
15a97b5986 since it's no longer needed.
Change-Id: If1b08ea640dfcad26affab5d20c80c90fbf133f2
Reviewed-on: https://code.wireshark.org/review/24862
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>
Martin Mathieson [Sat, 16 Dec 2017 21:01:19 +0000 (21:01 +0000)]
LTE RLC graph: export graph as image, like TCP stream does
Change-Id: I8709f7c09528a44a9729a06ea2ba4d6f99dbeccb
Reviewed-on: https://code.wireshark.org/review/24864
Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Richard Sharpe [Sat, 16 Dec 2017 17:52:01 +0000 (09:52 -0800)]
ieee80211: Bring VHT Capabilities IE into conformance with IEEE802.11-2016
IEEE802.11-2016 standardized those bits, so it's no longer a draft standard.
I am slowly getting these things correct as I prepare for support for
IEEE802.11ax D2.0.
Change-Id: I3fc4497f2b85bae78043b9fd997379a44898f3db
Reviewed-on: https://code.wireshark.org/review/24860
Petri-Dish: Richard Sharpe <realrichardsharpe@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Martin Mathieson [Sat, 16 Dec 2017 10:33:28 +0000 (10:33 +0000)]
Simple statistics export: fill in callback to get item data
Bug: 13942
Change-Id: Ie7d13b1c17083d0a5b98282f04e6ac30319352a7
Reviewed-on: https://code.wireshark.org/review/24853
Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Gerald Combs [Sat, 16 Dec 2017 22:15:28 +0000 (14:15 -0800)]
Log output updates.
Add a Qt message handler that calls g_log. Add milliseconds to the
g_log_message_handler timestamp.
Change-Id: I5b1c1d902b6b05cd8daa01741b19d6c2048dfb9a
Reviewed-on: https://code.wireshark.org/review/24865
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
Uli Heilmeier [Sat, 16 Dec 2017 20:55:18 +0000 (21:55 +0100)]
Kerberos: Update and fix KDCOptions and TicketFlags
Fix and update KDCOptions and TicketFlags.
Used references:
* https://github.com/heimdal/heimdal/blob/master/lib/asn1/krb5.asn1#L330
* https://msdn.microsoft.com/en-us/library/
cc246090.aspx
* https://tools.ietf.org/html/rfc8062#section-3
Bug: 14261
Change-Id: I0e34425fc35e0eba14c700f82cbf2441365b139d
Reviewed-on: https://code.wireshark.org/review/24863
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
Michael Mann [Sat, 16 Dec 2017 15:03:55 +0000 (10:03 -0500)]
Fix memory leaks in Expert Info dialog
Models and children weren't deleted which leaked memory all over the place.
Change-Id: I961016b2501ad8cc8c75cf5fa5b0c86756a29382
Reviewed-on: https://code.wireshark.org/review/24858
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
Michael Mann [Thu, 14 Dec 2017 18:44:05 +0000 (13:44 -0500)]
Convert Supported Protocols dialog to use model
Also have search file search name, filter and description columns
Change-Id: Id519c5b1deb4a80e3b95437cf2e6d3e9510e4b11
Reviewed-on: https://code.wireshark.org/review/24857
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
Uli Heilmeier [Thu, 14 Dec 2017 20:45:56 +0000 (21:45 +0100)]
BGP: add Open message error/unsupported capability
According to RFC 5492 [1], paragraph 5, Data field of BGP
notification for Open message error/unsupported capability must
list the set of unsupported capabilities
Bug: 14274
Change-Id: Iacd33b5c83bc234652d2a5444f0029640d33e1c5
Reviewed-on: https://code.wireshark.org/review/24829
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Martin Kaiser [Fri, 15 Dec 2017 18:18:00 +0000 (19:18 +0100)]
qt: follow stream: prevent duplicate close
621498f88e882dbe8cc3a2c8373bb342bb0dbe77 fixed a crash that's caused by
closing the follow stream dialogue multiple times. Another way to get a
similar crash is to press the Back or "Filter out this stream" buttons
again while we're already about to close.
Ignore the two buttons in this case.
Change-Id: Ia8d7b3ca500db2519a784b42c0744e2527b9d5f6
Reviewed-on: https://code.wireshark.org/review/24839
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
Stig Bjørlykke [Fri, 15 Dec 2017 18:26:00 +0000 (19:26 +0100)]
wslua: Fix crash in Dir.open()
Do not give an uninitialised error pointer to g_dir_open(), this
will give a crash if g_dir_open() fails.
Remove wslua_dir.dummy because it is not used by anyone.
Change-Id: I044eee021393f2ea2aa022138bbf6fd099eb0908
Reviewed-on: https://code.wireshark.org/review/24840
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>