metze/wireshark/wip.git
23 months agoMake some arguments const, and remove casting-away of constness.
Guy Harris [Wed, 21 Feb 2018 05:34:04 +0000 (21:34 -0800)]
Make some arguments const, and remove casting-away of constness.

Change-Id: Iaa43b4b355179a265975f67952feac819e79f7a6
Reviewed-on: https://code.wireshark.org/review/25957
Reviewed-by: Guy Harris <guy@alum.mit.edu>
23 months agoEliminate another casting-away-constness warning.
Guy Harris [Wed, 21 Feb 2018 02:32:02 +0000 (18:32 -0800)]
Eliminate another casting-away-constness warning.

Don't fill in a structure if you're not going to use it.  Fixing that
means you don't have to free something you've allocated for the
structure.

Change-Id: I6b151b2df43a6444c25583a100f142a51d922c2f
Reviewed-on: https://code.wireshark.org/review/25955
Reviewed-by: Guy Harris <guy@alum.mit.edu>
23 months agoRemove a casting-away-constness warning.
Guy Harris [Wed, 21 Feb 2018 02:16:57 +0000 (18:16 -0800)]
Remove a casting-away-constness warning.

Keep the pointer to the allocated data in a non-const pointer, and free
it using *that* pointer.

Change-Id: I7d29b6768be58ed0181cd64c68ac0b7d03ec5611
Reviewed-on: https://code.wireshark.org/review/25954
Reviewed-by: Guy Harris <guy@alum.mit.edu>
23 months agoRPCoRDMA: Set an upper bound for our chunk size.
Gerald Combs [Tue, 20 Feb 2018 20:32:22 +0000 (12:32 -0800)]
RPCoRDMA: Set an upper bound for our chunk size.

Make sure our write chunk size doesn't exceed our tvbuff. Adjust a few
length checks.

Bug: 14449
Change-Id: If9dd8a6094830c5b47adfff0acb3ff726168e801
Reviewed-on: https://code.wireshark.org/review/25943
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
23 months agoBER: Add a length check.
Gerald Combs [Tue, 20 Feb 2018 19:29:49 +0000 (11:29 -0800)]
BER: Add a length check.

Add a common large length reporting function. Add a length check to
dissect_ber_set.

Bug: 14444.
Change-Id: I6093b5342439cd0ee08f060b8d74b3ae54b3b8f8
Reviewed-on: https://code.wireshark.org/review/25931
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
23 months agoAirpdcap: Add length checks.
Gerald Combs [Tue, 20 Feb 2018 19:48:11 +0000 (11:48 -0800)]
Airpdcap: Add length checks.

Make sure we don't underflow length values.

Bug: 14442
Change-Id: I71baac428ba3b07fe4cd5a7f60fbe2a957ac460e
Reviewed-on: https://code.wireshark.org/review/25937
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
23 months agoAdd a CheckPoint specific mac address
Joerg Mayer [Tue, 20 Feb 2018 23:21:20 +0000 (00:21 +0100)]
Add a CheckPoint specific mac address

Change-Id: Id9a30ed4d301c4c2d81fdf626d1134e9585c2f79
Reviewed-on: https://code.wireshark.org/review/25953
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
23 months agofuzzshark: don't fuzz udplite.
Jakub Zawadzki [Tue, 20 Feb 2018 22:16:58 +0000 (23:16 +0100)]
fuzzshark: don't fuzz udplite.

Don't fuzz IP->udplite protocol. It's using most of UDP code,
but cause udplite calls also udp dissectors it duplicates
work of UDP fuzzer.

This should also decrease IP corpus size, cause in IP corpus
~7.6% (9 165 out of 119 780) is udplite ip.proto

Change-Id: I1d3bde6dd34f76696a34b1c728ce36f3c802e6c9
Link: https://github.com/google/oss-fuzz/issues/1087
Reviewed-on: https://code.wireshark.org/review/25950
Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Jakub Zawadzki <darkjames-ws@darkjames.pl>
23 months agoSquelch some casting-away-constness warnings.
Guy Harris [Tue, 20 Feb 2018 22:41:34 +0000 (14:41 -0800)]
Squelch some casting-away-constness warnings.

If we're constructing the string, assign the pointer to it to a
non-const pointer variable, set the stat_tap_ui cli_string member to
that variable, and then use the variable to free it when we're done.

Don't cast away constness if we don't have to.

