metze/wireshark/wip.git
6 years agoQt: Make we shut down cleanly when exiting early.
Gerald Combs [Mon, 26 Feb 2018 18:39:27 +0000 (10:39 -0800)]
Qt: Make we shut down cleanly when exiting early.

Add an exit_application() routine that calls wsApp->quit() + exit() in
the Qt UI and exit() in the GTK+ UI. Make sure we call it instead of
exit() when needed.

Bug: 14395
Change-Id: I171b5fd19ce4664db4a2ebb4b8c33e278dcec427
Reviewed-on: https://code.wireshark.org/review/26121
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>
6 years agoQUIC: Add heuristic for avoid conflict with GQUIC
Alexis La Goutte [Wed, 28 Feb 2018 07:04:25 +0000 (08:04 +0100)]
QUIC: Add heuristic for avoid conflict with GQUIC

and UDP port 443 is not (yet) official port for QUIC...

Bug: 13881
Change-Id: I637241bd327adc6c5cccbcd68524d2ef3811e8e8
Reviewed-on: https://code.wireshark.org/review/26166
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
6 years agoQUIC: Add dissection of RETRY
Alexis La Goutte [Sat, 24 Feb 2018 16:53:33 +0000 (17:53 +0100)]
QUIC: Add dissection of RETRY

Bug: 13881
Change-Id: I49075dc227c0b132ef4bc37d1ff28b14bbfd3e4f
Reviewed-on: https://code.wireshark.org/review/26083
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
6 years agoQUIC: use switch/case for long_packet_type and move to function
Alexis La Goutte [Sat, 24 Feb 2018 16:44:37 +0000 (17:44 +0100)]
QUIC: use switch/case for long_packet_type and move to function

Ping-Bug: 13881
Change-Id: If601344d042909ae190226f8039f0b9d016fb8d7
Reviewed-on: https://code.wireshark.org/review/26082
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
6 years agoNAS-5GS: More dissection.
AndersBroman [Wed, 28 Feb 2018 15:54:01 +0000 (16:54 +0100)]
NAS-5GS: More dissection.

Change-Id: Iedf85db2b1da07f1a6b87db20250034b795cfd34
Reviewed-on: https://code.wireshark.org/review/26179
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years agoSimplify the mode passed to CreateNamedPipe().
Guy Harris [Thu, 1 Mar 2018 02:43:44 +0000 (18:43 -0800)]
Simplify the mode passed to CreateNamedPipe().

There's one mode you use if byte_mode is true, and another mode you use
if it's false.  My head hurts when I try to pretend to be a top-down
parser for C and feed myself the existing expression, and Visual Studio
Code Analyzer says "are you sure that's what you had in mind?", so I'm
guessing the modes are:

byte mode: PIPE_TYPE_BYTE | PIPE_READMODE_BYTE | PIPE_WAIT
not byte mode: PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE | PIPE_WAIT

and am just using one test of byte_mode to choose between them.

Put the entire function under an #ifdef, so we can mark the byte_mode
argument as unused on UN*X but not on Windows.

Change-Id: Ib2d0b80f870b1789c1375ccb017bd90e93dca5ce
Reviewed-on: https://code.wireshark.org/review/26201
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>
6 years agoDon't handle various "command to send" values in the default case.
Guy Harris [Thu, 1 Mar 2018 01:52:34 +0000 (17:52 -0800)]
Don't handle various "command to send" values in the default case.

The default case ignores the high-order bit, which is set in all the
values for "command to send", so they will never be matched.  The values
moved out of the default case, if their upper bit is clear, either don't
correspond to any command in T.30 or correspond to an initial
identification command, which never has the upper bit set, so there's no
risk of misidentification by processing all of the "command to send"
values outside the default case.

Thanks and a tip of the Hatlo hat to Visual Studio Code Analysis for
catching this one.

Change-Id: I6192b0c5a6dcfd31b9fd757be736a311a9d089e6
Reviewed-on: https://code.wireshark.org/review/26198
Reviewed-by: Guy Harris <guy@alum.mit.edu>
6 years agomp4: limit the recursion depth for boxes
Martin Kaiser [Mon, 26 Feb 2018 22:19:15 +0000 (23:19 +0100)]
mp4: limit the recursion depth for boxes

Although the dissection of each box header consumes a couple of bytes,
it turned out that it's still possible to crash wireshark with a sample
file that contains a large number of nested boxes. The stack will fill
up before we reach the end of the data bytes.

Keep track of the recursion depth as we walk through the hierarchy of
boxes. Abort if we reach the (locally defined) upper limit.

Bug: 13777
Change-Id: I0f67245a5c74131f10d0f9d99b39ad31711b9775
Reviewed-on: https://code.wireshark.org/review/26167
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>
6 years ago[PFCP] added two more IEs
Joakim Karlsson [Wed, 28 Feb 2018 20:20:49 +0000 (21:20 +0100)]
[PFCP] added two more IEs

8.2.86 Subsequent Volume Quota
8.2.87 Subsequent Time Quota

Change-Id: I00b99c5fcc9fc7c157a048c1cbd901b56e12a8d7
Reviewed-on: https://code.wireshark.org/review/26189
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years agoPrint the right value for signed statistics tap table items.
Guy Harris [Wed, 28 Feb 2018 21:55:02 +0000 (13:55 -0800)]
Print the right value for signed statistics tap table items.

Thanks and a tip of the Hatlo hat to Visual Studio Code Analysis for
finding this one.

Change-Id: If2312ba98d1c3060e525dd8b2afe3e0ff07fb5bd
Reviewed-on: https://code.wireshark.org/review/26194
Reviewed-by: Guy Harris <guy@alum.mit.edu>
6 years agoflex: add also (-W)unreachable-code to ignore warning (for flex generate file)
Alexis La Goutte [Thu, 22 Feb 2018 07:03:12 +0000 (08:03 +0100)]
flex: add also (-W)unreachable-code to ignore warning (for flex generate file)

Change-Id: I09ab6d91b45113432255cb20ae30440ea0438b23
Reviewed-on: https://code.wireshark.org/review/25984
Reviewed-by: Guy Harris <guy@alum.mit.edu>
6 years agoFix StringCchPrintf() calls.
Guy Harris [Wed, 28 Feb 2018 20:23:57 +0000 (12:23 -0800)]
Fix StringCchPrintf() calls.

One was missing an argument; supply the necessary string.

