metze/wireshark/wip.git
6 years agotvb_get_guintvar: don't overflow our return value
Martin Kaiser [Sat, 3 Mar 2018 14:25:56 +0000 (15:25 +0100)]
tvb_get_guintvar: don't overflow our return value

tvb_get_guintvar() returns a guint. If we haven't seen the final byte
after sizeof(guint) bytes, something is wrong. Abort and return 0.

This is the minimum fix for

Bug: 14473

Change-Id: Ibe8a1239c1cbbeec0591c66710416bb56f9f60dc
Reviewed-on: https://code.wireshark.org/review/26242
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 agoAdd support for new peekremote features.
Nicolas Darchis [Wed, 28 Feb 2018 14:26:03 +0000 (15:26 +0100)]
Add support for new peekremote features.

Enhanced peekremote dissector to take into account the new extended
flags written by Cisco APs in sniffer mode after WLC version 8.5.

Support for 80mhz channel flag (bit 9), short preamble (bit 8), amount
of spatial streams (bit 14-16)
dot11_ht_vht_flags=0x00000551 <--short preamble encoded to 10th bit of
dot11_ht_vht_flags.
dot11_ht_vht_flags=0x00008bc8 <--80MHz info encoded to 9th bit of
dot11_ht_vht_flags.

The spatial streams information is already encoded to 16:15:14 bits of
dot11_ht_vht_flags. The following are the bit pattern representation,
000 - 1 spatial stream
001 - 2 spatial streams
010 - 3 spatial streams

Bug: 14452
Change-Id: If0539e356b32a791901d213a653f7a98521667ee
Reviewed-on: https://code.wireshark.org/review/26178
Reviewed-by: Guy Harris <guy@alum.mit.edu>
6 years agoPDCP: show wrong calculated digest on MAC item, and add some comments about calculation
Martin Mathieson [Sat, 3 Mar 2018 22:31:13 +0000 (22:31 +0000)]
PDCP: show wrong calculated digest on MAC item, and add some comments about calculation

Change-Id: I97445f87abd59761fb14b05dad2df98d2b127f7a
Reviewed-on: https://code.wireshark.org/review/26250
Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
6 years agoPDCP: don't link back security setup to self
Martin Mathieson [Sat, 3 Mar 2018 13:39:18 +0000 (13:39 +0000)]
PDCP: don't link back security setup to self

Change-Id: If74714846463394d99ec34bc36960c872f9726a9
Reviewed-on: https://code.wireshark.org/review/26241
Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
6 years agoWiX: install the other plugin types as well
Jaap Keuter [Wed, 28 Feb 2018 12:36:55 +0000 (13:36 +0100)]
WiX: install the other plugin types as well

The WiX toolset configuration files have to be extended to handle the
new plugin directory structure as well. Apart from the EPAN plugins
the wiretap and codec plugins have to be included as well.

Change-Id: I173e6b87a88e4ef8aa3283a308e2b5207f0d6ba2
Signed-off-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Reviewed-on: https://code.wireshark.org/review/26176
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years agoDon't crash in manually_resolve_cleanup() if there's nothing to clean up.
Guy Harris [Sat, 3 Mar 2018 08:07:26 +0000 (00:07 -0800)]
Don't crash in manually_resolve_cleanup() if there's nothing to clean up.

We might not yet have allocated the manually-resolved address lists;
only free the if we have.

Change-Id: Iff9864e397a04cdcb613268603c073ecd1fa77fb
Reviewed-on: https://code.wireshark.org/review/26236
Reviewed-by: Guy Harris <guy@alum.mit.edu>
6 years agoMove what capture_info_close() does into its only caller.
Guy Harris [Sat, 3 Mar 2018 06:55:11 +0000 (22:55 -0800)]
Move what capture_info_close() does into its only caller.

Change-Id: If9539142100fb2079cbbe247d8975778b183ece8
Reviewed-on: https://code.wireshark.org/review/26235
Reviewed-by: Guy Harris <guy@alum.mit.edu>
6 years agoMore indentation cleanups.
Guy Harris [Sat, 3 Mar 2018 06:43:16 +0000 (22:43 -0800)]
More indentation cleanups.

