Commit Graph

70482 Commits

Author SHA1 Message Date
Guy Harris e4787a9190 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>
2018-02-20 02:43:37 +00:00
Robert Sauter 5c0cf42243 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>
2018-02-20 01:01:48 +00:00
Gerald Combs a806389e50 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>
2018-02-20 00:52:36 +00:00
Gerald Combs 3576ca2cd8 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>
2018-02-19 23:31:34 +00:00
Valentin Vidic e2fbca05bc 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>
2018-02-19 21:16:32 +00:00
Guy Harris cf2a29f083 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>
2018-02-19 21:06:58 +00:00
Guy Harris e2d5c537df 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>
2018-02-19 17:41:46 +00:00
Valentin Vidic 70608effe4 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>
2018-02-19 15:48:56 +00:00
Graham Bloice 8da569b6ad 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>
2018-02-19 14:59:42 +00:00
Matej Tkac dbb5c73fec [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>
2018-02-19 14:18:24 +00:00
Gerald Combs 042cfea07c 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>
2018-02-19 00:13:14 +00:00
Guy Harris c61b543e97 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>
2018-02-19 00:12:51 +00:00
Guy Harris 6a0a56ed07 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>
2018-02-18 23:15:22 +00:00
Robert Sauter f81f2c4a6f 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>
2018-02-18 22:55:12 +00:00
Jaap Keuter ca7ac05cf0 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>
2018-02-18 22:50:37 +00:00
Dario Lombardo 44a6e2dea8 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>
2018-02-18 21:33:39 +00:00
Dario Lombardo bd9d79fcd7 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>
2018-02-18 21:32:44 +00:00
Guy Harris e090683aff 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>
2018-02-18 21:03:03 +00:00
Guy Harris 0347538758 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>
2018-02-18 20:52:52 +00:00
Guy Harris da861e4311 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>
2018-02-18 20:47:29 +00:00
Guy Harris 22dc113852 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>
2018-02-18 20:40:47 +00:00
Pascal Quantin d9d6106044 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>
2018-02-18 17:47:40 +00:00
Pascal Quantin 47726eafe5 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>
2018-02-18 14:49:12 +00:00
Michael Mann 8760999f64 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>
2018-02-18 14:22:48 +00:00
Michael Mann b6328eba6a 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>
2018-02-18 14:21:16 +00:00
Michael Mann 95affa1ef1 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>
2018-02-18 14:20:09 +00:00
Uli Heilmeier bee04353b9 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>
2018-02-18 12:18:28 +00:00
Dario Lombardo aef93dba8c 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>
2018-02-18 09:03:38 +00:00
Gerald Combs 632c6261ca [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>
2018-02-18 08:15:54 +00:00
Guy Harris fcea7205a4 Get rid of unnecessary casts.
Change-Id: I6b911dc2fa9b95ce16c63b13bf8cf10f8a1ce7d7
Reviewed-on: https://code.wireshark.org/review/25859
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-02-18 03:34:08 +00:00
Pascal Quantin 38d784d547 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>
2018-02-18 02:23:22 +00:00
Pascal Quantin 5d99febe66 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>
2018-02-18 02:21:24 +00:00
Guy Harris cae52d27d6 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>
2018-02-17 23:24:39 +00:00
Guy Harris e61257988e 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>
2018-02-17 23:18:12 +00:00
Guy Harris 16348cbddb 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>
2018-02-17 22:54:02 +00:00
Guy Harris 04704e289f 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>
2018-02-17 22:48:53 +00:00
Guy Harris 137da3f106 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>
2018-02-17 21:57:58 +00:00
Guy Harris 2530b75e1d 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>
2018-02-17 21:54:03 +00:00
Guy Harris 55042dc15b 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>
2018-02-17 21:42:49 +00:00
Guy Harris 23b8d11546 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>
2018-02-17 21:33:04 +00:00
Guy Harris ef96c91060 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>
2018-02-17 21:23:11 +00:00
Guy Harris 92f3a0f3e9 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>
2018-02-17 21:17:54 +00:00
Guy Harris a14c6a8490 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>
2018-02-17 21:11:48 +00:00
Gerald Combs 1c5d6881de 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>
2018-02-17 21:00:06 +00:00
Guy Harris 9826cde91d 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>
2018-02-17 20:43:22 +00:00
Guy Harris 4fe475492c 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>
2018-02-17 20:33:54 +00:00
Guy Harris 397d32b863 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>
2018-02-17 20:20:08 +00:00
Guy Harris 86f2ff6ec0 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>
2018-02-17 19:37:23 +00:00
Guy Harris cd443126a4 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>
2018-02-17 19:34:02 +00:00
Guy Harris 8b9dfbaba9 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>
2018-02-17 19:30:35 +00:00