git.samba.org - metze/wireshark/wip.git/log

[PFCP] Added missing User Plane Inactivity Timer IE value_string

Change-Id: I043884300f3c5d4911c02f9c17d631e52700a793
Reviewed-on: https://code.wireshark.org/review/25895
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>

Qt: Use QFrames as separators in the filter expression toolbar.

Use QFrames instead of QActions as separators in the filter expression
toolbar. This keeps them from showing up in the overflow menu.

Change-Id: I60f6f0434fe5ba88fe1b4221e9e70640eed840bb
Reviewed-on: https://code.wireshark.org/review/25860
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>

Get rid of more new_ prefixes for statistics functions and types.

There are no "old" versions of them that we're keeping around.

Change-Id: I3c76a14d0ec1a06df39c547da37f4dea9987df4d
Reviewed-on: https://code.wireshark.org/review/25892
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>

Note that -P can override -Q's suppression of packet output.

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

release-notes: Add 802.15.9, RFC 4108, and Wi-SUN FAN; sort new protocols list

Change-Id: I31781ee7aef0547f86120c1d2e6adfd2dd6bdec8
Reviewed-on: https://code.wireshark.org/review/25870
Reviewed-by: Michael Mann <mmann78@netscape.net>

Fix some source headers, reformat SPDX license lines in comment block.

Change-Id: Ibae6a64a9915003435a3fb17763535a3844143be
Reviewed-on: https://code.wireshark.org/review/25891
Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>

marker: return unused offset (found by clang).

Remove if (tree) as well.

Change-Id: I618ce6e081eced8c5bf0a8d3e8acb7476538e841
Reviewed-on: https://code.wireshark.org/review/25883
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Dario Lombardo <lomato@gmail.com>

marker: fix indentation.

Change-Id: Ie59d25950dba92fe23e71fadb0884ae545bd882c
Reviewed-on: https://code.wireshark.org/review/25886
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Dario Lombardo <lomato@gmail.com>

TFshark requires a file to be specified.

It's not a capture program, so you can't say "capture on this
interface"; you need a file to read.

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

Don't start command-line taps until we've opened a file.

We shouldn't do so until we have something on which to compute
statistics and until we're in file scope, as the taps may use
file-scoped memory, given that statistics pertain to a file.

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

We don't do taps in rawshark, so there are no taps to start.

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

Don't start command-line taps until we've opened a file or started capturing.

We shouldn't do so until we have something on which to compute
statistics and until we're in file scope, as the taps may use
file-scoped memory, given that statistics pertain to a file.

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

ASN.1: update auto generated dissectors

Change-Id: Ic73e72b3d2e7590eaed07f6eb30f74f4303e7a65
Reviewed-on: https://code.wireshark.org/review/25880
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>

NBAP: check that DCH ID was initialized before using it

Bug: 14443
Change-Id: I184ed60d09576c00133c74b4376b2cb7106e5f80
Reviewed-on: https://code.wireshark.org/review/25874
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>

LLTD: use wider variables to prevent overflow and infinite loops

Bug: 14419
Change-Id: I1adf186a56e87a043077d330d59f18b8e5823cd7
Reviewed-on: https://code.wireshark.org/review/25871
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>

DICOM: Prevent infinite loop (dissect_dcm_tag)

uint32 value could wrap around, resulting in infinite loop.

Bug: 14411
Change-Id: I26c73f74adc65c7a5acf22970a54c93a7f7a2344
Reviewed-on: https://code.wireshark.org/review/25873
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>

USB: Sanity check Darwin USB header to prevent infinite loop.

Bug: 14421
Change-Id: Ifb492b776182507c10664d067f99312af250e6ff
Reviewed-on: https://code.wireshark.org/review/25872
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>

DIS: fix Modulation paremter length

According to https://www.sisostds.org/DigitalLibrary.aspx?Command=Core_Download&EntryId=43048
table 5.2.1 modulation paremter is 8 bytes long (and not 16).

Bug: 14441
Change-Id: I5d43411124e554721cfaa6c33561a04c91688aee
Reviewed-on: https://code.wireshark.org/review/25866
Reviewed-by: Anders Broman <a.broman58@gmail.com>

gitlab-ci: remove not working clang repos.

Change-Id: Id1a6f07747dec45619b89daa0d8f7acb2bd425ca
Reviewed-on: https://code.wireshark.org/review/25865
Reviewed-by: Dario Lombardo <lomato@gmail.com>

