metze/wireshark/wip.git
5 years agoQt: Replace $HOME with ~ in window title %F variable
Stig Bjørlykke [Tue, 11 Sep 2018 07:47:50 +0000 (09:47 +0200)]
Qt: Replace $HOME with ~ in window title %F variable

Replace $HOME with ~ in window title %F variable.
Optimize code to check if variable is used before doing replacement.

Change-Id: I95ef8505e50379d98fdb1661e09394d1ded7ecca
Reviewed-on: https://code.wireshark.org/review/29597
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
5 years agoMake versions of DIAG_OFF() and DIAG_ON() for GCC 4.2 through 4.5.
Guy Harris [Tue, 11 Sep 2018 07:30:58 +0000 (00:30 -0700)]
Make versions of DIAG_OFF() and DIAG_ON() for GCC 4.2 through 4.5.

The macOS buildbot is currently using llvm-gcc, which is based on GCC
4.2.

Change-Id: I8497243333410380e1d0bc7fa35bccbf841cada1
Reviewed-on: https://code.wireshark.org/review/29596
Reviewed-by: Guy Harris <guy@alum.mit.edu>
5 years agoUse DIAG_OFF to suppress -Wunused-function.
Guy Harris [Tue, 11 Sep 2018 06:58:43 +0000 (23:58 -0700)]
Use DIAG_OFF to suppress -Wunused-function.

Change-Id: I1846e4ef1be977553510ff1473d4c1a7e12cce18
Reviewed-on: https://code.wireshark.org/review/29594
Reviewed-by: Guy Harris <guy@alum.mit.edu>
5 years agoSquelch more narrowing warnings.
Guy Harris [Tue, 11 Sep 2018 06:05:42 +0000 (23:05 -0700)]
Squelch more narrowing warnings.

Change-Id: I1bd9f8c048af29abc26eb85f814dd4ec8663501c
Reviewed-on: https://code.wireshark.org/review/29593
Reviewed-by: Guy Harris <guy@alum.mit.edu>
5 years ago"#if 0" out an unused variable.
Guy Harris [Tue, 11 Sep 2018 06:01:23 +0000 (23:01 -0700)]
"#if 0" out an unused variable.

Change-Id: I78cd22e7d7b43e072c71f21ba13aa56ce83afa15
Reviewed-on: https://code.wireshark.org/review/29592
Reviewed-by: Guy Harris <guy@alum.mit.edu>
5 years agosizeof isn't useful when calculating the size of data in the packet.
Guy Harris [Tue, 11 Sep 2018 05:10:40 +0000 (22:10 -0700)]
sizeof isn't useful when calculating the size of data in the packet.

Srsly, you're dealing with *one-byte*, *two_byte*, and *four-byte*
values, might as well say "1", "2", and "4" - either sizeof(guint8) is
guaranteed to be 1, sizeof(guint16) is guaranteed to be 2, and
sizeof(guint32) is guaranteed to be 4, in which case you might as well
just use 1, 2, and 4, or they're *not* guaranteed to be 1, 2, and 44, in
which case you *have* to use 1, 2, and 4, because a value other than 1,
2, or 4 is invalid.

Change-Id: I49b354cd619f6fe8d625af0322f4861ad8f9b1f1
Reviewed-on: https://code.wireshark.org/review/29591
Reviewed-by: Guy Harris <guy@alum.mit.edu>
5 years agoCMake: Remove some redundant and overly verbose code
João Valverde [Mon, 10 Sep 2018 00:13:56 +0000 (01:13 +0100)]
CMake: Remove some redundant and overly verbose code

The original reason for having a WARN_FLAGS set of variables has
been lost.

Change-Id: I3eae3cf9d0bad5f3895f6fee59c2c64183c8f244
Reviewed-on: https://code.wireshark.org/review/29526
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agoWIP:ieee80211.c: Add support for D3.0 of 802.11ax
Richard Sharpe [Tue, 11 Sep 2018 01:23:55 +0000 (18:23 -0700)]
WIP:ieee80211.c: Add support for D3.0 of 802.11ax

This changeset merges in the changes that have been tested in a resent
test event at the WFA. It will not dissect older D2.x packet captures.

Change-Id: Id38a27a61a6a2a083575448e5c59a8e190827e6d
Reviewed-on: https://code.wireshark.org/review/29512
Petri-Dish: Richard Sharpe <realrichardsharpe@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years ago[packet-dnp.c] - Better solution for handling malformed messages containing "empty...
Chris Bontje [Mon, 10 Sep 2018 20:32:18 +0000 (15:32 -0500)]
[packet-dnp.c] - Better solution for handling malformed messages containing "empty objects" with misreported counts.

- this change re-enables dissection of large lists of sequential objects lacking prefixes.
- corrected some object/variation text in the comments

Change-Id: Ia410f53198e9918509208739c94dbb4df4ecfc25
Reviewed-on: https://code.wireshark.org/review/29582
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agoSquelch a narrowing warning.
Guy Harris [Tue, 11 Sep 2018 04:52:39 +0000 (21:52 -0700)]
Squelch a narrowing warning.

Change-Id: Ibe75903250dd9cccd2b4a80d1215f5ea6fd0cce2
Reviewed-on: https://code.wireshark.org/review/29590
Reviewed-by: Guy Harris <guy@alum.mit.edu>
5 years agoSquelch a narrowing warning.
Guy Harris [Tue, 11 Sep 2018 04:31:36 +0000 (21:31 -0700)]
Squelch a narrowing warning.

Change-Id: I5ff9095208956b9e40e5820986e0253ec2a76116
Reviewed-on: https://code.wireshark.org/review/29589
Reviewed-by: Guy Harris <guy@alum.mit.edu>
5 years agoAvoid collision between parameter names and function names.
Guy Harris [Tue, 11 Sep 2018 04:29:09 +0000 (21:29 -0700)]
Avoid collision between parameter names and function names.