Change-Id: If3b24dbf1c910e1e6eceb76f2f6a7ae3898315f9
Reviewed-on: https://code.wireshark.org/review/25952
Reviewed-by: Guy Harris <guy@alum.mit.edu>
23 months agoDon't cast away constness.
Guy Harris [Tue, 20 Feb 2018 22:08:16 +0000 (14:08 -0800)]
Don't cast away constness.

Change-Id: I04cb49a5fe52bc6de66575228b81db1288bd1959
Reviewed-on: https://code.wireshark.org/review/25948
Reviewed-by: Guy Harris <guy@alum.mit.edu>
23 months agoDon't cast away constness.
Guy Harris [Tue, 20 Feb 2018 20:12:43 +0000 (12:12 -0800)]
Don't cast away constness.

Change-Id: Ib69274a8bc6092129a7754c8d21aa2e6f160e242
Reviewed-on: https://code.wireshark.org/review/25942
Reviewed-by: Guy Harris <guy@alum.mit.edu>
23 months agoConstify an argument, remove no-longer-necessary removal of constness.
Guy Harris [Tue, 20 Feb 2018 20:06:00 +0000 (12:06 -0800)]
Constify an argument, remove no-longer-necessary removal of constness.

Change-Id: Ic0a70b28bfdb57c4c2ddf07cf071a85042672c9e
Reviewed-on: https://code.wireshark.org/review/25941
Reviewed-by: Guy Harris <guy@alum.mit.edu>
23 months agoConstify some method arguments, and don't cast away constness.
Guy Harris [Tue, 20 Feb 2018 20:00:30 +0000 (12:00 -0800)]
Constify some method arguments, and don't cast away constness.

Change-Id: I266a724ff672026b3fdf07ac2eb2260f37c04247
Reviewed-on: https://code.wireshark.org/review/25940
Reviewed-by: Guy Harris <guy@alum.mit.edu>
23 months agoCast away constness at the point where it can't be avoided.
Guy Harris [Tue, 20 Feb 2018 19:51:40 +0000 (11:51 -0800)]
Cast away constness at the point where it can't be avoided.

The only reason why we have to cast it away is that C doesn't have a
good framework for creating collections of objects of arbitrary type
(where type includes constness) and we're using a datatype (GHashTable)
implemented and declared in C here.  Do it in the g_hash_table_insert()
call.

Change-Id: Ibd7706255519a97b77e4e4a52fada43e050f2bf0
Reviewed-on: https://code.wireshark.org/review/25938
Reviewed-by: Guy Harris <guy@alum.mit.edu>
23 months agoDon't gratuitously cast away constness.
Guy Harris [Tue, 20 Feb 2018 19:47:16 +0000 (11:47 -0800)]
Don't gratuitously cast away constness.

Change-Id: I235aacba37e6383d3b369ec0c9b39c9f37db5ff5
Reviewed-on: https://code.wireshark.org/review/25936
Reviewed-by: Guy Harris <guy@alum.mit.edu>
23 months agoDon't cast away constness.
Guy Harris [Tue, 20 Feb 2018 19:44:08 +0000 (11:44 -0800)]
Don't cast away constness.

Change-Id: I2b9534e8240e9b0daf4250575f0c17551ee920fd
Reviewed-on: https://code.wireshark.org/review/25935
Reviewed-by: Guy Harris <guy@alum.mit.edu>
23 months agoType casts without const lose constness.
Guy Harris [Tue, 20 Feb 2018 19:37:58 +0000 (11:37 -0800)]
Type casts without const lose constness.

Don't do

    const foo *x = (foo *)a_const_pointer;

do

    const foo *x = (const foo *)a_const_pointer;

Change-Id: Iee04f71e19fcbe8b8e9a099bad52c8f15577e3e8
Reviewed-on: https://code.wireshark.org/review/25934
Reviewed-by: Guy Harris <guy@alum.mit.edu>
23 months agoieee80211: Remove obsolete assignments
Stig Bjørlykke [Tue, 20 Feb 2018 15:11:28 +0000 (16:11 +0100)]
ieee80211: Remove obsolete assignments

Change-Id: If1de0970e4baf49419238553ba93ab13ad5b94cc
Reviewed-on: https://code.wireshark.org/review/25926
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
23 months agopcapng: Free option_content on error
Stig Bjørlykke [Tue, 20 Feb 2018 14:07:08 +0000 (15:07 +0100)]
pcapng: Free option_content on error