The other was assuming that an LPARAM was 32 bits when that's not the
case on 64-bit Windows - the underlying value is 32-bit, so we just cast
to int.

Change-Id: Ie2a38e27f2ea211628d2c751a7807bb9ed396c64
Reviewed-on: https://code.wireshark.org/review/26190
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>
6 years agoFix a check.
Guy Harris [Wed, 28 Feb 2018 20:07:55 +0000 (12:07 -0800)]
Fix a check.

Presumably the intent is to check for unsigned integer and signed
integer types, not to check twice for unsigned integer types.

Thanks and a tip of the Hatlo hat to Visual Studio Code Analyzer for
finding this.

Change-Id: Ie8e4d231af929ee8e626c5c9258c3356d5209f4f
Reviewed-on: https://code.wireshark.org/review/26187
Reviewed-by: Guy Harris <guy@alum.mit.edu>
6 years agoRedo the way we choose N/S/E/W.
Guy Harris [Wed, 28 Feb 2018 19:45:32 +0000 (11:45 -0800)]
Redo the way we choose N/S/E/W.

This should squelch a warning from Visual Studio Code Analyzer.

Change-Id: Ie66e45276458a6f880c9b020ff541b7d2a71433a
Reviewed-on: https://code.wireshark.org/review/26184
Reviewed-by: Guy Harris <guy@alum.mit.edu>
6 years agoQUIC: Display GREASE version..
Alexis La Goutte [Thu, 8 Feb 2018 14:06:39 +0000 (15:06 +0100)]
QUIC: Display GREASE version..

Change-Id: I1005bbaf528e91dd8244fb94a0530d9152db38a0
Reviewed-on: https://code.wireshark.org/review/25691
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
6 years agoInclude <config.h> so UNICODE is defined.
Guy Harris [Wed, 28 Feb 2018 09:27:27 +0000 (01:27 -0800)]
Include <config.h> so UNICODE is defined.

All other files should do so; this file should, so that we're using the
Unicode versions of Windows APIs (especially given that other files that
include wsutil/unicode-utils.h will be doing so and expecting UTF-16
strings from utf_8to16_snprintf()).

Change-Id: I7eccf580ab0dc504aa78b345e36e2fcda818a7c5
Reviewed-on: https://code.wireshark.org/review/26170
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>
6 years agot38: allocate memory in pinfo pool scope.
Dario Lombardo [Tue, 27 Feb 2018 13:42:57 +0000 (14:42 +0100)]
t38: allocate memory in pinfo pool scope.

Change-Id: I627f21f2f67589374749f4f16f5d71cf45d98d68
Reviewed-on: https://code.wireshark.org/review/26137
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
6 years agodof: don't initialize nonce it is useless.
Dario Lombardo [Wed, 28 Feb 2018 12:59:13 +0000 (13:59 +0100)]
dof: don't initialize nonce it is useless.

Change-Id: I300145c04293fa06ea6af0a5797d27023c3b2fbc
Reviewed-on: https://code.wireshark.org/review/26177
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years ago6LoWPAN: Less scary display if UDP checksum is elided
Robert Sauter [Fri, 23 Feb 2018 15:10:27 +0000 (16:10 +0100)]
6LoWPAN: Less scary display if UDP checksum is elided

Set the 'recomputed' checksum to 0xffff instead of 0 so that the UDP
dissector does not show an 'Illegal Checksum value (0)' PI_ERROR.

Bug 14458

Change-Id: I0fba0979be5a5b2957a7cec98c0df7996491d3b5
Reviewed-on: https://code.wireshark.org/review/26052
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
6 years agocsn1: set pointer before using it (found by clang).
Dario Lombardo [Wed, 28 Feb 2018 10:37:11 +0000 (11:37 +0100)]
csn1: set pointer before using it (found by clang).

Change-Id: I4ff2fb3861725a492736facd2d084baeef8fd09f
Reviewed-on: https://code.wireshark.org/review/25993
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years agoL16_mono: Add L16 monaural codec plugin as functional example
Jaap Keuter [Tue, 27 Feb 2018 07:22:25 +0000 (08:22 +0100)]
L16_mono: Add L16 monaural codec plugin as functional example

This codec plugin serves a dual purpose.
First it is to add L16 codec suppport to Wireshark.
Second it is an illustration of a basic codec plugin module.

Change-Id: I64394dab3257ae49dece0257b16cd969503918e2
Reviewed-on: https://code.wireshark.org/review/26131
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years agorrc: remove unused function.
Dario Lombardo [Wed, 28 Feb 2018 11:38:06 +0000 (12:38 +0100)]
rrc: remove unused function.

Change-Id: Id3d0c8ffb7a2f4c1a51678aa112beb56adc84609
Reviewed-on: https://code.wireshark.org/review/26174
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years agorrc: move allocation within if statement.
Dario Lombardo [Tue, 27 Feb 2018 16:32:24 +0000 (17:32 +0100)]
rrc: move allocation within if statement.

Change-Id: I2282a834560ef81a4f974e80fd6a0286e83a5461
Reviewed-on: https://code.wireshark.org/review/26143
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years agotshark(.pod): fix spelling-error-in-manpage found by lintian
Alexis La Goutte [Wed, 28 Feb 2018 08:02:15 +0000 (09:02 +0100)]
tshark(.pod): fix spelling-error-in-manpage found by lintian

inital => initial

Change-Id: Id92a853bd6b24e06b2f6074903f8e89249c6c2cc
Reviewed-on: https://code.wireshark.org/review/26168
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years agoGQUIC: Try to fix ACK frame with Q039
Alexis La Goutte [Tue, 27 Feb 2018 21:33:32 +0000 (22:33 +0100)]
GQUIC: Try to fix ACK frame with Q039

Change-Id: Id717c5354826c6aac0b72426213a128e0f501377
Reviewed-on: https://code.wireshark.org/review/26154
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years agoGQUIC: Change all integers (and floating) encoding
Alexis La Goutte [Tue, 27 Feb 2018 19:05:39 +0000 (20:05 +0100)]
GQUIC: Change all integers (and floating) encoding

Change-Id: I197bf7f47685b9d66e5df5cc091904834eea20cd
Reviewed-on: https://code.wireshark.org/review/26153
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years agoGQUIC: for item with length = 1, use ENC_NA for encoding
Alexis La Goutte [Tue, 27 Feb 2018 18:14:21 +0000 (19:14 +0100)]
GQUIC: for item with length = 1, use ENC_NA for encoding