Change-Id: I206d05c47c9f9089a201783ae2d0856c97a5e502
Reviewed-on: https://code.wireshark.org/review/29588
Reviewed-by: Guy Harris <guy@alum.mit.edu>
5 years agoMGCP: Ignore case for command header
Uli Heilmeier [Sun, 9 Sep 2018 07:47:56 +0000 (09:47 +0200)]
MGCP: Ignore case for command header

Bug: 15008
Change-Id: Ibfd9bd8d9d93ddac8c5441be9f5e27c3e095c11b
Reviewed-on: https://code.wireshark.org/review/29502
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agodocsis: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
Alexis La Goutte [Mon, 10 Sep 2018 16:19:26 +0000 (16:19 +0000)]
docsis: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang

Change-Id: I2d7e2d2c83dddc666c7ef85727af986b65b12a13
Reviewed-on: https://code.wireshark.org/review/29567
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Andrii Vladyka <a.vladyka@ukr.net>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agoDon't fill in a variable if you don't use the value.
Guy Harris [Tue, 11 Sep 2018 04:08:06 +0000 (21:08 -0700)]
Don't fill in a variable if you don't use the value.

Change-Id: I50c9cf5daa22c9d53e6ca642e6651948a04e8e64
Reviewed-on: https://code.wireshark.org/review/29587
Reviewed-by: Guy Harris <guy@alum.mit.edu>
5 years agosizeof isn't useful when calculating the size of data in the packet.
Guy Harris [Tue, 11 Sep 2018 03:41:44 +0000 (20:41 -0700)]
sizeof isn't useful when calculating the size of data in the packet.

Srsly, you're dealing with *four-byte* value, might as well say "4" -
either sizeof(guint32) is guaranteed to be 4, in which case you might as
well just use 4, or it's *not* guaranteed to be 4, in which case you
*have* to use 4, because a value other than 4 is invalid.

Change-Id: I6deb106f326e9402744a2e728468b3ce4c220b02
Reviewed-on: https://code.wireshark.org/review/29586
Reviewed-by: Guy Harris <guy@alum.mit.edu>
5 years agosizeof isn't useful when adding to an offset into the packet.
Guy Harris [Tue, 11 Sep 2018 03:19:49 +0000 (20:19 -0700)]
sizeof isn't useful when adding to an offset into the packet.

Srsly, you're fetching a *two-byte* value, might as well say "2" -
either sizeof(guint16) is guaranteed to be 2, in which case you might as
well just use 2, or it's *not* guaranteed to be 2, in which case you
*have* to use 2, because a value other than 2 is invalid.

Change-Id: I9da8dc66d3a77e98cb0a0a5501655594c509eb87
Reviewed-on: https://code.wireshark.org/review/29585
Reviewed-by: Guy Harris <guy@alum.mit.edu>
5 years agoFix the build on the OSX buildbot
João Valverde [Mon, 10 Sep 2018 23:05:14 +0000 (00:05 +0100)]
Fix the build on the OSX buildbot

Change-Id: Ia3efd8d4fb002cffadeb86620eea4bdceb1357b6
Reviewed-on: https://code.wireshark.org/review/29584
Reviewed-by: João Valverde <j@v6e.pt>
5 years agof5ethtrailer: Add some casts to squelch narrowing warning.
João Valverde [Mon, 10 Sep 2018 22:45:57 +0000 (23:45 +0100)]
f5ethtrailer: Add some casts to squelch narrowing warning.

Change-Id: If8cef41c69f397af2e36bb35ffa596fa656e8401
Reviewed-on: https://code.wireshark.org/review/29583
Reviewed-by: João Valverde <j@v6e.pt>
5 years agoAvoid using -Werror with generated code.
João Valverde [Sun, 9 Sep 2018 17:22:46 +0000 (18:22 +0100)]
Avoid using -Werror with generated code.

Change-Id: I5812eeedd1c6f53b62417a53f3613c2af476634c
Reviewed-on: https://code.wireshark.org/review/29510
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot
Reviewed-by: João Valverde <j@v6e.pt>
5 years agortp-ed137: squelch checkAPI warning about shadowed variable
Graham Bloice [Mon, 10 Sep 2018 21:18:20 +0000 (22:18 +0100)]
rtp-ed137: squelch checkAPI warning about shadowed variable

Change-Id: If9ae00895f12eeeda7590be62e1057397cc88c51
Reviewed-on: https://code.wireshark.org/review/29581
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
5 years agoMBIM: Dissect UUID_MS_UICC_LOW_LEVEL/MBIM_CID_MS_UICC_ATR
Jano Svitok [Mon, 10 Sep 2018 09:57:37 +0000 (11:57 +0200)]
MBIM: Dissect UUID_MS_UICC_LOW_LEVEL/MBIM_CID_MS_UICC_ATR

Change-Id: Ie2d4f2d7a4f38e9f56d8c35cdbddfef20a61ef23
Reviewed-on: https://code.wireshark.org/review/29577
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
5 years agoMBIM: MBIM_CID_MS_PROVISIONED_CONTEXT_V2 Query is legal
Jano Svitok [Mon, 10 Sep 2018 08:44:29 +0000 (10:44 +0200)]
MBIM: MBIM_CID_MS_PROVISIONED_CONTEXT_V2 Query is legal

InformationBuffer must be empty

Change-Id: I78367fc540122af099c3d9ab020b210ba112d997
Reviewed-on: https://code.wireshark.org/review/29576
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>
5 years agoRemove the probes.
Guy Harris [Mon, 10 Sep 2018 21:23:38 +0000 (14:23 -0700)]
Remove the probes.

(It's llvm-gcc, and appears to be a version too old to support
_Pragma("gcc diagnostic ...").)

Change-Id: I220997890636d5a5c33889d2e6c640feee155deb
Reviewed-on: https://code.wireshark.org/review/29580
Reviewed-by: Guy Harris <guy@alum.mit.edu>
5 years agoMaybe we have to treat llvm-gcc specially.
Guy Harris [Mon, 10 Sep 2018 21:03:38 +0000 (14:03 -0700)]
Maybe we have to treat llvm-gcc specially.