Change-Id: If24cf44a1ba9772d8fe2e026d19e6838cf8e0949
Reviewed-on: https://code.wireshark.org/review/26234
Reviewed-by: Guy Harris <guy@alum.mit.edu>
6 years agoClean up indentation.
Guy Harris [Sat, 3 Mar 2018 06:39:12 +0000 (22:39 -0800)]
Clean up indentation.

Change-Id: Id3d84d33590b12a91f15e7c2d8af350fb630b7b2
Reviewed-on: https://code.wireshark.org/review/26233
Reviewed-by: Guy Harris <guy@alum.mit.edu>
6 years agoFix a warning message.
Guy Harris [Sat, 3 Mar 2018 06:33:23 +0000 (22:33 -0800)]
Fix a warning message.

Change-Id: Ice2ed63bb3785323949c466a67b287fd4f80fd12
Reviewed-on: https://code.wireshark.org/review/26232
Reviewed-by: Guy Harris <guy@alum.mit.edu>
6 years agoRemove declaration of routine that no longer exists.
Guy Harris [Sat, 3 Mar 2018 06:31:11 +0000 (22:31 -0800)]
Remove declaration of routine that no longer exists.

The routine was removed in Id302e88bed4da8b9b457049fb78b0bc7d7ffabe3.

Change-Id: I1874be1cb666d42011cc9b4ab9360dc885d3622c
Reviewed-on: https://code.wireshark.org/review/26231
Reviewed-by: Guy Harris <guy@alum.mit.edu>
6 years agoRemove an ipmap remnant.
Gerald Combs [Fri, 2 Mar 2018 22:43:12 +0000 (14:43 -0800)]
Remove an ipmap remnant.

Change-Id: I391043aa0fdfce132a552e063d850d17bcf5a4de
Reviewed-on: https://code.wireshark.org/review/26230
Reviewed-by: Gerald Combs <gerald@wireshark.org>
6 years agoRemove the endpoint "Map" feature.
Gerald Combs [Fri, 2 Mar 2018 19:24:31 +0000 (11:24 -0800)]
Remove the endpoint "Map" feature.

Remove the endpoint map and its button from the Qt and GTK+ UIs. It
depends on GeoIP Legacy for coordinate information and those databases
are being deprecated in favor of MaxMind DB. We *could* upgrade the code
to use mmdbresolve, but according to
https://dev.maxmind.com/geoip/geoip2/geolite2/ they're also going to
remove coordinate information from GeoLite2:

"In addition, in 2019, latitude and longitude coordinates in the
 GeoLite2 databases will be removed.* Latitude and longitude coordinates
 will continue to be provided in GeoIP2 databases. Please check back for
 updates."

Change-Id: I43e1593d282a0f1aae897b1f4724117d1496b21e
Reviewed-on: https://code.wireshark.org/review/26229
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
6 years agoextcap: Make settings dialog modal
Roland Knall [Fri, 2 Mar 2018 12:48:39 +0000 (13:48 +0100)]
extcap: Make settings dialog modal

Otherwise dialogs could be opened multiple times

Change-Id: I19f9c11395b5f5ba41c00ff78ab9794064562d29
Reviewed-on: https://code.wireshark.org/review/26221
Petri-Dish: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Roland Knall <rknall@gmail.com>
6 years ago[NAS-5GS] Dissect more IEs.
AndersBroman [Fri, 2 Mar 2018 15:00:31 +0000 (16:00 +0100)]
[NAS-5GS] Dissect more IEs.

Change-Id: I67a86383688089f59573f6549e02d5e0027e1b4b
Reviewed-on: https://code.wireshark.org/review/26224
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years agoMore spawned process handling updates.
Gerald Combs [Fri, 2 Mar 2018 17:11:31 +0000 (09:11 -0800)]
More spawned process handling updates.

Document ws_pipe.h. Define invalid PIDs in one place.

Extcap didn't use stdin before 1a0987904f. Make sure we close it.

Change-Id: I7a69cd9b5137ae82435e64628a22e4d812d58f89
Reviewed-on: https://code.wireshark.org/review/26226
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
6 years agoFuzz-test: Handle ABRT.
Gerald Combs [Fri, 2 Mar 2018 17:58:07 +0000 (09:58 -0800)]
Fuzz-test: Handle ABRT.

Trap ABRT and try to pass it on to our runners.