Change-Id: I3b65e7a2c27763448717415a12a59d773fdb5d65
Reviewed-on: https://code.wireshark.org/review/26152
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years agoGQUIC: Packet Number is now big endian
Alexis La Goutte [Tue, 27 Feb 2018 18:11:36 +0000 (19:11 +0100)]
GQUIC: Packet Number is now big endian

With Q039 is now big endian for integers and floating number

Bug: 14462
Change-Id: Ifc2bd4454830e2f4328c4c1d8d1ea37d3542e8da
Reviewed-on: https://code.wireshark.org/review/26151
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years agoBGP: Heuristic for IPv6 NLRI path identifier
Uli Heilmeier [Tue, 27 Feb 2018 21:56:29 +0000 (22:56 +0100)]
BGP: Heuristic for IPv6 NLRI path identifier

NLRIs can contain path identifiers as defined in RFC7911.

This commit adopts the IPv4 heuristic to IPv6 to detect usage
of additional path identifier.

Bug: 14241
Change-Id: I6b99c079b12d1f9a3e05b152a5540a621076e965
Reviewed-on: https://code.wireshark.org/review/26157
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
6 years ago[PFCP] added Aggregated URRs IE
Joakim Karlsson [Tue, 27 Feb 2018 23:13:29 +0000 (00:13 +0100)]
[PFCP] added Aggregated URRs IE

Added
Table 7.5.2.4-2 Aggregated URRs
8.2.84 Multiplier
8.2.85 Aggregated URR ID IE

Change-Id: Ic7b25d155c4c113503319e1360910dd09407a55f
Reviewed-on: https://code.wireshark.org/review/26161
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years ago[PFCP] Name update of IEs
Joakim Karlsson [Tue, 27 Feb 2018 21:31:25 +0000 (22:31 +0100)]
[PFCP] Name update of IEs

8.2.31 SxSMReq-Flags -> PFCPSMReq-Flags
8.2.32 SxSRRsp-Flags -> PFCPSRRsp-Flags

In accordance with 3GPP TS 29.244 V15.0