Change-Id: I73aa608a31a79fa58cb5a86aceaaa778adf0aa2c
Reviewed-on: https://code.wireshark.org/review/29579
Reviewed-by: Guy Harris <guy@alum.mit.edu>
5 years agoTest with (llvm-)GCC pragmas, as the buildbot builds with llvm-gcc.
Guy Harris [Mon, 10 Sep 2018 20:44:21 +0000 (13:44 -0700)]
Test with (llvm-)GCC pragmas, as the buildbot builds with llvm-gcc.

Change-Id: Ic1dd2e4d17cabb1cd62f8b1ad211dc6915835359
Reviewed-on: https://code.wireshark.org/review/29578
Reviewed-by: Guy Harris <guy@alum.mit.edu>
5 years agoTest what kind of compiler we have running on the macOS buildbot.
Guy Harris [Mon, 10 Sep 2018 20:16:45 +0000 (13:16 -0700)]
Test what kind of compiler we have running on the macOS buildbot.

Change-Id: Ib1a14256ce0fbcfa357368e8431705606a8412e0
Reviewed-on: https://code.wireshark.org/review/29574
Reviewed-by: Guy Harris <guy@alum.mit.edu>
5 years agoQt: Add some window title variables
Stig Bjørlykke [Mon, 10 Sep 2018 09:31:43 +0000 (11:31 +0200)]
Qt: Add some window title variables

Add some new variables to be used in custom window title.

%F = file path of the capture file
%S = a conditional separator (" - ") that only shows when surrounded
     by variables with values or static text

Change-Id: I20a60a3018cc86236f4991030eadb7f51681cc32
Reviewed-on: https://code.wireshark.org/review/29534
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
5 years agoTry directly using _Pragma if building on/for macOS.
Guy Harris [Mon, 10 Sep 2018 19:37:08 +0000 (12:37 -0700)]
Try directly using _Pragma if building on/for macOS.

Change-Id: Ib7a48c06a1244b26a9f9a8b733ca4769385603e8
Reviewed-on: https://code.wireshark.org/review/29573
Reviewed-by: Guy Harris <guy@alum.mit.edu>
5 years agoManuf fixups.
Gerald Combs [Mon, 10 Sep 2018 17:23:16 +0000 (10:23 -0700)]
Manuf fixups.

Remove some entries from manuf.tmpl that are either redundant or less
informative that their corresponding IEEE entries. Add a missing '"' to
make-manuf.py.

Change-Id: Ia69f4529c5fa1b39f1662b94d072c65bd2d969ea
Reviewed-on: https://code.wireshark.org/review/29568
Reviewed-by: Gerald Combs <gerald@wireshark.org>
5 years agorelease-notes: add new features and remove known bugs list
Peter Wu [Thu, 9 Aug 2018 15:43:47 +0000 (17:43 +0200)]
release-notes: add new features and remove known bugs list

The "known bugs" list is rarely updated. Remove it and add more helpful
and up-to-date references.

Change-Id: I5aea57c66c6645b5c903ebcebcb1676af5204ce2
Reviewed-on: https://code.wireshark.org/review/29048
Reviewed-by: Gerald Combs <gerald@wireshark.org>
5 years agorelease-note: Add EVS dissector
Alexis La Goutte [Mon, 10 Sep 2018 13:15:46 +0000 (13:15 +0000)]
release-note: Add EVS dissector

Change-Id: Iab3804d70df4d0eb0b9698407121aa477b0caa27
Reviewed-on: https://code.wireshark.org/review/29559
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agoevs: fix header
Alexis La Goutte [Mon, 10 Sep 2018 13:15:29 +0000 (13:15 +0000)]
evs: fix header

Change-Id: Iae4fc9289a6480430588c2de522f79b10b8cf6b1
Reviewed-on: https://code.wireshark.org/review/29558
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agoevs: add modelines info
Alexis La Goutte [Mon, 10 Sep 2018 13:13:39 +0000 (13:13 +0000)]
evs: add modelines info

Change-Id: I48f2c730b1eebb26fee53dcf22d20e3a9b9f536b
Reviewed-on: https://code.wireshark.org/review/29557
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agoDiameter: Add ALU AVP 1139 from Ask.
AndersBroman [Mon, 10 Sep 2018 13:06:40 +0000 (15:06 +0200)]
Diameter: Add ALU AVP 1139 from Ask.

Change-Id: Ia2a72bca2c790fb9ad066608484e99e029830998
Reviewed-on: https://code.wireshark.org/review/29556
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agoprefs: pacify checkAPIs by using ws_g_warning
Peter Wu [Mon, 10 Sep 2018 13:35:09 +0000 (15:35 +0200)]
prefs: pacify checkAPIs by using ws_g_warning

Change-Id: I15ead09ed5b8df33d795d2c6ed75cd911790113b
Reviewed-on: https://code.wireshark.org/review/29560
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
5 years agoevs: remove unused var and set unused param.
Dario Lombardo [Mon, 10 Sep 2018 12:22:33 +0000 (14:22 +0200)]
evs: remove unused var and set unused param.

Change-Id: Ia9815af5e4cdecf4a2a25ed226acacfdd9dd38c0
Reviewed-on: https://code.wireshark.org/review/29554
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agoproto.c: Increase number of preallocted fields to 205000
AndersBroman [Mon, 10 Sep 2018 12:00:37 +0000 (14:00 +0200)]
proto.c: Increase number of preallocted fields to 205000

Change-Id: Id0590e5c860697a4a70278cec6ec8231203ab40b
Reviewed-on: https://code.wireshark.org/review/29552
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agoEVS: Add a dissector for RTP payload type EVS.
AndersBroman [Mon, 10 Sep 2018 07:58:28 +0000 (09:58 +0200)]
EVS: Add a dissector for RTP payload type EVS.