Change-Id: If36b92def61112f8ebe8cfda0edfb63a15c46af0
Reviewed-on: https://code.wireshark.org/review/25925
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
23 months agogitlab-ci: speed up the builds a little bit.
Dario Lombardo [Tue, 20 Feb 2018 12:34:36 +0000 (13:34 +0100)]
gitlab-ci: speed up the builds a little bit.

Change-Id: I29756429d106b56e5c0b9b61d92f4c6ca8629b36
Reviewed-on: https://code.wireshark.org/review/25923
Reviewed-by: Dario Lombardo <lomato@gmail.com>
23 months agoQt: Right justify custom columns with multiple fields
Stig Bjørlykke [Tue, 20 Feb 2018 09:05:07 +0000 (10:05 +0100)]
Qt: Right justify custom columns with multiple fields

Default right justify custom columns with multiple fields
when all fields meet the right-justify criteria.

Include double, float and relative time in the right-justify criteria.

Change-Id: I438eab03e3575ca551cab1a547e4f8f00e4792b2
Reviewed-on: https://code.wireshark.org/review/25919
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Roland Knall <rknall@gmail.com>
23 months agoQt: Improve sorting of custom columns with multiple fields
Stig Bjørlykke [Tue, 20 Feb 2018 09:05:48 +0000 (10:05 +0100)]
Qt: Improve sorting of custom columns with multiple fields

Use the already parsed col_custom_fields_ids to loop all
fields in custom columns.

Change-Id: I937e10e087feadc788591f2e3d49568611fda69b
Reviewed-on: https://code.wireshark.org/review/25918
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Roland Knall <rknall@gmail.com>
23 months agosnmp: add missing initializers in deep copies.
Dario Lombardo [Mon, 19 Feb 2018 14:27:21 +0000 (15:27 +0100)]
snmp: add missing initializers in deep copies.

Change-Id: I0a9ef25fc79c47b329a3aed6e0de456ab905c971
Reviewed-on: https://code.wireshark.org/review/25901
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
23 months agoieee80211: fix preamble duration calculation
Neil Ostroff [Mon, 19 Feb 2018 20:26:48 +0000 (12:26 -0800)]
ieee80211: fix preamble duration calculation

Preamble duration calculation duplicated the number of HT-LTF symbols
resulting in an incorrect preamble calculation. This fix removes the
duplicated code in file: epan/dissectors/packet-ieee80211-radio.c.

Bug: 14439
Change-Id: I550066a41c24948e16da6a43cf403cf206b7f32d
Reviewed-on: https://code.wireshark.org/review/25903
Reviewed-by: Simon Barber <simon.barber@meraki.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
23 months agoUse units for the server recv->send duration.
Guy Harris [Tue, 20 Feb 2018 06:29:03 +0000 (22:29 -0800)]
Use units for the server recv->send duration.

We *do* support units for FT_FLOAT and FT_DOUBLE, so use them.

Change-Id: I94dbce89c785109b2c6ef89243f5611963e63dc8
Reviewed-on: https://code.wireshark.org/review/25917
Reviewed-by: Guy Harris <guy@alum.mit.edu>
23 months agoUse ws.css in the release notes.
Gerald Combs [Tue, 20 Feb 2018 01:13:08 +0000 (17:13 -0800)]
Use ws.css in the release notes.

Use the standard Wireshark style sheet for the release notes. Add a note
about updating them via themes.asciidoctor.org.

Change-Id: Ic6b66308cf1e1bea7b34a09963f92881d01eda8c
Reviewed-on: https://code.wireshark.org/review/25911
Reviewed-by: Anders Broman <a.broman58@gmail.com>
23 months agoFT_FLOAT and FT_DOUBLE support BASE_UNIT_STRING, too.
Guy Harris [Tue, 20 Feb 2018 06:22:03 +0000 (22:22 -0800)]
FT_FLOAT and FT_DOUBLE support BASE_UNIT_STRING, too.

Handle them in free_deregistered_field() and
proto_registrar_dump_values().

Change-Id: I38c7b440adc46e32dde8bd629e58535baac9dd6d
Reviewed-on: https://code.wireshark.org/review/25916
Reviewed-by: Guy Harris <guy@alum.mit.edu>
23 months agoDOCSIS: Remove concatenated PDU dissection.
Gerald Combs [Mon, 19 Feb 2018 21:15:57 +0000 (13:15 -0800)]
DOCSIS: Remove concatenated PDU dissection.