Change-Id: I5650366bd061ffd51f8577aeb420681abced5889
Reviewed-on: https://code.wireshark.org/review/26150
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years agoMake sure GetModuleHandle(_T("kernel32.dll") succeeds.
Guy Harris [Wed, 28 Feb 2018 04:19:48 +0000 (20:19 -0800)]
Make sure GetModuleHandle(_T("kernel32.dll") succeeds.

If it doesn't, we're living in the Twilight Zone - that's like not
finding libc/libSystem/whatever-your-UN*X-calls-it on a UN*X - but this
should at least remove one complaint from Visual Studio Code Analyzer.

Change-Id: Iccb568ea022ac28be962ab3fec5bccdfdf69ac13
Reviewed-on: https://code.wireshark.org/review/26165
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Reviewed-by: Guy Harris <guy@alum.mit.edu>
6 years agoieee80211: Fix handling of compressed block acks.
Richard Sharpe [Wed, 28 Feb 2018 01:08:50 +0000 (17:08 -0800)]
ieee80211: Fix handling of compressed block acks.

Thomas Derham pointed out that there was a problem with my changes
and supplied a fix.  The pronblem was that I was fetching important info
after offset had moved on. This change is slightly different but works for
Thomas.

Change-Id: I45862b87f3d9626285111dab83a0067d3d529ab2
Reviewed-on: https://code.wireshark.org/review/26162
Petri-Dish: Richard Sharpe <realrichardsharpe@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Richard Sharpe <realrichardsharpe@gmail.com>
6 years agoSquelch some Visual Studio Code Analyzer warnings in Flex-generated scanners.
Guy Harris [Wed, 28 Feb 2018 04:12:53 +0000 (20:12 -0800)]
Squelch some Visual Studio Code Analyzer warnings in Flex-generated scanners.

Hopefully this filters out stuff about which we can't do very much
(other than send off a Flex fix and wait for it to be accepted and end
up in a WinFlexBison package), making it easier to find the stuff about
which we *can* directly do something (i.e., problems in code *we* wrote).

Change-Id: I9dec0389c3e126697acb307d30a823b9b285ef45
Reviewed-on: https://code.wireshark.org/review/26164
Reviewed-by: Guy Harris <guy@alum.mit.edu>
6 years agoMake sure CAPACITY() doesn't shift the 1 out of range.
Guy Harris [Wed, 28 Feb 2018 02:50:33 +0000 (18:50 -0800)]
Make sure CAPACITY() doesn't shift the 1 out of range.

Make the 1 we shift left the size of a size_t, so it'll only go out of
range if the result couldn't possibly fit in a size_t.  (That should
also make the object of the shift unsigned, which may squelch some other
complaints.)

Not that the map is *likely* to be bigger than 4GB, but it should
squelch some complaints from Visual Studio Code Analysis.

Change-Id: I489bfe6b1d9d4329c267936d9106dbba4388c492
Reviewed-on: https://code.wireshark.org/review/26163
Reviewed-by: Guy Harris <guy@alum.mit.edu>
6 years agoieee80211: Fix the handling of PPE Thresholds for 802.11ax.
Richard Sharpe [Tue, 27 Feb 2018 21:50:31 +0000 (13:50 -0800)]
ieee80211: Fix the handling of PPE Thresholds for 802.11ax.

Change-Id: I74b9e3e6d459378bc9cc308d13375d2e13b64f73
Reviewed-on: https://code.wireshark.org/review/26160
Petri-Dish: Richard Sharpe <realrichardsharpe@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Richard Sharpe <realrichardsharpe@gmail.com>
6 years agoaddr: Include trailing '\0' in length from ipv6_to_str()
Stig Bjørlykke [Tue, 27 Feb 2018 22:15:16 +0000 (23:15 +0100)]
addr: Include trailing '\0' in length from ipv6_to_str()

All other 'addr_to_str' functions does include the trailing '\0'.

This is a bug introduced in g7507b11e.

Change-Id: I6ac2be6d8aedf5c7fbea9dfe67b4d2b4c7f50a6f
Reviewed-on: https://code.wireshark.org/review/26159
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
6 years agortspstat: use integer cast in g_hash_table.
Dario Lombardo [Tue, 27 Feb 2018 14:05:27 +0000 (15:05 +0100)]
rtspstat: use integer cast in g_hash_table.

Change-Id: I5ebdbe5a94ed377c120411c46daca3903036fe42
Reviewed-on: https://code.wireshark.org/review/26140
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
6 years ago[PFCP] updated Report Type IE
Joakim Karlsson [Tue, 27 Feb 2018 21:47:17 +0000 (22:47 +0100)]
[PFCP] updated Report Type IE

Added Bit 4 – UPIR (User Plane Inactivity Report)

Change-Id: Ic39161dab608252386fcac350ca2c93991ef6f6f
Reviewed-on: https://code.wireshark.org/review/26155
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>
6 years ago[PFCP] updated Measurement Information IE
Joakim Karlsson [Tue, 27 Feb 2018 21:56:45 +0000 (22:56 +0100)]
[PFCP] updated Measurement Information IE

Added Bit 3 – RADI (Reduced Application Detection Information)

Change-Id: If55db7f72148fb6faa9b3400a85b041e60761da3
Reviewed-on: https://code.wireshark.org/review/26156
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>
6 years ago[PFCP] more name changes
Joakim Karlsson [Tue, 27 Feb 2018 22:08:05 +0000 (23:08 +0100)]
[PFCP] more name changes

8.2.77 Sx Association Release Request -> PFCP Association Release Request

Change-Id: I325d299a2d9d5c0bee40c2a7650906026cee02b5
Reviewed-on: https://code.wireshark.org/review/26158
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>
6 years agolacp: Info column and display filter rework
Joerg Mayer [Mon, 26 Feb 2018 16:50:49 +0000 (17:50 +0100)]
lacp: Info column and display filter rework

- Add key and flags to info column
- More hierachical display filter names
- Remove almost all verbose field descriptions

Change-Id: Iffa24321f2ee36034fb315714506da200e17e760
Reviewed-on: https://code.wireshark.org/review/26127
Petri-Dish: Jörg Mayer <jmayer@loplof.de>
Tested-by: Petri Dish Buildbot
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
6 years agoCMake: Add more .PDBs to pdb_zip_package.
Gerald Combs [Tue, 27 Feb 2018 18:10:54 +0000 (10:10 -0800)]
CMake: Add more .PDBs to pdb_zip_package.

Add .PDBs under the extcap and plugin directories to the
Wireshark-pdb-xxx.zip package.

Change-Id: Icc003a212f21c02bcf8ccf326b43cfebbf32a9a3
Reviewed-on: https://code.wireshark.org/review/26146
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
6 years ago6lowpan: Use correct offset for "UDP header compression" header
Stig Bjørlykke [Tue, 27 Feb 2018 20:47:07 +0000 (21:47 +0100)]
6lowpan: Use correct offset for "UDP header compression" header

Change-Id: I900dce329a593e55b894faf3e41071893ed91c46
Reviewed-on: https://code.wireshark.org/review/26147
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
6 years ago[NAS-5GS] Dissect more of the protocol.
AndersBroman [Mon, 26 Feb 2018 16:19:54 +0000 (17:19 +0100)]
[NAS-5GS] Dissect more of the protocol.

Change-Id: Id398922f86902cc23053191e6f22b77511270077
Reviewed-on: https://code.wireshark.org/review/26134
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years agolacp: remove unused assignments (found by clang).
Dario Lombardo [Tue, 27 Feb 2018 13:05:31 +0000 (14:05 +0100)]
lacp: remove unused assignments (found by clang).

Change-Id: I230eec0649bb421bac2762b674bf6d0ae5e3afdb
Reviewed-on: https://code.wireshark.org/review/26135
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years agowisun: extend EDFE display; fix Authenticator EUI-64 field name
Robert Sauter [Sun, 25 Feb 2018 08:38:16 +0000 (09:38 +0100)]
wisun: extend EDFE display; fix Authenticator EUI-64 field name

Change-Id: Ia0ef5d4f982a39c8addf5208481378f50d0f8bcf
Reviewed-on: https://code.wireshark.org/review/26094
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
6 years ago[XML] Add application/rs-metadata+xml
AndersBroman [Tue, 27 Feb 2018 11:32:36 +0000 (12:32 +0100)]
[XML] Add application/rs-metadata+xml

Change-Id: I766ece91273603d6dd53a05771631dfc10b17566
Reviewed-on: https://code.wireshark.org/review/26133
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years agoadb: fix buffer overflow while processing message payload
Peter Wu [Sun, 25 Feb 2018 20:16:52 +0000 (21:16 +0100)]
adb: fix buffer overflow while processing message payload

Fix a heap buffer overflow (write) when the message header length is
smaller than the actual message payload length. Add expert info to
detect this since it can also occur when the header is wrongly matched
with a data fragment (this dissector issue is not fixed here).

Bug: 14460
Change-Id: I12f411a5189809a0931dfcdb2797997d5e19efc1
Reviewed-on: https://code.wireshark.org/review/26104
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years agoadb: fix Malformed packet while parsing CONNECT command
Peter Wu [Sun, 25 Feb 2018 16:53:21 +0000 (17:53 +0100)]
adb: fix Malformed packet while parsing CONNECT command

Previous adb versions included a NULL terminator in the banner, but this
is not required by the specification[1] and in newer versions there is
no such terminator. This patch fixes issue 1 of bug 14460.

 [1]: https://android.googlesource.com/platform/system/core/+/android-8.1.0_r7/adb/protocol.txt#56

Change-Id: I0a3ad1499d68d38c430dd386854ddba0ce755538
Ping-Bug: 14460
Reviewed-on: https://code.wireshark.org/review/26097
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years agoQt/USB: Allow USB src/dst addresses to be selected for columns
Peter Wu [Sun, 25 Feb 2018 14:41:02 +0000 (15:41 +0100)]
Qt/USB: Allow USB src/dst addresses to be selected for columns

Make "Prepare a Filter" from the Source and Destination columns work for
USB source and destination address, this value must be quoted as well.

Change-Id: Ib7a772050c204e716781cc27f9eddbdb7971e547
Reviewed-on: https://code.wireshark.org/review/26096
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years agoAllow hexadecimal and octal numbers for tshark Decode As
Peter Wu [Sun, 25 Feb 2018 00:11:25 +0000 (01:11 +0100)]
Allow hexadecimal and octal numbers for tshark Decode As

tshark(1) documents "-d ethertype==0x0800" which suggests that
hexadecimal values must be accepted.

While at it, be a bit more stricter about the selector match (previously
"1-2 junk" was accepted too, reject trailing spaces now).

Change-Id: I85fbd2f55eaef51902ddaf2e559ab08ad59a5af7
Reviewed-on: https://code.wireshark.org/review/26089
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years agoQt: accept hexadecimal input in Decode As dialog
Peter Wu [Sat, 24 Feb 2018 23:19:43 +0000 (00:19 +0100)]
Qt: accept hexadecimal input in Decode As dialog

The usb.product dissector table displays vendor+product values as
hexadecimal, ensure that these are not parsed as zero.

While at it, clarify the meaning of the model contents. Ideally the
model should store numeric selectors as integers rather than strings,
but that requires more work.

Change-Id: I3bb17ad0d0a03c8813ded4ea6890dbc2aedd738d
Reviewed-on: https://code.wireshark.org/review/26087
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years agoERF: Add support for new extension header and Provenance tags
Anthony Coddington [Sun, 25 Feb 2018 22:21:25 +0000 (11:21 +1300)]
ERF: Add support for new extension header and Provenance tags

Add support for Entropy Extension header, currently with one field. Uses
a conversion function to convert representation to bits.
Add various entropy and tap mode Provenance (ERF_TYPE_META) tags.

The only complex tag is ext_hdrs_added/removed. This tag consist of up
to 4 big endian uint32 bitfields, with each bit representing an
extension header number. ehdr_type_vals and a new ehdr_type_vals_short
are used to generate the tags. Custom printing is used for the header
line to display unknown values as integer and support the special case
of <All>: all supplied bits 1 meaning all extension headers removed.
Storage for the up to 4 subtree header_field id entries is in the first
4 extra hf_values[] for now, the ett value is reused.

Increase erfmeta_tag_info_ext_t ERF_HF_VALUES_PER_TAG to 32. A better
solution is needed sooner rather than later but the structure is only
allocated for tags that need it.

Change-Id: I9e359f044131bce2afc189bebc21239eed429b21
Reviewed-on: https://code.wireshark.org/review/26111
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years agomultipart: initialize value before function call (found by clang).
Dario Lombardo [Mon, 26 Feb 2018 13:00:56 +0000 (14:00 +0100)]
multipart: initialize value before function call (found by clang).

Change-Id: I0883526b064b044bbfb188e14e20cc95270f1e6a
Reviewed-on: https://code.wireshark.org/review/26115
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years agorrc: check parameter when creating cipher info (found by clang).
Dario Lombardo [Mon, 26 Feb 2018 16:15:03 +0000 (17:15 +0100)]
rrc: check parameter when creating cipher info (found by clang).

Change-Id: I85e4d0f62b4c4c16f74f229a8dfcea0e27048def
Reviewed-on: https://code.wireshark.org/review/26117
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years agoAdd ZigBee ZCL Identify cluster command.
Paul Zander [Mon, 26 Feb 2018 20:44:43 +0000 (21:44 +0100)]
Add  ZigBee ZCL Identify cluster command.

Change-Id: Ie0ed2388c2f0d992e053166d740209a8e354f31e
Reviewed-on: https://code.wireshark.org/review/26122
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years ago[PFCP] refactor flags and triggers
Joakim Karlsson [Mon, 26 Feb 2018 23:44:26 +0000 (00:44 +0100)]
[PFCP] refactor flags and triggers

Change-Id: I78bd69f9ac1e3279f90687272fc3056ec2d1d633
Reviewed-on: https://code.wireshark.org/review/26128
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years ago[PFCP] fixed Graceful Release Period IE
Joakim Karlsson [Mon, 26 Feb 2018 22:19:06 +0000 (23:19 +0100)]
[PFCP] fixed Graceful Release Period IE

* If stopped there is no time to show
* Default shall be multiple of 1 min

Change-Id: I68c170501923e689c1e18f40fed8e134ff4e7d69
Reviewed-on: https://code.wireshark.org/review/26126
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years agoAdd undefined ZigBee ZCL Power cluster attribute.
Paul Zander [Mon, 26 Feb 2018 16:58:24 +0000 (17:58 +0100)]
Add undefined ZigBee ZCL Power cluster attribute.

Change-Id: I47b70bcc16f03967110b8867e85645ae124e229d
Reviewed-on: https://code.wireshark.org/review/26118
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years ago[PFCP] Fixed order of IPv4 and IPv6 in Remote GTP-U Peer IE
Joakim Karlsson [Mon, 26 Feb 2018 22:10:18 +0000 (23:10 +0100)]
[PFCP] Fixed order of IPv4 and IPv6 in Remote GTP-U Peer IE

In accordance with 3GPP TS 29.244 Section 8.2.70

Change-Id: I6d6bc47426b3449cc751b9c3a6d7f2c35f257b41
Reviewed-on: https://code.wireshark.org/review/26125
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years agocatapult dct2000: don't dump comments one char at a time, and other fussing
Martin Mathieson [Tue, 27 Feb 2018 01:06:39 +0000 (01:06 +0000)]
catapult dct2000: don't dump comments one char at a time, and other fussing

Change-Id: Ib9dc06aabdcd4c8da9e0f6512cafc306ceeedd5f
Reviewed-on: https://code.wireshark.org/review/26130
Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years agoSquelch some warning noise when dsymifying.
Guy Harris [Mon, 26 Feb 2018 21:51:12 +0000 (13:51 -0800)]
Squelch some warning noise when dsymifying.

Change-Id: I1e6c05ce9d2f08abb7e3f86a95cc7b8f8af56ab2
Reviewed-on: https://code.wireshark.org/review/26124
Reviewed-by: Guy Harris <guy@alum.mit.edu>
6 years agoDsymify binary files.
Guy Harris [Mon, 26 Feb 2018 21:19:38 +0000 (13:19 -0800)]
Dsymify binary files.

See if that makes it possible for CrashReporter to fully symbolicate
crash dumps, so the user gets line numbers and the like in crash dumps
from the OS, and we get them if the user sends a crash dump to us.

Change-Id: I8bb48b2d2f6b3e23fea43c1a3bd3a5a9a97a5c2c
Reviewed-on: https://code.wireshark.org/review/26123
Reviewed-by: Guy Harris <guy@alum.mit.edu>
6 years agoNAS 5GS: Comment out unused variables.
Gerald Combs [Mon, 26 Feb 2018 17:47:07 +0000 (09:47 -0800)]
NAS 5GS: Comment out unused variables.

Comment out a couple of as-yet-unused variables.

Change-Id: I4a5b16f58f18bbb71a003379c623a82377585d82
Reviewed-on: https://code.wireshark.org/review/26119
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
6 years agoadb: fix decoding of local-id argument of Write
Peter Wu [Sun, 25 Feb 2018 20:31:07 +0000 (21:31 +0100)]
adb: fix decoding of local-id argument of Write

Tested with adb-oreo.pcapng from bug 14460, packet 110 should show
"Write(10, 1)" instead of "Write(0, 1)" per spec:
https://android.googlesource.com/platform/system/core/+/android-8.1.0_r7/adb/protocol.txt#146

Change-Id: Ifa9fb43979237b7a28586e1d41859b455d3cf5ab
Reviewed-on: https://code.wireshark.org/review/26105
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michal Labedzki <michal.labedzki@wireshark.org>
6 years ago[GTPv2] Add new IE UP Function Selection Indication Flags
AndersBroman [Mon, 26 Feb 2018 09:51:55 +0000 (10:51 +0100)]
[GTPv2] Add new IE UP Function Selection Indication Flags

Change-Id: I2eeecea0ae907c6bdcc75dc9d9ee4e35d8adcf44
Reviewed-on: https://code.wireshark.org/review/26114
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years ago[NAS 5GS] Add dissector for NAS5GS 3GPP TS 24.501.
AndersBroman [Mon, 19 Feb 2018 09:27:08 +0000 (10:27 +0100)]
[NAS 5GS] Add dissector for NAS5GS 3GPP TS 24.501.

This is not a complete dissector but can be commited as is. To be worked
on.

Change-Id: I2e698b57c849013657a1eeacef4b984c8b8c39ee
Reviewed-on: https://code.wireshark.org/review/26051
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years agoLACP: Begin adding more info to the INFO column
Joerg Mayer [Thu, 22 Feb 2018 10:09:47 +0000 (11:09 +0100)]
LACP: Begin adding more info to the INFO column

Change-Id: I77dae1ab7f5327e1a2e8f405fab20e06624c584e
Reviewed-on: https://code.wireshark.org/review/26112
Petri-Dish: Jörg Mayer <jmayer@loplof.de>
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
6 years ago[Diameter-3gpp] Add bit 8 in Access-Restriction-Data according to 3GPP
AndersBroman [Mon, 26 Feb 2018 09:21:00 +0000 (10:21 +0100)]
[Diameter-3gpp] Add bit 8 in Access-Restriction-Data according to 3GPP
TS 29.272 V15.2.0

Change-Id: I1a9db8f0350f6b8916a321ddfcdf6d9ccc9f462a
Reviewed-on: https://code.wireshark.org/review/26113
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years agoDNS: add partial DOH (DNS Queries over HTTPS) support
Peter Wu [Thu, 15 Feb 2018 18:09:50 +0000 (19:09 +0100)]
DNS: add partial DOH (DNS Queries over HTTPS) support

Add support for POST requests, and GET and POST responses containing a
DNS (UDP) payload. GET requests are still unsupported.

(DOH is sent over HTTP2/TLS/TCP which means that a special check is
needed in dissect_dns to avoid matching DNS over TCP).

Change-Id: I82bfcda068baf6f06c5a0159d73e6d40d1d9a758
Ping-Bug: 14433
Reviewed-on: https://code.wireshark.org/review/25806
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years agoRTSP: Added support for pipelined RTSP responses
Jiri Novak [Fri, 23 Feb 2018 12:47:12 +0000 (13:47 +0100)]
RTSP: Added support for pipelined RTSP responses

Patch allow RTSP dissector to decode multiple RTSP responses in one packet. Decoded without the patch shows second and subsequent responses as "data".

Bug: 14450
Change-Id: I2cc42b1544dd6b4f6a7e5eea67b0b2a10eed0fc6
Reviewed-on: https://code.wireshark.org/review/26049
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years agowisun: support EAPOL Relay (1v21 format)
Robert Sauter [Sun, 25 Feb 2018 09:44:29 +0000 (10:44 +0100)]
wisun: support EAPOL Relay (1v21 format)

Change-Id: I6b4644f7ad8061e8f9fc11238e17e6d01596cb39
Reviewed-on: https://code.wireshark.org/review/26095
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years agoPDCP: trivial changes
Martin Mathieson [Mon, 26 Feb 2018 00:10:07 +0000 (00:10 +0000)]
PDCP: trivial changes

Change-Id: Id18da688a7ed056055b0dc30eced12797955e243
Reviewed-on: https://code.wireshark.org/review/26107
Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years agoDocs: Reduce our TOC depth.
Gerald Combs [Mon, 26 Feb 2018 02:40:11 +0000 (18:40 -0800)]
Docs: Reduce our TOC depth.

Reduce the TOC depth so that it's not quite so huge.

Change-Id: I5748edf0e715961da57eff7e0ade6fad175ab24b
Reviewed-on: https://code.wireshark.org/review/26110
Reviewed-by: Gerald Combs <gerald@wireshark.org>
6 years agozbee zcl se: fix duplicate entry
Alexis La Goutte [Sun, 25 Feb 2018 16:33:06 +0000 (17:33 +0100)]
zbee zcl se: fix duplicate entry

Field 'Attribute' (zbee_zcl_se.met.attr_id) has a conflicting entry in its value_string: 1045 is at indices 183 (Current Year Max Energy Carrier Demand) and 184 (Current Year Min Energy Carrier Demand))