Change-Id: I00dee6f16684ec8116d1ef8cf278e889ffebaabf
Reviewed-on: https://code.wireshark.org/review/29550
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agoprefs,ui: properly migrate old filter expressions
Peter Wu [Sat, 8 Sep 2018 09:49:22 +0000 (11:49 +0200)]
prefs,ui: properly migrate old filter expressions

When legacy filter expressions preferences are present, be sure to
(1) save the dfilter_buttons file when updating the preferences file and
(2) save the preferences file after updating the dfilter_buttons file.

Without doing (1), the old buttons will be lost. Without (2), restarting
Wireshark will result in duplicate buttons. Only write the files if the
user actually made other changes to avoid breaking profiles by just
opening Wireshark.

Bug: 15114
Bug: 15121
Change-Id: I5b9417c34146c4450526781a20308c9c98fb44a1
Reviewed-on: https://code.wireshark.org/review/29488
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
5 years agoradiotap: Correct support for 0-length PSDUs.
Richard Sharpe [Mon, 10 Sep 2018 04:22:19 +0000 (21:22 -0700)]
radiotap: Correct support for 0-length PSDUs.

When there is no data, which is indicated by the 0-length PDSU radiotap header,
there is no more data to dissect, so don't dissect any more as that causes an
exception.

Change-Id: I284b8128ec309ba26f24a012380d311eb3e48697
Reviewed-on: https://code.wireshark.org/review/29529
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agodocsis: fixed regression that was introduced by adding FCS check
Andrii Vladyka [Sun, 9 Sep 2018 20:38:32 +0000 (13:38 -0700)]
docsis: fixed regression that was introduced by adding FCS check

Change-Id: Ibaf86eb810e07e65e18ee541830ce21c3ff6b172
Reviewed-on: https://code.wireshark.org/review/29528
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agoQt: Restore column visibility when loading packets
Stig Bjørlykke [Sun, 9 Sep 2018 18:30:54 +0000 (20:30 +0200)]
Qt: Restore column visibility when loading packets

Always restore column visibility when loading packets to avoid some
situations where the column hidden state was incorrect.

This fixes the following scenario:
 - Apply a column and hide it using the column popup menu
 - Apply another column and remove it using the column popup menu
 - Close and reopen the capture file
 - Observe the hidden column is shown, but with wrong width

Change-Id: I00531907b2383c6605a2d62e8243092906037d0c
Reviewed-on: https://code.wireshark.org/review/29516
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
5 years agoClean up the references to ChUserTable.
Guy Harris [Mon, 10 Sep 2018 04:25:18 +0000 (21:25 -0700)]
Clean up the references to ChUserTable.

The references read like

This table is handled by an Section 11.7, "User Table" with the
following fields.

which looked a little weird.

Change-Id: I4ae9af48e7edf75aa0c7708614f4a11696db9ee1
Reviewed-on: https://code.wireshark.org/review/29530
Reviewed-by: Guy Harris <guy@alum.mit.edu>
5 years agomake-manuf.py: Expand a comment.
Gerald Combs [Sun, 9 Sep 2018 16:40:34 +0000 (09:40 -0700)]
make-manuf.py: Expand a comment.

Change-Id: I545a63bb4a045ba93d1ad1ee82315315bdbb3c9e
Reviewed-on: https://code.wireshark.org/review/29508
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agoFix what seems like a copy-paste error.
João Valverde [Sun, 9 Sep 2018 23:33:15 +0000 (00:33 +0100)]
Fix what seems like a copy-paste error.

Change-Id: I084824c57f1eb61189b337ae3e4786d1d8a88707
Reviewed-on: https://code.wireshark.org/review/29525
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>
5 years agoAvoid warnings about a format string being a variable.
Guy Harris [Mon, 10 Sep 2018 03:00:42 +0000 (20:00 -0700)]
Avoid warnings about a format string being a variable.

This also avoids issues if this isn't called in packet scope.

Change-Id: I7dbf5b49c9f7c1b442a1104156b004b339076c26
Reviewed-on: https://code.wireshark.org/review/29527
Reviewed-by: Guy Harris <guy@alum.mit.edu>
5 years agoRemove the tshark -z compare feature
João Valverde [Sat, 18 Aug 2018 03:17:35 +0000 (04:17 +0100)]
Remove the tshark -z compare feature

  - It cannot support IPv6.
  - Non-standard use (specifically recommended against in the RFCs)
of the IPv4 fragment ID field.
  - Has a narrow and non-obvious use case, IMO.
  - It is not supported in the Qt GUI.
  - Significant maintenance burden for an obscure feature.

Change-Id: Icaf429269dc42f78c38b8d20001508132499faf8
Reviewed-on: https://code.wireshark.org/review/29239
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: João Valverde <j@v6e.pt>
5 years agoCMake: Use more descriptive name than WS_LD_FLAG_VALID0, 1, etc.
João Valverde [Sun, 9 Sep 2018 22:11:15 +0000 (23:11 +0100)]
CMake: Use more descriptive name than WS_LD_FLAG_VALID0, 1, etc.

Change-Id: Iacd0696189a6b6988bd62af3bd188d97dc50b787
Reviewed-on: https://code.wireshark.org/review/29523
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot
Reviewed-by: João Valverde <j@v6e.pt>
5 years agoCMake: Remove link test output line
João Valverde [Sun, 9 Sep 2018 22:29:34 +0000 (23:29 +0100)]
CMake: Remove link test output line

The mode keyword STATUS needs to be capitalized, but this line is
mostly redundant with the check_c_source_compiles_output(), so
just remove it.

Change-Id: I7f29915a7ab2c4b5681e0159773d9216643f8a9c
Reviewed-on: https://code.wireshark.org/review/29524
Reviewed-by: João Valverde <j@v6e.pt>
5 years agoRevert "Try unconditionally using the pragmas in Clang."
Guy Harris [Sun, 9 Sep 2018 21:58:10 +0000 (21:58 +0000)]
Revert "Try unconditionally using the pragmas in Clang."