[Automatic update for 2018-02-18]

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

Change-Id: I5b5b729c83aa7017454b7c7d8230415e1834587f
Reviewed-on: https://code.wireshark.org/review/25862
Reviewed-by: Gerald Combs <gerald@wireshark.org>

Get rid of unnecessary casts.

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

6LoWPAN: break loop in case of unexpected loRHE type

Bug: 14422
Change-Id: I5875dd63282ff645e78a4b0cf5f34ea746ec7dfd
Reviewed-on: https://code.wireshark.org/review/25852
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>

S7comm: fix range check to prevent infinite loop when upper bound is 255

While we are at it, fix identification of not last element in a few
places

Bug: 14423
Change-Id: I568530949d09ddfd8c5c58d24050dfed32ce10f5
Reviewed-on: https://code.wireshark.org/review/25851
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>

Don't gratuitously cast away constness.

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

Make all versions of add_unix_interface_ifinfo() static.

That routine is not used outside this file.

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

Clean up missing-prototype warnings.

Add prototypes for the registration routines.

Make routines not used outside this file static.

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

Don't gratuitously cast away constness.

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

Don't gratuitously cast away constness.

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

Don't gratuitously cast away constness.

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

Don't gratuitiously cast constness away.

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

Don't gratuitiously cast constness away.

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

Put back casts needed for C++ compatibility.

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

Don't gratuitously cast away constness.

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

Constify a pointer to squelch a warning.

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

Qt: Another filter expression toolbar layout attempt.

Try hiding and showing the filter expression toolbar in order to update
its layout. This is a bit ham-fisted but seems to be the only way to get
it to work properly after clearing and inserting buttons.

Bug: 14121
Change-Id: Iea851c029c1586abfdb01c639914f6fe97ea29b3
Reviewed-on: https://code.wireshark.org/review/25840
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>

Constify a bunch of pointers and some casts.

This squelches a bunch of "constness casted away" warnings.

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

Use appropriate pointer types rather than guint8 *.

This means we don't lose alignment information that causes spurious
compiler warnings.

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

dcerpc_decode_as_change() doesn't need to change the old binding.

The search doesn't use the fields we change (if it did, we probably
shouldn't change them, as the old binding might not be found), so don't
change them.

Instead, when we allocate a *new* binding structure, put the new values
into *that* structure.

Squelches a "casting away constness" warning.

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

Yet Another Narrowing Warning to suppress.

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

No need to cast away constness.

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

The CRC8 routines don't modify the buffer; make the pointers to it const.

This lets us get rid of some casts that provoke "drops const qualifier"
warnings.

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

Fix argument list in comment.

Oh, and change something up with which we have no evidence whether
Winston Churchill would put or not:

http://itre.cis.upenn.edu/~myl/languagelog/archives/001715.html

http://itre.cis.upenn.edu/~myl/languagelog/archives/001702.html

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

Fix casts.

A gconstpointer is a "pointer to const void", so it should be cast to
"pointer to const XXX". A "pointer to const pointer to plugin" is a
"plugin *const *".

C's declaration syntax is not one of its strong points. There's a
reason why the cdecl program, and the Web site that uses it,
http://cdecl.org, exists (as the tag line says, "C gibberish <->
English"), and why I used it to make sure I got this working.

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

wisun: Add EDFE support

During an EDFE exchange the source addresses are omitted after the first frame.
Restore the information to enable decryption and 6LoWPAN reassembly.

Change-Id: I9660c81e0536cea56caf104a16e41eaf6c123e09
Reviewed-on: https://code.wireshark.org/review/25819
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>

ldap: Format text used in COL_INFO

Use format_text() on strings from packet used in COL_INFO to
show non-printable characters as C-style escapes.

Bug: 14424
Change-Id: Ibeb18958e0c5877681a18873377ad96d7237490c
Reviewed-on: https://code.wireshark.org/review/25808
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>

Don't make separate libXXX_generated libraries.

We no longer use different compiler flags for generated and
non-generated files, so we don't need to put them into separate
libraries and then add the files from the generated library into the
main library.

Change-Id: Idbd35510ccb8c9107b4de4199c8b1bcaa6f7a060
Reviewed-on: https://code.wireshark.org/review/25831
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>

Thread: use wider variables to prevent overflow and infinite loops

Bug: 14428
Change-Id: I5536bdca23b24e41c13c0837d1f50d9db26f864a
Reviewed-on: https://code.wireshark.org/review/25832
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>