Change-Id: I6ceb6091d6b37d9467f21037280f9d1251a103ff
Reviewed-on: https://code.wireshark.org/review/26098
Reviewed-by: Kenneth Soerensen <knnthsrnsn@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
6 years agoWSUG: Fixup an apostrophe.
Gerald Combs [Mon, 26 Feb 2018 01:50:01 +0000 (17:50 -0800)]
WSUG: Fixup an apostrophe.

Change-Id: I36b5ca5f182697a4b6cbd69da2a708453cb8a876
Reviewed-on: https://code.wireshark.org/review/26109
Reviewed-by: Gerald Combs <gerald@wireshark.org>
6 years agoWSUG: Fixup some quotes and apostrophes.
Gerald Combs [Mon, 26 Feb 2018 01:50:01 +0000 (17:50 -0800)]
WSUG: Fixup some quotes and apostrophes.

Switch from AsciiDoc's smart quotes markup to the quotes themselves,
along with apostrophes.

Change-Id: I78930d6902e2691b6a2cb35ed5bae6fef4bb7257
Reviewed-on: https://code.wireshark.org/review/26108
Reviewed-by: Gerald Combs <gerald@wireshark.org>
6 years agoDocbook: Update our CSS.
Gerald Combs [Sun, 25 Feb 2018 17:17:14 +0000 (09:17 -0800)]
Docbook: Update our CSS.