This reverts commit 051efd105a8404093139dd4a54620c98c4ff170e.

Reason for revert: The Clang on the macOS buildbot is 3.1, so it should
have been using the _Pragmas; perhaps it "supports" them but they don't
actually *work*, or perhaps something else is wrong.

Change-Id: Id5c3365875c694e6bd4f1a4d8d92e7581cd4585f
Reviewed-on: https://code.wireshark.org/review/29522
Reviewed-by: Guy Harris <guy@alum.mit.edu>
5 years agoAIN: Add dissector for Advanced Inteligent Network protocol.
Anders [Thu, 6 Sep 2018 12:53:09 +0000 (14:53 +0200)]
AIN: Add dissector for Advanced Inteligent Network protocol.

Bug:15108
Change-Id: I3b37209c6dcf1a7edc19d12e19d0ab4beaaba5b4
Reviewed-on: https://code.wireshark.org/review/29450
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agoTry unconditionally using the pragmas in Clang.
Guy Harris [Sun, 9 Sep 2018 21:13:27 +0000 (14:13 -0700)]
Try unconditionally using the pragmas in Clang.

This should test whether the macOS buildbot Clang really *does* support
them, in which case we should use them, or not.

Change-Id: I52b7b9c450b5f7ba09df72a56ddb91b5750196dc
Reviewed-on: https://code.wireshark.org/review/29521
Reviewed-by: Guy Harris <guy@alum.mit.edu>
5 years agoAttempt to squelch a narrowing warning.
Guy Harris [Sun, 9 Sep 2018 19:54:23 +0000 (12:54 -0700)]
Attempt to squelch a narrowing warning.

Some older versions of Clang appear to think dividing a float by a
64-bit integer is narrowing 64 bits to 32 bits.

Change-Id: Ie3148ee6d5d5d0810d01e7d985b8e4320dacf565
Reviewed-on: https://code.wireshark.org/review/29518
Reviewed-by: Guy Harris <guy@alum.mit.edu>
5 years agoRTP/ED-137: Decoding of ED-137A and later additional features is splitted to separate...
Jirka Novak [Sun, 2 Sep 2018 22:39:10 +0000 (00:39 +0200)]
RTP/ED-137: Decoding of ED-137A and later additional features is splitted to separate dissectors registered in a table. It allows anyone to add new header decoders without modifying code.

Changes:
- each extended header moved to separate function
- functions registered in the table
- processing of multiple additional feature blocks works correctly
- ED-137B RRC header for single frequency is decoded

Change-Id: I91ecf4b4b6ed2ba3f22c23086c494ece957e7c06
Reviewed-on: https://code.wireshark.org/review/29507
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agoSquelch narrowing conversion warnings.
Guy Harris [Sun, 9 Sep 2018 18:56:31 +0000 (11:56 -0700)]
Squelch narrowing conversion warnings.

Change-Id: If9dedce987d248ec726047e5e59dd55e96d0e701
Reviewed-on: https://code.wireshark.org/review/29517
Reviewed-by: Guy Harris <guy@alum.mit.edu>
5 years agoCMake: We require version greater than 2.8.9.
João Valverde [Sun, 9 Sep 2018 17:09:47 +0000 (18:09 +0100)]
CMake: We require version greater than 2.8.9.

Change-Id: Ia092da9b9bc87c75b6b97a117efc7a0e4b58d29c
Reviewed-on: https://code.wireshark.org/review/29509
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
5 years agoFix handling of invalid type values.
Guy Harris [Sun, 9 Sep 2018 17:45:56 +0000 (10:45 -0700)]
Fix handling of invalid type values.

If vType_get_type() returns NULL, that means that the packet is bad, not
that the dissector is bad.  Report it as such.

Bug: 15119
Change-Id: I8e66fcece2b526ef9edbf948862f8fc5bea25d74
Reviewed-on: https://code.wireshark.org/review/29511
Reviewed-by: Guy Harris <guy@alum.mit.edu>
5 years agoCMake: Remove Qt specific code for warnings
João Valverde [Wed, 5 Sep 2018 18:35:37 +0000 (19:35 +0100)]
CMake: Remove Qt specific code for warnings

These warnings should already be suppressed for Qt with -isystem.

Change-Id: I9b5640f1b6da9fa8039deb2810eda3d878779c38
Reviewed-on: https://code.wireshark.org/review/29500
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot
Reviewed-by: João Valverde <j@v6e.pt>
5 years ago[Automatic update for 2018-09-09]
Gerald Combs [Sun, 9 Sep 2018 08:39:38 +0000 (08:39 +0000)]
[Automatic update for 2018-09-09]

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

Change-Id: I54e55852ff9d327572060233f7f25925d125e528
Reviewed-on: https://code.wireshark.org/review/29503
Reviewed-by: Gerald Combs <gerald@wireshark.org>
5 years agoRTPS: fixed large data issues
Juanjo Martin [Fri, 31 Aug 2018 17:22:48 +0000 (19:22 +0200)]
RTPS: fixed large data issues

Now the inline_qos has the right size, the encapsulation id is
displayed only for the first fragment and fragments are dissected
as raw bytes (fixing the incompatibility with Parametrized samples)

Change-Id: Ib65dd017f9bfb4f23aa763438cb5ab3579f79c90
Reviewed-on: https://code.wireshark.org/review/29408
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agodocsis: validate header checksum before dissecting the payload
Andrii Vladyka [Wed, 5 Sep 2018 23:23:12 +0000 (16:23 -0700)]
docsis: validate header checksum before dissecting the payload

When FCS validation is enabled in prortocol preferences, do not dissect PDUs with incorrect FCS.

Change-Id: I6e09889cf5e4a5631930ee89b75de22c3b5f947e
Reviewed-on: https://code.wireshark.org/review/29480
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agodocsis: add CM STATUS-ACK MAC Management TLV (48)
Andrii Vladyka [Sat, 8 Sep 2018 08:57:32 +0000 (01:57 -0700)]
docsis: add CM STATUS-ACK MAC Management TLV (48)