Add `-z http_ref,tree` to the tshark man page.

Change-Id: Ia7b229fc4c42bd967ee4315543f58f6c05be5510
Reviewed-on: https://code.wireshark.org/review/25827
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>

Qt: Replace the toolbar extension icon.

The QToolBar extension button icon is ugly, particularly on HiDPI
displays. Replace it with a RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK.

Change-Id: I8822252ff5c328acd23aad345313e7cfafdffa47
Reviewed-on: https://code.wireshark.org/review/25821
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>

Qt: Add separators between filter expression buttons.

I've noticed at SharkFest and other places that people sometimes put
square brackets around their filter expression names so that it's easier
to distinguish one button from another.

Add separators between buttons so that this shouldn't be necessary.

Change-Id: I3b1ca42f6417d2045781fc14d594faba4fd00fd5
Reviewed-on: https://code.wireshark.org/review/25820
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>

Don't have CLEAN_FILES variables for the "clean" source files.

Except for the one directory that (currently) has "not yet clean" files,
epan/dissectors, we don't need a separate variable to keep track of the
"clean" source files.

In the cases where not all files were in CLEAN_FILES, put them into the
variable used to enable -Werror or its equivalent.

Change-Id: Ic4119861c1d9e381adfe31e9977e1ac71d623f5b
Reviewed-on: https://code.wireshark.org/review/25830
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>

Use -Werror except for explicitly listed dirty dissectors.

Use AM_CFLAGS for everything except for libdirtydissectors in
epan/dissectors. Rename GENERATED_CFLAGS/GENERATED_CXXFLAGS to
DIRTY_CFLAGS/DIRTY_CXXFLAGS, as it doesn't apply to all generated files.

Change-Id: I702b53e185d6972c08d68ef31c05df7b03669daa
Reviewed-on: https://code.wireshark.org/review/25829
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>

Don't use GENERATED_CFLAGS on generated files, use AM_CFLAGS.

They're now warning-free, as we're disabling the warnings in
Flex-generated code.

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

Don't treat radius_dict.l specially.

The warning it gets is for one of the extra warning flags, not turned on
by default, and is rather common (and hard to fix).

Change-Id: Icbc9156ab3862e5921d86b39b936754abe15968d
Reviewed-on: https://code.wireshark.org/review/25826
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>

Update the release notes.

Change-Id: If2899febb07a18baf6b0020244ed1b5408c45998
Reviewed-on: https://code.wireshark.org/review/25825
Reviewed-by: Gerald Combs <gerald@wireshark.org>

Compile text2pcap with -Werror.

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

Treat the text2pcap scanner as clean.

We now disable some warnings on Flex-generated code.

Change-Id: I8ff242dc17e7345e9d5883354e921642cb0118fd
Reviewed-on: https://code.wireshark.org/review/25823
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>

Squelch redundant declaration warnings.

Have the text-to-pcap scanners define a routine that the main code
calls, which both allocates and destroys the scanner. Don't declare the
Lex-generated routines in a header file we create, declare that routine,
instead.

Change-Id: Icad6a83db1a0dea8ac390315af72383fc99f8513
Reviewed-on: https://code.wireshark.org/review/25822
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>

[PFCP] Added dissect function for User Plane Inactivity Timer IE

in accordance with 3GPP 29.244 v15.0.0

Change-Id: I27d65d591976edfef13a713cf3a0768915e29256
Reviewed-on: https://code.wireshark.org/review/25803
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>

Use DIAG_OFF_FLEX/DIAG_ON_FLEX more consistently.

Add warning C4267 (size_t to int conversion) with MSVC to DIAG_OFF_FLEX.

Addd -Wshorten-64-to-32 with Clang and GCC to DIAG_OFF_FLEX.

Don't explicitly use #pragma to turn off warnings; use DIAG_OFF_FLEX for
all of them.

If we use DIAG_OFF_FLEX, use DIAG_ON_FLEX, even if we have no section of
entirely included code at the end.

Change-Id: Ibfd44e8954704e9a8bcb1bd8e54f31d28357fffb
Reviewed-on: https://code.wireshark.org/review/25817
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>

mac-lte: fix memory leak of mac_lte_msg3_cr_hash

Found by LeakSanitizer with "tshark -i dbus-session -c1".