Change-Id: I6e5a9fd63822c9bc84e116b3574abc4ccca448f5
Reviewed-on: https://code.wireshark.org/review/26227
Reviewed-by: Gerald Combs <gerald@wireshark.org>
6 years agoNAS-EPS: added heuristic udp dissector
Mathias Kurth [Fri, 23 Feb 2018 14:31:18 +0000 (15:31 +0100)]
NAS-EPS: added heuristic udp dissector

Change-Id: I5df909ac55be5d00f73bd2403b2c7d4b3d1494ca
Reviewed-on: https://code.wireshark.org/review/26050
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
6 years agoXRA: added upstream channel id, sid and iuc to burstinfo dissect
Bruno Verstuyft [Fri, 2 Mar 2018 09:06:12 +0000 (10:06 +0100)]
XRA: added upstream channel id, sid and iuc to burstinfo dissect

Change-Id: Ib46f5dd7199143847c83a77d19f9dd114ef9005c
Reviewed-on: https://code.wireshark.org/review/26220
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years agoWindows: Update target version info
Graham Bloice [Thu, 1 Mar 2018 23:18:17 +0000 (23:18 +0000)]
Windows: Update target version info

Set the API target level to Win7, along with installer changes
to match.

Change-Id: Icd93964eadf93018c56218e3efdfed10b9f8959a
Reviewed-on: https://code.wireshark.org/review/26218
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
6 years ago[NAS-EPS] Use proto_tree_add_bitmask_list() for some bitfields.
AndersBroman [Thu, 1 Mar 2018 16:00:19 +0000 (17:00 +0100)]
[NAS-EPS] Use proto_tree_add_bitmask_list() for some bitfields.

Change-Id: I0b241a1e553beaf7527948ef067cc1f9356754c8
Reviewed-on: https://code.wireshark.org/review/26210
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years agoOne strstr() call suffices.
Guy Harris [Fri, 2 Mar 2018 08:59:47 +0000 (00:59 -0800)]
One strstr() call suffices.

If we've found "interleaved=" in the buffer *and*, if so, know where
we've found it, we don't need to find it again; we can just use the
result of the first strstr() call.

That should also keep Visual Studio Code Analyzer from bogusly saying
"hey, we might not have found it, maybe we're handing a bad pointer to
sscanf()".

Change-Id: I9d8f5c0b38038a3f05b8e5343f965f1676105875
Reviewed-on: https://code.wireshark.org/review/26219
Reviewed-by: Guy Harris <guy@alum.mit.edu>
6 years agoquic: Make sure that we still build when certain libraries not found.
Richard Sharpe [Thu, 1 Mar 2018 16:42:14 +0000 (08:42 -0800)]
quic: Make sure that we still build when certain libraries not found.

This adds some _U_ to prevent build failures when the build platform
does not have certain libraries or more recent versions of those libraries.

Change-Id: I82a1c14dd250181af189bd8564afc47180385e60
Reviewed-on: https://code.wireshark.org/review/26211
Petri-Dish: Richard Sharpe <realrichardsharpe@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
6 years agoRLC: Fix duplication check after sqn reset
Lutz Kresge [Thu, 1 Mar 2018 14:25:40 +0000 (16:25 +0200)]
RLC: Fix duplication check after sqn reset

When rlc sequence number wrapped around, duplicate frames wouldn't be
marked because they were compared to the sqn from the first round.
Change-Id: Ia57aac9b86b4cc84dd8ec411fe0a94972acb9526
Reviewed-on: https://code.wireshark.org/review/26208
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years agoBluetooth: Initialize ett features for Media Player Dissection
Ajay Panicker [Fri, 2 Mar 2018 02:18:18 +0000 (18:18 -0800)]
Bluetooth: Initialize ett features for Media Player Dissection

The ett_btavrcp_features and ett_btavrcp_featuers_not_used fields were
not initialzed causing an abort when dissecting.

Change-Id: I3ee2f557ace1643dfba5a978add66c3c7ba7d895
Reviewed-on: https://code.wireshark.org/review/26217
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years agoPDCP: speed up dissection of status PDU.
Martin Mathieson [Thu, 1 Mar 2018 01:10:45 +0000 (01:10 +0000)]
PDCP: speed up dissection of status PDU.

N.B. In normal traffic status PDUs do not appear very often, but if
the config of RLC/PDCP are wrong, every PDU can appear to be a status
PDU and it can take a long time to print out the list of missing
sequence numbers.