Change-Id: I931cbe04d608c7483f83a0601f2efecd34c8d55c
Reviewed-on: https://code.wireshark.org/review/29487
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agodocsis: add RNG-RSP TLV 13 (T4 Timeout Multiplier)
Andrii Vladyka [Sat, 8 Sep 2018 07:09:16 +0000 (00:09 -0700)]
docsis: add RNG-RSP TLV 13 (T4 Timeout Multiplier)

Change-Id: I555e996849a7517328b0eec964c844a41b72e62a
Reviewed-on: https://code.wireshark.org/review/29486
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agoCMake: Remove unused variable
João Valverde [Fri, 7 Sep 2018 21:20:20 +0000 (22:20 +0100)]
CMake: Remove unused variable

Change-Id: I05d5ac3112ee3b09d1935dde2073e65d55430946
Reviewed-on: https://code.wireshark.org/review/29501
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agowireguard: Make sure we don't try to free NULL pointer
João Valverde [Sun, 9 Sep 2018 00:10:38 +0000 (01:10 +0100)]
wireguard: Make sure we don't try to free NULL pointer

Change-Id: I31435559d1458cfd882dbefb6c7c4dda8d7ddb2d
Reviewed-on: https://code.wireshark.org/review/29499
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agoepan: Add argument to epan_init() to disable plugins
João Valverde [Sat, 8 Sep 2018 15:02:06 +0000 (16:02 +0100)]
epan: Add argument to epan_init() to disable plugins

Change-Id: I8dc76e6bf8c4d5a3081cbdc1d47b88e857415d29
Reviewed-on: https://code.wireshark.org/review/29498
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot
Reviewed-by: João Valverde <j@v6e.pt>
5 years agoCMake: Add function to test compiler flags
João Valverde [Fri, 7 Sep 2018 23:05:40 +0000 (00:05 +0100)]
CMake: Add function to test compiler flags

Remove all the duplicate code. Each test result is cached so it
needs an unique variable to store the result.

Change-Id: Ib591a1d6beaa13337d927a446b4d8d5e687ff610
Reviewed-on: https://code.wireshark.org/review/29485
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot
Reviewed-by: João Valverde <j@v6e.pt>
5 years agoMBIM: Add dissectors for more services
Jano Svitok [Wed, 5 Sep 2018 20:42:37 +0000 (22:42 +0200)]
MBIM: Add dissectors for more services

Add skeletons for:
- UUID_BASIC_CONNECT_EXTENSIONS
- UUID_MS_SARCONTROL
- UUID_MS_UICC_LOW_LEVEL

Actually implement dissectors for UUID_BASIC_CONNECT_EXTENSIONS:
- MBIM_CID_MS_PROVISIONED_CONTEXT_V2 (seen, works)
- MBIM_CID_MS_NETWORK_BLACKLIST (not seen in the capture yet)
- MBIM_CID_MS_SYS_CAPS (seen, works)
- MBIM_CID_MS_DEVICE_CAPS_V2 (seen, works)
- MBIM_CID_MS_DEVICE_SLOT_MAPPINGS (not seen)
- MBIM_CID_MS_SLOT_INFO_STATUS (not seen)
- MBIM_CID_MS_DEVICE_RESET (not seen, but very simple)

Add dissector for UUID_MS_HOSTSHUTDOWN:
- MBIM_CID_MS_HOSTPRESHUTDOWN (not seen, very simple)

Change-Id: I9f95e0c31c9faa895b6fb7ff40819a1e328c54b1
Reviewed-on: https://code.wireshark.org/review/29452
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
5 years agoInitialize broadcast_addr at compile time.
Guy Harris [Sat, 8 Sep 2018 20:08:49 +0000 (13:08 -0700)]
Initialize broadcast_addr at compile time.

Change-Id: I068823f9941a8d1f47bcbaec30ace402e8271d0e
Reviewed-on: https://code.wireshark.org/review/29497
Reviewed-by: Guy Harris <guy@alum.mit.edu>
5 years agoDon't use on-the-stack buffers for pinfo addresses.
Guy Harris [Sat, 8 Sep 2018 19:47:14 +0000 (12:47 -0700)]
Don't use on-the-stack buffers for pinfo addresses.

pinfo addresses are supposed to be valid after the routine that sets
them exits; therefore, the data mustn't be on the stack.

Change-Id: I7db48065b2cacad200fa6b18e19b68e130e535a5
Reviewed-on: https://code.wireshark.org/review/29492
Reviewed-by: Guy Harris <guy@alum.mit.edu>
5 years agoInitialize epl_placeholder_mac at compile time.
Guy Harris [Sat, 8 Sep 2018 18:29:48 +0000 (11:29 -0700)]
Initialize epl_placeholder_mac at compile time.

Change-Id: I01d48dd34d4377c40d101446cdb3ceb82cc2c3e2
Reviewed-on: https://code.wireshark.org/review/29491
Reviewed-by: Guy Harris <guy@alum.mit.edu>
5 years agoAT: Add CMUX command
Darien Spencer [Sat, 8 Sep 2018 16:20:08 +0000 (19:20 +0300)]
AT: Add CMUX command

Change-Id: I35f53f15a35d6e13cac57ebb42c35c62b43cc32f
Reviewed-on: https://code.wireshark.org/review/29490
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
5 years agoAT: Fix CSQ checking for wrong action
Darien Spencer [Sat, 8 Sep 2018 16:01:25 +0000 (19:01 +0300)]
AT: Fix CSQ checking for wrong action

Should allow ACTION_SIMPLY instead of ACTION

Change-Id: Ia56ee3e17fcc8a36bb41ca38200d19fca689f94b
Reviewed-on: https://code.wireshark.org/review/29489
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
5 years agoAT: Add GMI, GMM, GMR commands
Darien Spencer [Fri, 7 Sep 2018 10:01:38 +0000 (13:01 +0300)]
AT: Add GMI, GMM, GMR commands