Change-Id: Icef967755088ef25a9b1f2cd7def97078b274966
Fixes: v2.5.0rc0-1865-g52365a55e4 ("LTE L2 protocols: add FT_FRAMENUM_TYPE for most FT_FRAMENUM fields.")
Reviewed-on: https://code.wireshark.org/review/25818
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>

[Diameter] Gx Supported-Features AVP, List-ID 2

Change-Id: I5cf5adf8c8ae8cbfb9c4c6369454ab4b3ee230a4
Reviewed-on: https://code.wireshark.org/review/25816
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>

capchild: remove double free (found by clang).

Now the callers are responsible for deallocating argv: not doing it
can lead to memleaks.

Change-Id: I45dc0826c0430e38426eb64555664892744aa2d5
Reviewed-on: https://code.wireshark.org/review/25369
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>

Add DIAG_OFF_FLEX and DIAG_ON_FLEX for use in Flex scanners.

DIAG_OFF_FLEX turns off all warnings that we want to disable for
Flex-generated code due to some versions of Flex generating code that
triggers those warnings.

DIAG_ON_FLEX restores those warnings, so we do the checks for code that
*we* wrote.

Use them in .l files.

Change-Id: I613a20309a30cd4c61111a1edbe27a5d05fcbf59
Reviewed-on: https://code.wireshark.org/review/25815
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>

Treat most Lex-generated and all Lemon-generated files as clean.

Now that we're suppressing warnings that come from Flex generating
insufficiently fussy code, just treat many of the Lex-generated files as
clean; we don't seem to be getting warnings from Lemon-generated ones.

Change-Id: Ib53ced6d8cb80645234929afca343d047d30f7f7
Reviewed-on: https://code.wireshark.org/review/25813
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>

Suppress more PortAudio + Win64 compiler warnings.

Add C4311 and C4312 to the suppression list.

Change-Id: I90c85ee5cd3f7c3f235ed89b78d04f34bf0db449
Reviewed-on: https://code.wireshark.org/review/25810
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>

Fix a case of copy - too little modify - paste

Change-Id: I4c9ef6b89e0a07d2f9cac59221e0a8ac8f907883
Reviewed-on: https://code.wireshark.org/review/25809
Reviewed-by: Jörg Mayer <jmayer@loplof.de>

Put some info into the INFO column

Change-Id: I4ee22454d45edb382a76603fe21360719c5fa27f
Reviewed-on: https://code.wireshark.org/review/25805
Reviewed-by: Jörg Mayer <jmayer@loplof.de>

Look in %VCToolsRedistDir% for the VC++ redistributable.

Look in %VCToolsRedistDir% for the redistributable that we ship with
the NSIS installer. Clarify a couple of status messages.

Change-Id: I965d15947c3d3422d7c722afa581f4f7dfc2725a
Reviewed-on: https://code.wireshark.org/review/25804
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>

Move hkdf_extract to wsgcrypt.h

HKDF-Extract is not used in TLS, but in QUIC. For reuse in OSCORE, move
it to wsutil. Adjust comments slightly to emphasize precondition.

Change-Id: I5105e7416037697b383ad58f62be285c2b7ab8b7
Reviewed-on: https://code.wireshark.org/review/25802
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Mališa Vučinić <malishav@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>

steam-ihs: Add dissector for the Steam IHS Discovery Protocol

This adds a dissector for the Steam In-Home Streaming
Discovery Protocol by Valve Software.

Useful documentation can be found at:
https://codingrange.com/blog/steam-in-home-streaming-discovery-protocol

Change-Id: I26a79e201cfb0aad0ca702ac962e1e7b1b541517
Reviewed-on: https://code.wireshark.org/review/23615
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>

fuzzshark: disable reassembly for few protocols

Reassembly (or in general being stateful) doesn't help when fuzzing,
even if wireshark will crash oss-fuzz will try to reproduce the crash
with just single sample.

Single sample will not reproduce the crash, so being stateful makes
wireshark 'buggy target'.

I hope change will also make IP corpus a little bit smaller.

Change-Id: I01ba8177a653d220c4cfe8a56a5836c96010c6fe
Reviewed-on: https://code.wireshark.org/review/25799
Reviewed-by: Jakub Zawadzki <darkjames-ws@darkjames.pl>

Disable warning C4267 in generated files.