The current concatenation PDU support has had serious, repeated problems
over the years:

fb1ef7b8da
f6d48e45c8
3e1828e351
26a6881014
625bab309d

Remove it and add a comment recommending iteration.

Bug: 14446
Change-Id: I947ff8e40e18c4628c9df9233b72dd7776e8233d
Reviewed-on: https://code.wireshark.org/review/25905
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>
23 months agoClean up the way we handle the server recv->send duration.
Guy Harris [Tue, 20 Feb 2018 05:58:34 +0000 (21:58 -0800)]
Clean up the way we handle the server recv->send duration.

There's no guarantee that it'll be integral, and the spec doesn't seem
to imply that it's necessarily integral, so don't convert it to an
integer.

Given that it's a floating-point number, we might as well represent it
as an FT_DOUBLE.  (XXX - we should support units for FT_FLOAT and
FT_DOUBLE.)

Change-Id: Ica43510ac147231f5530359cc78bb467f8d3be24
Reviewed-on: https://code.wireshark.org/review/25915
Reviewed-by: Guy Harris <guy@alum.mit.edu>
23 months agoExtract bits by shifting, not using exponentiation.
Guy Harris [Tue, 20 Feb 2018 05:35:13 +0000 (21:35 -0800)]
Extract bits by shifting, not using exponentiation.

That makes it much clearer what's being done here; it matches what the
802.11ac spec actually says (we have an array of bits and an array of
2-bit items).

Clean up indentation while we're at it.

Change-Id: I8a4640662c54d6a2621990df778fd2d2c2695b78
Reviewed-on: https://code.wireshark.org/review/25914
Reviewed-by: Guy Harris <guy@alum.mit.edu>
23 months agoDefine macros to calculate (2^N)^M, and use them in more places.
Guy Harris [Tue, 20 Feb 2018 05:27:03 +0000 (21:27 -0800)]
Define macros to calculate (2^N)^M, and use them in more places.

Change-Id: I4df1b35d8d2233c301f0ba9e119d012aebe9cd17
Reviewed-on: https://code.wireshark.org/review/25913
Reviewed-by: Guy Harris <guy@alum.mit.edu>
23 months agoDon't use floating point to calculate 4^N, for integer N.
Guy Harris [Tue, 20 Feb 2018 02:43:00 +0000 (18:43 -0800)]
Don't use floating point to calculate 4^N, for integer N.

You don't need floating-point, you can just calculate 1<<2N.

Change-Id: Iec9ebf02bba3e8bcce344be7f0366f7f258da403
Reviewed-on: https://code.wireshark.org/review/25912
Reviewed-by: Guy Harris <guy@alum.mit.edu>
23 months agopacket-thread: fix cast-align warning
Robert Sauter [Mon, 19 Feb 2018 13:53:11 +0000 (14:53 +0100)]
packet-thread: fix cast-align warning

Change-Id: I38381800c8cb227146e9a18285d2b73aec7a97d5
Reviewed-on: https://code.wireshark.org/review/25898
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
23 months agoRELOAD: Fix a length check.
Gerald Combs [Mon, 19 Feb 2018 22:48:24 +0000 (14:48 -0800)]
RELOAD: Fix a length check.

Make sure a length value isn't too large.

Bug: 14445
Change-Id: Ie630d59aea744554da22a2b904aca06624c73f7a
Reviewed-on: https://code.wireshark.org/review/25908
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
23 months agoRemove eproto2sgml.
Gerald Combs [Mon, 19 Feb 2018 22:00:44 +0000 (14:00 -0800)]
Remove eproto2sgml.

IIRC this was used to generate a list of display filters for the User's
Guide. We stopped doing that a long time ago.

Change-Id: Ib18f3982169ebda133f05e5fcad4083f75051286
Reviewed-on: https://code.wireshark.org/review/25907
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
23 months agoTWAMP: Try to reassemble Server-Greeting message
Valentin Vidic [Mon, 19 Feb 2018 10:52:35 +0000 (11:52 +0100)]
TWAMP: Try to reassemble Server-Greeting message

Some servers send Server-Greeting split into multiple packets.