Counterparts of CGMI, CGMM, CGMR

Change-Id: Icc99f48816fa421c3fbb681ab443b2b56457dd00
Reviewed-on: https://code.wireshark.org/review/29463
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agoAdd Start-End timestamp columns to the RTP Streams report from tshark
Mihai Codrean [Fri, 7 Sep 2018 08:53:52 +0000 (11:53 +0300)]
Add Start-End timestamp columns to the RTP Streams report from tshark

Change-Id: Iafc2818a4a767643e154a1a7a3ff7bc6d7f0f12b
Reviewed-on: https://code.wireshark.org/review/29462
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agoBuild the dpauxmon documentation.
Gerald Combs [Fri, 7 Sep 2018 15:57:12 +0000 (08:57 -0700)]
Build the dpauxmon documentation.

Add dpauxmon entries to the doc targets.

Change-Id: I7a9ac76897c770892a9eac3c2de5da626e3f7ac4
Reviewed-on: https://code.wireshark.org/review/29466
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>
5 years agoRegister some unregistered etts.
Jeff Morriss [Fri, 7 Sep 2018 18:10:08 +0000 (14:10 -0400)]
Register some unregistered etts.

... Use of an unregistered ett leads to an abort.

Inspired by I3ee2f557ace1643dfba5a978add66c3c7ba7d895.  Some day I should get
the ett_ registration checking code in checkAPIs ready for prime time...

Change-Id: I69162d4bcec571e6a517a107ac365aa78bfe8d25
Reviewed-on: https://code.wireshark.org/review/29474
Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agoCMake: Use upstream check compiler modules instead
João Valverde [Fri, 7 Sep 2018 22:58:10 +0000 (23:58 +0100)]
CMake: Use upstream check compiler modules instead

CMake gives precedence to modules in CMAKE_MODULES_PATH (ours then).

It already includes CheckCCompilerFlags and CheckCXXCompilerFlags,
prefer uptream's instead, to benefit from bug fixes, etc.

Change-Id: I063c43cf29f5837c445e8281262356660594c4e5
Reviewed-on: https://code.wireshark.org/review/29484
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agosystemd_journal: Add more fields.
Gerald Combs [Fri, 7 Sep 2018 21:50:16 +0000 (14:50 -0700)]
systemd_journal: Add more fields.

Add more unofficial fields.

Change-Id: If402d98ef2d51913a798c18e9bb22ad23f8a1dd3
Reviewed-on: https://code.wireshark.org/review/29478
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
5 years agosystemd Journal: Add a cast.
Gerald Combs [Fri, 7 Sep 2018 18:37:16 +0000 (11:37 -0700)]
systemd Journal: Add a cast.

Fixes compilation on 32-bit Windows.

Change-Id: I03241d305569c1719f100950bbcabee01b6f192c
Reviewed-on: https://code.wireshark.org/review/29475
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
5 years agomake-manuf.py: Skip the title row of each .csv file.
Gerald Combs [Fri, 7 Sep 2018 17:21:14 +0000 (10:21 -0700)]
make-manuf.py: Skip the title row of each .csv file.

Change-Id: I88a4b3da6b75d4891dc3b3e5b8ceb1233e038932
Reviewed-on: https://code.wireshark.org/review/29470
Reviewed-by: Gerald Combs <gerald@wireshark.org>
5 years agoQt: Add null check for finfo and hfinfo
Martin Boye Petersen [Fri, 7 Sep 2018 07:29:39 +0000 (09:29 +0200)]
Qt: Add null check for finfo and hfinfo

Adding the null check fixes a bug that made wireshark crash
when right clicking a subtree which doesn't have any preferences
and if none of the parents had one either.

The problem was introduced in commit 589413d8772f1450be9bd4a2550cb99a95f71299

Change-Id: Ia5bbae0a58298f3e9d912e44f33589da1cbfacc9
Reviewed-on: https://code.wireshark.org/review/29455
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
5 years agoWe build Wireshark with Qt 5.9.5 on Windows; update the developer's guide.
Guy Harris [Fri, 7 Sep 2018 08:26:30 +0000 (01:26 -0700)]
We build Wireshark with Qt 5.9.5 on Windows; update the developer's guide.

Change-Id: Ifebe4b72f35466ddc78bccc96b145afa400ad715
Reviewed-on: https://code.wireshark.org/review/29460
Reviewed-by: Guy Harris <guy@alum.mit.edu>
5 years agoPER: fix dissection of enumerated type with a single extension value
Pascal Quantin [Fri, 7 Sep 2018 07:38:34 +0000 (09:38 +0200)]
PER: fix dissection of enumerated type with a single extension value

Per X.691 chapter 14.3, a enumerated type with extension marcker should
always be encoded as a normally small non-negative whole number.

Change-Id: Ice070a932792ba1654674c68157ff4b6b0942f90
Reviewed-on: https://code.wireshark.org/review/29454
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years ago[packet-cp2179.c] - Added support for Function Code 0x04 and perform misc comment...
Chris Bontje [Thu, 6 Sep 2018 22:14:51 +0000 (16:14 -0600)]
[packet-cp2179.c] - Added support for Function Code 0x04 and perform misc comment & variable-name clean-ups

Change-Id: I484eb9986e144f43b5e170717c582756f0e3404f
Reviewed-on: https://code.wireshark.org/review/29453
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agoLua: remove various logging functions (debug, warn, etc.)
Peter Wu [Thu, 6 Sep 2018 14:24:24 +0000 (16:24 +0200)]
Lua: remove various logging functions (debug, warn, etc.)

The "debug" logging function overwrites the "debug" package which breaks
luacov: https://github.com/keplerproject/luacov/issues/55

Change-Id: I9b6025c060733198bfff8ea959444c09d6e08709
Reviewed-on: https://code.wireshark.org/review/29449
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agocmake: optionally require Lua 5.1 or newer
Peter Wu [Thu, 6 Sep 2018 14:18:09 +0000 (16:18 +0200)]
cmake: optionally require Lua 5.1 or newer