Disable warning C4267 in Visual C++ in order to squelch the following
warnings:

   125>dtd_parse.c(1699): warning C4267: '=': conversion from 'size_t' to 'int', possible loss of data [C:\buildbot\builders\windows-x86-64-petri-dish\windows-x86-64-petri-dish\build\cmbuild\epan\epan.vcxproj]
   125>diam_dict.c(2348): warning C4267: '=': conversion from 'size_t' to 'int', possible loss of data [C:\buildbot\builders\windows-x86-64-petri-dish\windows-x86-64-petri-dish\build\cmbuild\epan\epan.vcxproj]
   125>C:/buildbot/builders/windows-x86-64-petri-dish/windows-x86-64-petri-dish/build/cmbuild/epan/uat_load.c(1476): warning C4267: '=': conversion from 'size_t' to 'int', possible loss of data [C:\buildbot\builders\windows-x86-64-petri-dish\windows-x86-64-petri-dish\build\cmbuild\epan\epan.vcxproj]
   130>wimaxasncp_dict.c(2103): warning C4267: '=': conversion from 'size_t' to 'int', possible loss of data [C:\buildbot\builders\windows-x86-64-petri-dish\windows-x86-64-petri-dish\build\cmbuild\plugins\epan\wimaxasncp\wimaxasncp.vcxproj]

Change-Id: Ie29ae096e5a8b5037abaf3f2aa97754260f4cace
Reviewed-on: https://code.wireshark.org/review/25800
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>

DCT2000: read new LTE MAC outheader values

Also extend the carrier id enum to r10 levels.
Change-Id: I1eac50c54801010f0ad7408debb80ad811e03fbe
Reviewed-on: https://code.wireshark.org/review/25793
Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>

Fix a typo in the I/O tests.

Change-Id: I45bfa6eb9245d0f470a0316141f81c99cc5a9754
Reviewed-on: https://code.wireshark.org/review/25797
Reviewed-by: Gerald Combs <gerald@wireshark.org>

CMake: Try to avoid Strawberry Perl's xsltproc.

Search for Chocolatey's and Cygwin's respective xsltprocs before searching
%PATH%. Strawberry Perl doesn't include DocBook, which makes it useless
as far as we're concerned.

Another approach would be to look in various locations for an XML catalog
files and set %XML_CATALOG_FILES%. However, Cygwin's /etc/xml/catalog
contains Cygwin-specific URLs, e.g. file:///etc/xml/docbook and can't
be used with a non-Cygwin xsltproc.

Change-Id: Iaebfdff922a6574581b9bd207625f03598c166e0
Reviewed-on: https://code.wireshark.org/review/25794
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>

SIGCOMP: check operand offset when accessing UDVM memory

Bug: 14398
Change-Id: Iae786d6766f63926766ab6139d76bdc24fa37103
Reviewed-on: https://code.wireshark.org/review/25790
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>

travis: add asciidoctor.

Change-Id: I82e72bf194c37001190868257fb7bef499e38ede
Reviewed-on: https://code.wireshark.org/review/25789
Reviewed-by: Dario Lombardo <lomato@gmail.com>

[nb_rtpmux] Register dissector by name.

Change-Id: I6aca4e84e44cad42bff969d55371d6ac6c5e9600
Reviewed-on: https://code.wireshark.org/review/25788
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>

Qt: fix crash in packet dialog on changing selection

"((capture_file_t *)cap_file_)->edt" is documented in cfile.h to cover
the currently selected packet (in the packet list). But in the packet
dialog, the packet selection is irrelevant and the data from a different
dissection tree must be used.

Change-Id: Ieaea3cf862d47540e7f6b6c84c1a2fa6945a877b
Fixes: v2.5.0rc0-1532-g56a130a152 ("ByteViewText: Remove epan dependancy")
Bug: 14246
Reviewed-on: https://code.wireshark.org/review/25437
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Roland Knall <rknall@gmail.com>

Convert coloring rules dialog to use model.

Change-Id: I12a465b5451bdbaea871828329d48fda3627fca3
Reviewed-on: https://code.wireshark.org/review/25372
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>

Debian: Update Build-Depends.

Sync the required CMake version and remove w3m.

Change-Id: I6c74bb5eb42c678bc91911085b270a9c60095135
Reviewed-on: https://code.wireshark.org/review/25783
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>

Qt: Fix the filter expression toolbar layout.

Take a hint from the QToolButton sources and update the filter
expression toolbar using updateGeometry instead of adjustSize. This
appears to do the layout updates and other changes required to draw the
dropdown in the correct place.