Use the CSS generated from the "wireshark" theme at
https://github.com/geraldcombs/asciidoctor-stylesheet-factory

Make sure the release notes use an external CSS file instead of
inlining.

Change-Id: I13daa41f4a9e6f76b323bd9f483af98e20d6c1f2
Reviewed-on: https://code.wireshark.org/review/26106
Reviewed-by: Gerald Combs <gerald@wireshark.org>
6 years agowisun: wisun remove unused ei_wisun_wsie_short_format
Robert Sauter [Sun, 25 Feb 2018 17:52:03 +0000 (18:52 +0100)]
wisun: wisun remove unused ei_wisun_wsie_short_format

Change-Id: I8dfee4f222236892585295e6b1d1e53bb2237238
Reviewed-on: https://code.wireshark.org/review/26103
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
6 years agomq: fix duplicate entry
Alexis La Goutte [Sun, 25 Feb 2018 16:40:51 +0000 (17:40 +0100)]
mq: fix duplicate entry

Field 'ParmID...' (mqpcf.parm.id) has a conflicting entry in its value_string: 1008 is at indices 385 (MQIACF_MODE) and 386 (MQIACF_QUIESCE))

Field 'ParmID...' (mqpcf.parm.id) has a conflicting entry in its value_string: 1532 is at indices 762 (MQIACH_CURRENT_SEQ_NUMBER) and 763 (MQIACH_CURRENT_SEQUENCE_NUMBER))