Change-Id: I56155eef1a20ded5c06c4a43cbc8d52961d029d0
Reviewed-on: https://code.wireshark.org/review/25896
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
23 months agoCheck whether to do dissection after starting taps.
Guy Harris [Mon, 19 Feb 2018 21:06:16 +0000 (13:06 -0800)]
Check whether to do dissection after starting taps.

One reason to do dissection is if a tap requires it, so we have to check
after starting the taps.

Change-Id: Ic7910449c3f85df2a52065e789986d970d13c253
Reviewed-on: https://code.wireshark.org/review/25904
Reviewed-by: Guy Harris <guy@alum.mit.edu>
23 months agoReorganize and expand the description section.
Guy Harris [Mon, 19 Feb 2018 17:41:09 +0000 (09:41 -0800)]
Reorganize and expand the description section.

Try to do a better job of explaining the behavior with various
combination of options.  There are a lot of different output options,
and combinations of those options, for TShark; try to cover more of them
- it's complicated.

Consistently refer to command-line "options" rather than "flags".

Change-Id: Idbe6d22a07920789b3d5ed46a700e654a5ac0ae3
Reviewed-on: https://code.wireshark.org/review/25902
Reviewed-by: Guy Harris <guy@alum.mit.edu>
23 months agoTWAMP: Handle short TWAMP-Test packets
Valentin Vidic [Mon, 19 Feb 2018 11:10:03 +0000 (12:10 +0100)]
TWAMP: Handle short TWAMP-Test packets

Requests packets have a minimum length of 14 bytes and only
responses have additional 27 bytes of fields.  Without this
patch short packets generate an exception and get reported
as malformed.

Change-Id: If75fa5556059b13f40fc49273edcbd32508fa0fc
Reviewed-on: https://code.wireshark.org/review/25897
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
23 months agoWSDG: Update docbook info
Graham Bloice [Mon, 19 Feb 2018 14:57:05 +0000 (14:57 +0000)]
WSDG: Update docbook info

The docbook info is now in README.adoc