Change-Id: I9514b505639fa58d86bf5ebb3fb2bcf1f8e65aa8
Reviewed-on: https://code.wireshark.org/review/26197
Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years agoGeneralize our process spawning code.
Gerald Combs [Thu, 1 Mar 2018 23:31:45 +0000 (15:31 -0800)]
Generalize our process spawning code.

Move the contents of extcap_spawn to ws_pipe. Rename various extcap_*
prefixes to ws_pipe_*. Open stdin when we spawn processes.

Change-Id: I9286295443ee955bb6328b0ed6f945ee0bb2a798
Reviewed-on: https://code.wireshark.org/review/26216
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 agoWindows: Remove cruft for unsupported versons
Graham Bloice [Thu, 1 Mar 2018 00:01:45 +0000 (00:01 +0000)]
Windows: Remove cruft for unsupported versons

Remove all the existing LoadDLL\GetProcAddress combinations
that allowed conditional Win32 API usage if supported on the
running OS version.

All the required functions are present in the versions we support.

Change-Id: Ibc43e51cefcd1c7562d4e251784362509f224ed6
Reviewed-on: https://code.wireshark.org/review/26215
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
6 years agoFix compilation without pcap.
Dario Lombardo [Thu, 1 Mar 2018 17:19:57 +0000 (18:19 +0100)]
Fix compilation without pcap.

Change-Id: Id9f6b9189c7663062ecc569a33ca2c30c4c86760
Reviewed-on: https://code.wireshark.org/review/26213
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>
6 years ago[NAS-5GS] Dissect more IEs.
AndersBroman [Thu, 1 Mar 2018 13:15:30 +0000 (14:15 +0100)]
[NAS-5GS] Dissect more IEs.

Change-Id: Ief8d55bbee921e701c3374ce4073ae4587177989
Reviewed-on: https://code.wireshark.org/review/26209
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years agoieee80211: Fix some issues with VHT/HE NDP Announcements.
Richard Sharpe [Thu, 1 Mar 2018 03:20:23 +0000 (19:20 -0800)]
ieee80211: Fix some issues with VHT/HE NDP Announcements.

George Baltatanu noticed some issues, including subtrees in the wrong
place, some spelling errors, bit display order, etc.

Change-Id: I7e30e0e27e302bdd2b870a2bb01e7926336b413e
Reviewed-on: https://code.wireshark.org/review/26188
Petri-Dish: Richard Sharpe <realrichardsharpe@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Richard Sharpe <realrichardsharpe@gmail.com>
6 years agogitlab-ci: add clang 7 builds.
Dario Lombardo [Mon, 26 Feb 2018 21:27:57 +0000 (16:27 -0500)]
gitlab-ci: add clang 7 builds.

Compile nopcap with clang 7 instead of 6.

Change-Id: Icc3ffc895e2b97feadca719b45ef72a5d79098cd
Reviewed-on: https://code.wireshark.org/review/26207
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Dario Lombardo <lomato@gmail.com>
6 years agoNAS-5GS: fix PD values for 5GS SM and 5GS MM
Pavel Strnad [Thu, 1 Mar 2018 09:00:45 +0000 (10:00 +0100)]
NAS-5GS: fix PD values for 5GS SM and 5GS MM

   -based on agreed cr https://portal.3gpp.org/ngppapp/CreateTdoc.aspx?mode=view&contributionUid=C1-180442

Change-Id: I1c382cee9bb2120d1df1db0f6436e5f139803a43
Reviewed-on: https://code.wireshark.org/review/26206
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years agoZigBee TP2 buffer test request malformed packet
Dana Sy [Thu, 1 Mar 2018 00:37:37 +0000 (16:37 -0800)]
ZigBee TP2 buffer test request malformed packet

Test profile 2 buffer test request is trying to parse "octet sequence"
which is not part of the command frame for the buffer test request.

Change-Id: I9f35aacbb3c70b5daed07a0ea29b1bec1cf7741a
Reviewed-on: https://code.wireshark.org/review/26196
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
6 years ago[PFCP] improved various value printout
Joakim Karlsson [Wed, 28 Feb 2018 21:51:36 +0000 (22:51 +0100)]
[PFCP] improved various value printout

Change-Id: Ica2ce06d69c6fb2812c1ddb17a2dcce6e58e1a96
Reviewed-on: https://code.wireshark.org/review/26193
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
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>