Field 'ParmID...' (mqpcf.parm.id) has a conflicting entry in its value_string: 1536 is at indices 767 (MQIACH_BYTES_RCVD) and 768 (MQIACH_BYTES_RECEIVED))

 Field 'ParmID...' (mqpcf.parm.id) has a conflicting entry in its value_string: 1539 is at indices 771 (MQIACH_BUFFERS_RCVD) and 772 (MQIACH_BUFFERS_RECEIVED))

Change-Id: Ieca064b54c7e25e9a78f037c7b46382dfe159df0
Reviewed-on: https://code.wireshark.org/review/26099
Reviewed-by: Robert Grange <robionekenobi@bluewin.ch>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years agokerberos: fix duplicate entry
Alexis La Goutte [Sun, 25 Feb 2018 17:11:20 +0000 (18:11 +0100)]
kerberos: fix duplicate entry

Field 'padata-type' (kerberos.padata_type) has a conflicting entry in its value_string: 1 is at indices 1 (kRB5-PADATA-TGS-REQ) and 2 (kRB5-PADATA-AP-REQ))

Field 'padata-type' (kerberos.padata_type) has a conflicting entry in its value_string: 132 is at indices 40 (kRB5-PADATA-AS-CHECKSUM) and 41 (kRB5-PADATA-PK-AS-09-BINDING))

Change-Id: I1069dec9cb59f753f2a9a2c4fd901f836f689a87
Reviewed-on: https://code.wireshark.org/review/26101
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years agoproto(.c): remove extra bracket
Alexis La Goutte [Sun, 25 Feb 2018 17:30:25 +0000 (18:30 +0100)]
proto(.c): remove extra bracket

Change-Id: Iccf76c35be36e0e806d8878b93902d6984a815da
Reviewed-on: https://code.wireshark.org/review/26102
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years agoisup fix duplicate entry
Alexis La Goutte [Sun, 25 Feb 2018 17:05:10 +0000 (18:05 +0100)]
isup fix duplicate entry

Field 'Mandatory Parameter' (isup.parameter_type) has a conflicting entry in its value_string: 168 is at indices 133 (IEPS call information) and 134 (VED information))

Field 'Upgraded parameter' (isup.upgraded_parameter) has a conflicting entry in its value_string: 168 is at indices 133 (IEPS call information) and 134 (VED information))

Change-Id: I8bf3421ed21e50e4b607ac70faa568112e7c46ae
Reviewed-on: https://code.wireshark.org/review/26100
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years ago[Automatic update for 2018-02-25]
Gerald Combs [Sun, 25 Feb 2018 08:19:31 +0000 (08:19 +0000)]
[Automatic update for 2018-02-25]

Update manuf, services enterprise numbers, translations, and other items.

Change-Id: I543fa77cb9f26353fe3ea64f5e236d540d971a90
Reviewed-on: https://code.wireshark.org/review/26091
Reviewed-by: Gerald Combs <gerald@wireshark.org>
6 years agoBootp: Adding some DHCP options
Uli Heilmeier [Thu, 22 Feb 2018 21:36:06 +0000 (22:36 +0100)]
Bootp: Adding some DHCP options

Used Ref:
* https://www.iana.org/assignments/bootp-dhcp-parameters/bootp-dhcp-parameters.xhtml
* RFC 6225: Dynamic Host Configuration Protocol Options for Coordinate-Based Location Configuration Information
* RFC 6704: Forcerenew Nonce Authentication
* RFC 6731: Improved Recursive DNS Server Selection for Multi-Interfaced Nodes
* RFC 6926: DHCPv4 Bulk Leasequery
* RFC 7291: DHCP Options for the Port Control Protocol (PCP)
* RFC 7618: Dynamic Allocation of Shared IPv4 Addresses

Change-Id: Ied53f88b2018f1d054a8ba22f1a1d6f7c075621a
Reviewed-on: https://code.wireshark.org/review/26063
Reviewed-by: Craig Jackson <cejackson51@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years agoTDS: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
Alexis La Goutte [Sat, 24 Feb 2018 17:19:03 +0000 (18:19 +0100)]
TDS: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang

Change-Id: Iac95d4d588670b75fbb9e99095e5c0a562460000
Reviewed-on: https://code.wireshark.org/review/26085
Reviewed-by: Craig Jackson <cejackson51@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years ago802.11: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
Alexis La Goutte [Sat, 24 Feb 2018 17:17:07 +0000 (18:17 +0100)]
802.11: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang

Change-Id: Ie0c4a4703c1ae035dc1051569927b72f075823d7
Reviewed-on: https://code.wireshark.org/review/26084
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years agoAdd undefined ZigBee ZCL Basic cluster attribute.
Paul Zander [Sat, 24 Feb 2018 15:21:22 +0000 (16:21 +0100)]
Add undefined ZigBee ZCL Basic cluster attribute.

Change-Id: I3ed2750f13b9cd29654c693ff31796c56d57106a
Reviewed-on: https://code.wireshark.org/review/26081
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Kenneth Soerensen <knnthsrnsn@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years agoI don't see a need to treat ipmap.html specially.
Guy Harris [Sun, 25 Feb 2018 00:16:08 +0000 (16:16 -0800)]
I don't see a need to treat ipmap.html specially.

It's in the INSTALL_FILES list, and all of those end up being dropped
into the run directory, so there's no need to copy it individually; all
the data files, as enumerated in INSTALL_FILES, are expected to be in
the same directory, whatever it is, and that's what happens to those
files.

Change-Id: I58df330c7d6886c87d91c0e0df73000c028fc312
Reviewed-on: https://code.wireshark.org/review/26088
Reviewed-by: Guy Harris <guy@alum.mit.edu>
6 years agoThe parser is at the bottom, so the shadow warning must be turned off there.
Guy Harris [Sat, 24 Feb 2018 21:59:22 +0000 (13:59 -0800)]
The parser is at the bottom, so the shadow warning must be turned off there.

The parser is what declares the local yylval, and that's generated below
all the user-specified code, so we have to turn diagnostics off at the
bottom.

Change-Id: I33d5f53c1fd67014ae7fe2b851d45d0c5e80becd
Reviewed-on: https://code.wireshark.org/review/26086
Reviewed-by: Guy Harris <guy@alum.mit.edu>
6 years agoIEEE 802.15.4: Rename ieee802154_payload_* to ieee802154_decrypt_*
Robert Sauter [Mon, 19 Feb 2018 13:33:11 +0000 (14:33 +0100)]
IEEE 802.15.4: Rename ieee802154_payload_* to ieee802154_decrypt_*

- Rename to better reflect functionality
- Add some comments

Change-Id: Ia3bf5655323a3d6fab18fd68dd3d048bd97f8c44
Reviewed-on: https://code.wireshark.org/review/26053
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
6 years agoTDS: Minor updates to TDS 5 Response token handling
Craig Jackson [Fri, 23 Feb 2018 16:05:08 +0000 (11:05 -0500)]
TDS: Minor updates to TDS 5 Response token handling

Fix a couple of cases where endianness was not handled properly when using FT_UINT_STRING. Use FT_UINT_STRING to streamline some of the decodes which were previously merged.

Change-Id: I72196d2146fe1884f2d0af01bd1185a662923226
Reviewed-on: https://code.wireshark.org/review/26056
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years agoSuppress some warnings caused by a Berkeley YACC bug/misfeature.
Guy Harris [Sat, 24 Feb 2018 11:52:23 +0000 (03:52 -0800)]
Suppress some warnings caused by a Berkeley YACC bug/misfeature.

Berkeley YACC generates a global declaration of yylval, or the
appropriately prefixed version of yylval, in the .h file, *even though
it's been told to generate a pure parser, meaning it doesn't have any
global variables*.  Bison doesn't do this.

That causes a warning due to the local declaration in the parser
shadowing the global declaration.

So, if this is Berkeley YACC, and we have _Pragma, and have pragmas to
suppress diagnostics, we use it to turn off -Wshadow warnings.

Change-Id: Ia3fecd99fa18ca9b85f6b25f53ed36c60730fad9
Reviewed-on: https://code.wireshark.org/review/26080
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>
6 years agoTLS1.3: Add support of draft-24
Alexis La Goutte [Fri, 23 Feb 2018 09:09:56 +0000 (10:09 +0100)]
TLS1.3: Add support of draft-24

Only add version (no frame change)

Change-Id: I437f7f9e1962f5fff35d187b559ec3943b683fd0
Reviewed-on: https://code.wireshark.org/review/26044
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
6 years agoRename airpdcap to dot11decrypt.
Gerald Combs [Fri, 23 Feb 2018 17:43:29 +0000 (09:43 -0800)]
Rename airpdcap to dot11decrypt.

Our 802.11 decryption code isn't tied to any specific product. Change
the file and API names to dot11decrypt.

Change-Id: I14fd951be3ae9b656a4e1959067fc0bdcc681ee2
Reviewed-on: https://code.wireshark.org/review/26058
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
6 years agoUser Guide: add additional use category
Jaap Keuter [Fri, 23 Feb 2018 17:41:42 +0000 (18:41 +0100)]
User Guide: add additional use category

Add "QA engineers use it to verify network applications",
as suggested by Alexander Sashnov.

Change-Id: Ia9c83fd2f2610db747043f861931470e3f4e4c53
Signed-off-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Reviewed-on: https://code.wireshark.org/review/26057
Reviewed-by: Michael Mann <mmann78@netscape.net>
6 years agoFix capitalization and white space.
Guy Harris [Sat, 24 Feb 2018 02:33:05 +0000 (18:33 -0800)]
Fix capitalization and white space.

Change-Id: I3b93716421169b2c9ce51da6116223e62fa6a241
Reviewed-on: https://code.wireshark.org/review/26077
Reviewed-by: Guy Harris <guy@alum.mit.edu>
6 years agoradiotap: Fix bug 14455.
Richard Sharpe [Fri, 23 Feb 2018 11:49:36 +0000 (03:49 -0800)]
radiotap: Fix bug 14455.

Use an int instead of a uint so that sign extension does not occur and
fix the field labels and make them all use the correct units.

They conform closer to the spec now.

Bug 14455

Change-Id: Ic57207d10565690a6e2ed66693dcdf294d421b22
Reviewed-on: https://code.wireshark.org/review/26046
Reviewed-by: Richard Sharpe <realrichardsharpe@gmail.com>
6 years agoGet rid of the ipmap.html that got dropped into Contents/MacOS.
Guy Harris [Fri, 23 Feb 2018 22:16:46 +0000 (14:16 -0800)]
Get rid of the ipmap.html that got dropped into Contents/MacOS.

Change-Id: Ieb94ca78a92fc5369fe3b396373c2f7a31d8894a
Reviewed-on: https://code.wireshark.org/review/26072
Reviewed-by: Guy Harris <guy@alum.mit.edu>