Change-Id: Ifbc6a1803d23835d9b2b91a9fd6df34002cc3e8f
Reviewed-on: https://code.wireshark.org/review/25900
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
23 months ago[PFCP] Added missing User Plane Inactivity Timer IE value_string
Matej Tkac [Mon, 19 Feb 2018 10:36:57 +0000 (11:36 +0100)]
[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>
23 months agoQt: Use QFrames as separators in the filter expression toolbar.
Gerald Combs [Sun, 18 Feb 2018 03:50:48 +0000 (19:50 -0800)]
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>
23 months agoGet rid of more new_ prefixes for statistics functions and types.
Guy Harris [Sun, 18 Feb 2018 22:39:49 +0000 (14:39 -0800)]
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>
23 months agoNote that -P can override -Q's suppression of packet output.
Guy Harris [Sun, 18 Feb 2018 23:14:41 +0000 (15:14 -0800)]
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>
23 months agorelease-notes: Add 802.15.9, RFC 4108, and Wi-SUN FAN; sort new protocols list
Robert Sauter [Sun, 18 Feb 2018 13:03:05 +0000 (14:03 +0100)]
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>
23 months agoFix some source headers, reformat SPDX license lines in comment block.
Jaap Keuter [Sun, 18 Feb 2018 21:40:50 +0000 (22:40 +0100)]
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>
23 months agomarker: return unused offset (found by clang).
Dario Lombardo [Sun, 18 Feb 2018 17:26:46 +0000 (18:26 +0100)]
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>
23 months agomarker: fix indentation.
Dario Lombardo [Sun, 18 Feb 2018 20:06:52 +0000 (21:06 +0100)]
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>
23 months agoTFshark requires a file to be specified.
Guy Harris [Sun, 18 Feb 2018 21:02:15 +0000 (13:02 -0800)]
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>
23 months agoDon't start command-line taps until we've opened a file.
Guy Harris [Sun, 18 Feb 2018 20:52:21 +0000 (12:52 -0800)]
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>
23 months agoWe don't do taps in rawshark, so there are no taps to start.
Guy Harris [Sun, 18 Feb 2018 20:46:55 +0000 (12:46 -0800)]
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>
23 months agoDon't start command-line taps until we've opened a file or started capturing.
Guy Harris [Sun, 18 Feb 2018 20:39:34 +0000 (12:39 -0800)]
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>
23 months agoASN.1: update auto generated dissectors
Pascal Quantin [Sun, 18 Feb 2018 14:19:48 +0000 (15:19 +0100)]
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>
23 months agoNBAP: check that DCH ID was initialized before using it
Pascal Quantin [Sun, 18 Feb 2018 14:09:49 +0000 (15:09 +0100)]
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>
23 months agoLLTD: use wider variables to prevent overflow and infinite loops
Michael Mann [Sat, 17 Feb 2018 18:33:44 +0000 (13:33 -0500)]
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>
23 months agoDICOM: Prevent infinite loop (dissect_dcm_tag)
Michael Mann [Sun, 18 Feb 2018 03:20:29 +0000 (22:20 -0500)]
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>
23 months agoUSB: Sanity check Darwin USB header to prevent infinite loop.
Michael Mann [Sat, 17 Feb 2018 18:40:55 +0000 (13:40 -0500)]
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>
23 months agoDIS: fix Modulation paremter length
Uli Heilmeier [Sun, 18 Feb 2018 10:27:13 +0000 (11:27 +0100)]
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>
2 years agogitlab-ci: remove not working clang repos.
Dario Lombardo [Fri, 16 Feb 2018 21:46:16 +0000 (16:46 -0500)]
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>
2 years ago[Automatic update for 2018-02-18]
Gerald Combs [Sun, 18 Feb 2018 08:15:50 +0000 (08:15 +0000)]
[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>
2 years agoGet rid of unnecessary casts.
Guy Harris [Sun, 18 Feb 2018 03:33:20 +0000 (19:33 -0800)]
Get rid of unnecessary casts.

Change-Id: I6b911dc2fa9b95ce16c63b13bf8cf10f8a1ce7d7
Reviewed-on: https://code.wireshark.org/review/25859
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2 years ago6LoWPAN: break loop in case of unexpected loRHE type
Pascal Quantin [Sat, 17 Feb 2018 22:22:31 +0000 (23:22 +0100)]
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>
2 years agoS7comm: fix range check to prevent infinite loop when upper bound is 255
Pascal Quantin [Sat, 17 Feb 2018 21:51:39 +0000 (22:51 +0100)]
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>
2 years agoDon't gratuitously cast away constness.
Guy Harris [Sat, 17 Feb 2018 23:24:07 +0000 (15:24 -0800)]
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>
2 years agoMake all versions of add_unix_interface_ifinfo() static.
Guy Harris [Sat, 17 Feb 2018 23:17:40 +0000 (15:17 -0800)]
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>
2 years agoClean up missing-prototype warnings.
Guy Harris [Sat, 17 Feb 2018 22:53:30 +0000 (14:53 -0800)]
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>
2 years agoDon't gratuitously cast away constness.
Guy Harris [Sat, 17 Feb 2018 22:48:16 +0000 (14:48 -0800)]
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>
2 years agoDon't gratuitously cast away constness.
Guy Harris [Sat, 17 Feb 2018 21:57:26 +0000 (13:57 -0800)]
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>
2 years agoDon't gratuitously cast away constness.
Guy Harris [Sat, 17 Feb 2018 21:53:31 +0000 (13:53 -0800)]
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>
2 years agoDon't gratuitiously cast constness away.
Guy Harris [Sat, 17 Feb 2018 21:42:02 +0000 (13:42 -0800)]
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>
2 years agoDon't gratuitiously cast constness away.
Guy Harris [Sat, 17 Feb 2018 21:32:22 +0000 (13:32 -0800)]
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>
2 years agoPut back casts needed for C++ compatibility.
Guy Harris [Sat, 17 Feb 2018 21:22:26 +0000 (13:22 -0800)]
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>
2 years agoDon't gratuitously cast away constness.
Guy Harris [Sat, 17 Feb 2018 21:17:21 +0000 (13:17 -0800)]
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>
2 years agoConstify a pointer to squelch a warning.
Guy Harris [Sat, 17 Feb 2018 21:11:10 +0000 (13:11 -0800)]
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>
2 years agoQt: Another filter expression toolbar layout attempt.
Gerald Combs [Sat, 17 Feb 2018 19:44:41 +0000 (11:44 -0800)]
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>
2 years agoConstify a bunch of pointers and some casts.
Guy Harris [Sat, 17 Feb 2018 20:42:51 +0000 (12:42 -0800)]
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>
2 years agoUse appropriate pointer types rather than guint8 *.
Guy Harris [Sat, 17 Feb 2018 20:33:20 +0000 (12:33 -0800)]
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>
2 years agodcerpc_decode_as_change() doesn't need to change the old binding.
Guy Harris [Sat, 17 Feb 2018 20:19:33 +0000 (12:19 -0800)]
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>
2 years agoYet Another Narrowing Warning to suppress.
Guy Harris [Sat, 17 Feb 2018 19:36:52 +0000 (11:36 -0800)]
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>
2 years agoNo need to cast away constness.
Guy Harris [Sat, 17 Feb 2018 19:33:30 +0000 (11:33 -0800)]
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>
2 years agoThe CRC8 routines don't modify the buffer; make the pointers to it const.
Guy Harris [Sat, 17 Feb 2018 19:30:01 +0000 (11:30 -0800)]
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>
2 years agoFix argument list in comment.
Guy Harris [Sat, 17 Feb 2018 19:03:32 +0000 (11:03 -0800)]
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>
2 years agoFix casts.
Guy Harris [Sat, 17 Feb 2018 18:40:23 +0000 (10:40 -0800)]
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>
2 years agowisun: Add EDFE support
Robert Sauter [Fri, 16 Feb 2018 11:58:12 +0000 (12:58 +0100)]
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>
2 years agoldap: Format text used in COL_INFO
Stig Bjørlykke [Thu, 15 Feb 2018 19:17:30 +0000 (20:17 +0100)]
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>
2 years agoDon't make separate libXXX_generated libraries.
Guy Harris [Sat, 17 Feb 2018 08:10:43 +0000 (00:10 -0800)]
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>
2 years agoThread: use wider variables to prevent overflow and infinite loops
Pascal Quantin [Sat, 17 Feb 2018 13:25:36 +0000 (14:25 +0100)]
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>
2 years agoAdd `-z http_ref,tree` to the tshark man page.
Gerald Combs [Sat, 17 Feb 2018 00:02:26 +0000 (16:02 -0800)]
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>
2 years agoQt: Replace the toolbar extension icon.
Gerald Combs [Fri, 16 Feb 2018 19:47:35 +0000 (11:47 -0800)]
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>
2 years agoQt: Add separators between filter expression buttons.
Gerald Combs [Fri, 16 Feb 2018 17:29:38 +0000 (09:29 -0800)]
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>
2 years agoDon't have CLEAN_FILES variables for the "clean" source files.
Guy Harris [Sat, 17 Feb 2018 02:22:31 +0000 (18:22 -0800)]
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>
2 years agoUse -Werror except for explicitly listed dirty dissectors.
Guy Harris [Sat, 17 Feb 2018 01:22:23 +0000 (17:22 -0800)]
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>
2 years agoDon't use GENERATED_CFLAGS on generated files, use AM_CFLAGS.
Guy Harris [Sat, 17 Feb 2018 00:56:27 +0000 (16:56 -0800)]
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>
2 years agoDon't treat radius_dict.l specially.
Guy Harris [Sat, 17 Feb 2018 00:00:10 +0000 (16:00 -0800)]
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>
2 years agoUpdate the release notes.
Gerald Combs [Fri, 16 Feb 2018 23:28:29 +0000 (15:28 -0800)]
Update the release notes.

Change-Id: If2899febb07a18baf6b0020244ed1b5408c45998
Reviewed-on: https://code.wireshark.org/review/25825
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2 years agoCompile text2pcap with -Werror.
Guy Harris [Fri, 16 Feb 2018 23:43:45 +0000 (15:43 -0800)]
Compile text2pcap with -Werror.

Change-Id: If411c518c2373a21b0a601526a8e632be88d65c5
Reviewed-on: https://code.wireshark.org/review/25824
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2 years agoTreat the text2pcap scanner as clean.
Guy Harris [Fri, 16 Feb 2018 22:51:51 +0000 (14:51 -0800)]
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>
2 years agoSquelch redundant declaration warnings.
Guy Harris [Fri, 16 Feb 2018 22:10:47 +0000 (14:10 -0800)]
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>
2 years ago[PFCP] Added dissect function for User Plane Inactivity Timer IE
Matej Tkac [Thu, 15 Feb 2018 15:04:34 +0000 (16:04 +0100)]
[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>
2 years agoUse DIAG_OFF_FLEX/DIAG_ON_FLEX more consistently.
Guy Harris [Fri, 16 Feb 2018 11:15:32 +0000 (03:15 -0800)]
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>