Bug: 14121
Change-Id: I45d5a1173703f9c16d89841a57f651935da43d92
Reviewed-on: https://code.wireshark.org/review/25784
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>

Wix: Look for merge modules in %VCToolsRedistDir%.

Add "%VCToolsRedistDir%\MergeModules" to the merge module search path.
This is required for Visual Studio 2017 here.

Change-Id: I91cd1527ae80c85ed304c1233436cae52aa0a501
Reviewed-on: https://code.wireshark.org/review/25782
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>

OpenFlow 1.5: add extra property length checks

Bug: 14420
Change-Id: I1813bc6285f950d86dc569f4286bf34c120b5e3c
Reviewed-on: https://code.wireshark.org/review/25780
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>

packet-mq: Code reformat

Only reformated code (VS2017 with Ctrl K + Ctrl D)
No code logic change

Change-Id: If574c50cf0efb75984beb45df958be991ea63819
Reviewed-on: https://code.wireshark.org/review/25771
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>

OpenFlow: update openflow_version_values value_string

Change-Id: I0552770981d56c1a530b65e755146ec1314fccd8
Reviewed-on: https://code.wireshark.org/review/25781
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>

XRA: protect against potential infinite loops and add protocol to release notes

Change-Id: Ib1dc560e0c0c83ada668ada2da799808d5d10fc2
Reviewed-on: https://code.wireshark.org/review/25776
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Guy Harris <guy@alum.mit.edu>

Update symbol lists.

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

Add the Excentis XRA DOCSIS header dissector to CMake.

All changes to the set of Wireshark source files must be done in both
Makefile.am and CMakeLists.txt files.

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

Update the introductory comment.

Update the URL for the Cisco CMTS.

Remove the stuff about the Arris devices; the link doesn't work, their
site doesn't seem to mention "Cadant", and the C4 page I did find
doesn't say anything about how to do captures (that's probably hidden
behind a customerwall).

Emphasize that, if you can, and do, select "DOCSIS" as the link-layer
type when capturing on an Ethernet, the file (for pcap) or interface
(for pcapng) will be handled as DOCSIS, even if you don't set the "force
all frames to be dissected as DOCSIS" preference.

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

ieee80211: Correct the actual bit positions of the reserved bits.

The reserved bit positions should match the bit positions of the fields
that are reserved. Also, the hf_he_srg_information_present bit was nibble
reversed.

Errors found by George Baltatanu.

Change-Id: I218ff9aa7bdabc4ec6e470c3ef1be230ce341b34
Reviewed-on: https://code.wireshark.org/review/25760
Reviewed-by: Anders Broman <a.broman58@gmail.com>

Added dissector for Excentis DOCSIS31 XRA header. DLT 273. Builtin version.

Change-Id: I7d4a9cf094e8ae6af05d5599489fc609456c5645
Reviewed-on: https://code.wireshark.org/review/25768
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>

cms: Add support for RFC 4108

Change-Id: I1ab32240e00c7682074e7bc9d1b05e6daa6b69b4
Reviewed-on: https://code.wireshark.org/review/25769
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>

Make the DOCSIS dissector a built-in dissector.

Stuff that calls it is built in, and stuff it calls is built in, so
there's not much point in having it be a plugin; we already have
examples of plugin dissectors.

Change-Id: I512e0fda62faedb5f03f476fbece2e267e1d644f
Reviewed-on: https://code.wireshark.org/review/25775
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>

Asciidoctor macro fixups.

Fix a few errors in the Asciidoctor macros. Use the new macro names in
the release notes and gen-bugnote.

Change-Id: I2ca672949c59ca3da8a6b963cb5bd9abd66c348d
Reviewed-on: https://code.wireshark.org/review/25774
Reviewed-by: Gerald Combs <gerald@wireshark.org>

Fix the "pointer to function that generates a label" values.

build_label_func is a pointer type, pointing to a function that can be
used to generate a label for a "Decode As" entry. There's no need to
have pointers to those pointers; have register_decode_as_next_proto()
take a build_label_func, not a build_label_func *, as its last argument,
assign that value rather than dereferencing it, get rid of unnecessary
casts, and fix the comment in epan/decode_as.h for that argument.

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

ssl: Add session ticket lifetime units in seconds

Also show the seconds in a human readable string.

Change-Id: I124bfc12954fb7c2c65777c028986d18c5686c7b
Reviewed-on: https://code.wireshark.org/review/25772
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>