doc/README.wslua reports support for 5.1 and 5.2 only. Even RHEL6 ships
with Lua 5.1, so it makes not sense to maintain support for Lua 5.0.

Change-Id: I34a8084c7fba19d631b90ce5d5a28198be6a7850
Reviewed-on: https://code.wireshark.org/review/29448
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agowslua: fix source argument in debug info for luacov
Peter Wu [Thu, 6 Sep 2018 13:27:58 +0000 (15:27 +0200)]
wslua: fix source argument in debug info for luacov

The source argument should start with a '@', otherwise it is treated as
actual source code instead of a filename. This is needed for luacov. See
https://www.lua.org/manual/5.2/manual.html#lua_Debug
https://github.com/keplerproject/luacov/issues/55

Change-Id: I0a3e2da65fb6b4aaabb9173a07fdea18a788f3e3
Reviewed-on: https://code.wireshark.org/review/29447
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agoMigrate make-manuf to Python+CSV.
Gerald Combs [Wed, 5 Sep 2018 16:46:27 +0000 (09:46 -0700)]
Migrate make-manuf to Python+CSV.

The download links offered by the IEEE at
https://standards.ieee.org/products-services/regauth/ are CSV files.
Updating the Perl version to support CSV would have required rewriting a
significant portion of the script along with either adding a dependency
on Text::CSV or writing our own CSV parser.

Migrate it to Python, which has a built-in CSV module.

Change-Id: I39ba0ec873145f44374ab9f751e8bde51535ca4d
Reviewed-on: https://code.wireshark.org/review/29442
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>
5 years agodocsis: add preference to disable dissection of encrypted payload
Andrii Vladyka [Wed, 5 Sep 2018 04:44:53 +0000 (21:44 -0700)]
docsis: add preference to disable dissection of encrypted payload

Encrypted payload is dissected by default, user can disable this in Protocol Preferences.
Source and destination addresses always printed (they're never encrypted
according to DOCSIS BPI/BPI+ specs).

Change-Id: I2bcd2257b8c3c916d51eeed22cf0d99065021de3
Reviewed-on: https://code.wireshark.org/review/29420
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>
5 years agolwm2mtlv: Update to Core V1.1 spec
Stig Bjørlykke [Thu, 6 Sep 2018 18:15:02 +0000 (20:15 +0200)]
lwm2mtlv: Update to Core V1.1 spec

Added Unsigned Integer and Corelnk data types.
Added new resources to Security, Server and Connectivity Monitoring.
Added OSCORE object with resources.

+ print formatted Objlnk data type.

Change-Id: Iebc85904a5425149d38ba5ccd654a508d6b11f83
Reviewed-on: https://code.wireshark.org/review/29451
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agoAT: Fix dissector function return types
Stig Bjørlykke [Thu, 6 Sep 2018 10:28:22 +0000 (12:28 +0200)]
AT: Fix dissector function return types

Change to return gboolean for dissector functions returning
TRUE or FALSE.

Change-Id: I418f765253326cd1153b82bd6af042c36cbfc2d4
Reviewed-on: https://code.wireshark.org/review/29446
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
5 years agoAT: Add CGMI and CGMR command
Stig Bjørlykke [Thu, 6 Sep 2018 07:10:02 +0000 (09:10 +0200)]
AT: Add CGMI and CGMR command

Change-Id: Ifc4f02fcd0def6280a62c0485389a5ca5a2c98d4
Reviewed-on: https://code.wireshark.org/review/29443
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agopfcp: correct Linked URR Id to 32bit
Andreas Schultz [Fri, 17 Aug 2018 08:55:54 +0000 (10:55 +0200)]
pfcp: correct Linked URR Id to 32bit

Change-Id: I59c685c23d4cecff5dba07dda0bdd8918196c3dc
Reviewed-on: https://code.wireshark.org/review/29445
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agoFP: Show ToA expert info for non-dch channels
Darien Spencer [Tue, 4 Sep 2018 17:21:03 +0000 (20:21 +0300)]
FP: Show ToA expert info for non-dch channels

Also fix precision for DCH ToA value in ms.
Change-Id: Iece72953d129a3c9bb4aa3c1bcbc745c799eecb6
Reviewed-on: https://code.wireshark.org/review/29419
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agoexntest: fix no previous prototype for ‘run_tests’ [-Wmissing-prototypes]
Alexis La Goutte [Wed, 5 Sep 2018 18:37:20 +0000 (18:37 +0000)]
exntest: fix no previous prototype for ‘run_tests’ [-Wmissing-prototypes]

Change-Id: I02f4bebeb61af2cf3246fdba61c726b5829f7491
Reviewed-on: https://code.wireshark.org/review/29437
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years agoAVSP: Read ethernet type and call ethernet type dissector after reading AVSP
Jack Culhane [Tue, 4 Sep 2018 13:04:21 +0000 (14:04 +0100)]
AVSP: Read ethernet type and call ethernet type dissector after reading AVSP

Bug: 15107
Change-Id: Ia706f1cdd0b6d7ed74292c895b0ccea1b91edd78
Reviewed-on: https://code.wireshark.org/review/29413
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 years ago.gitignore: Remove version.h.
Gerald Combs [Tue, 4 Sep 2018 23:12:08 +0000 (16:12 -0700)]
.gitignore: Remove version.h.

Remove version.h from .gitignore. This appears to be a leftover artifact
from Autotools.

Change-Id: I7b278c36444673bd50d936585cfdc5562d9ea825
Reviewed-on: https://code.wireshark.org/review/29418
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
5 years agowmem_test: fix no previous prototype for ‘check_val_map’ [-Wmissing-prototypes]
Alexis La Goutte [Wed, 5 Sep 2018 18:39:14 +0000 (18:39 +0000)]
wmem_test: fix no previous prototype for ‘check_val_map’ [-Wmissing-prototypes]

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