Commit Graph

74472 Commits

Author SHA1 Message Date
Peter Wu 7cc5941f95 json_dumper: add json_dumper_value_double
Add locale-independent version that replaces json_dumper_value_anyf for
floating-point numbers. NaN and -/+Infinity are mapped to null.

Change-Id: I8e7856de480b7bcafe77ddd015239e1257768ced
Reviewed-on: https://code.wireshark.org/review/31948
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Jakub Zawadzki <jbwzawadzki@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-02-11 05:09:58 +00:00
Peter Wu 0ca65a66f4 Fix crash when using the "matches" operator on non-UTF-8 data
GRegex is a thin wrapper around PCRE. Inputs (patterns and subjects) are
assumed to be UTF-8 by default (unless G_REGEX_RAW is set). If the
subject is not valid UTF-8, normally pcre_exec will immediately return a
failure. However, as GLib sets PCRE_NO_UTF8_CHECK when G_REGEX_RAW is
given, pcre_exec() will skip the safety check and crash instead.

Fix this by always assuming raw byte patterns. Regression risk: patterns
such as `ö.ï` will no longer match `öñï` since `ñ` is a multi-byte
sequence. Patterns such as `(GET|POST) /` remain functional though.

Bug: 14905
Change-Id: I6450bb83f565d377f82a5dbb01690c5f49acd96f
Reviewed-on: https://code.wireshark.org/review/31935
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-02-11 05:08:53 +00:00
Dylan Ulis f2dc64e9b8 CIP: Fix false positive expert info
Some buffer size checking was off by 1.

Change-Id: Ib99da61f476b6f20abe40311fd2112a8693a7878
Reviewed-on: https://code.wireshark.org/review/31946
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-02-11 05:07:13 +00:00
Peter Wu f54a625682 CMake: clear cache variables when a library has changed
On Windows, whenever win-setup.ps1 installs new libraries, the old
paths become invalid. As a workaround the user can remove CMakeCache.txt
completely or manually delete entries. Removing the whole file might
lose custom options and clearing individual entries is tedious. Let's
handle this automatically.

Some HAVE_xxx variables from check_function_exists calls in PCAP and
ZLIB, and one from check_symbol_exists in KERBEROS are not cleared.
Those special cases would require too much work, the user should
manually clear their cache in this case if needed.

Fixes my local build since CARES, KERBEROS and LibXml2 were updated.
Special care was necessary for LibXml2 as it will not set cache variable
LIBXML2_LIBRARY when LIBXML2_LIBRARIES is already set.

Change-Id: Ic793bdb67161504aadadf221bd7740a0ca31db63
Link: https://www.wireshark.org/lists/wireshark-dev/201902/msg00028.html
Reviewed-on: https://code.wireshark.org/review/31960
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-02-11 05:06:10 +00:00
Peter Wu 203839df3d CMake: remove unused FindMACOS_FRAMEWORKS.cmake file
This was added in v1.99.0-rc1-578-gdbd409d041, but was never used.

Change-Id: Ieb202693d555ff62ff13aca46b0f289f0d4c6cfb
Reviewed-on: https://code.wireshark.org/review/31959
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-02-11 05:05:49 +00:00
Peter Wu 7bb8d5ad31 f5ethtrailer: set G_REGEX_RAW for platform pattern (cleanup)
The platform is retrieved as ENC_ASCII which signifies that the subject
is not expected to contain UTF-8. Set G_REGEX_RAW accordingly.
Does not fix any crashes, it is just a cleanup.

Change-Id: I61edd0204978d5b1e057b4f1cf8cdf8fb43c2a63
Ping-Bug: 14905
Reviewed-on: https://code.wireshark.org/review/31941
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-02-10 16:13:12 +00:00
Peter Wu 720c3bdc04 column: set G_REGEX_RAW for the custom column filter
Neither the pattern nor the intended subject (a custom fields filter)
contain UTF-8, so set G_REGEX_RAW accordingly. While a filter such as
`tcp matches "foo\xff"` (with `\xff` being a single byte) was accepted,
it did not trigger a crash though even if the precondition was violated.

Change-Id: I45d76b9abbd942d186dcf70f581121769bbd2d0a
Ping-Bug: 14905
Reviewed-on: https://code.wireshark.org/review/31940
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-02-10 16:12:59 +00:00
Peter Wu 567fe966b1 extcap: set G_REGEX_RAW to avoid potential crashes
None of the patterns try to match UTF-8 text. Treat the inputs as bytes
to avoid potential crashes on invalid subjects (e.g. malformed data from
an extcap binary, ADB or SSH server).

Change-Id: I6f3113cfd9da04ae3fa2b0ece7b0a3a94312830e
Ping-Bug: 14905
Reviewed-on: https://code.wireshark.org/review/31939
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-02-10 16:12:46 +00:00
Peter Wu 80587eb063 logcat-text: set G_REGEX_RAW to fix potential crashes
No UTF-8 patterns are in use. To avoid potential crashes on invalid
input, treat all lines as binary data in the dissector to match wiretap.

Change-Id: I10735c2246536fb4b2fdb9236cdbf7917d2e816c
Ping-Bug: 14905
Reviewed-on: https://code.wireshark.org/review/31938
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-02-10 16:12:09 +00:00
Peter Wu 384a41de8d tls: set G_REGEX_RAW for keylog file pattern to fix potential crash
No UTF-8 patterns are in use. To avoid potential crashes on invalid
input, let's treat the key log file contents as binary.

Change-Id: Iab257df2d0863b32961df2199dc755417d28a946
Ping-Bug: 14905
Reviewed-on: https://code.wireshark.org/review/31937
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-02-10 16:11:50 +00:00
Peter Wu 07910e841e RPM: respect options for disabling Qt, SpanDSP and BCG729
"%bcond_without" enables a feature by default. Be sure to explicitly
disable features to match the requested configuration.

Change-Id: I90687f35bcd953670e147be9e70af03aaeaef5dc
Ping-Bug: 14606
Reviewed-on: https://code.wireshark.org/review/31933
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-02-10 14:50:49 +00:00
Gerald Combs 55db3d523d [Automatic update for 2019-02-10]
Update manuf, services enterprise numbers, translations, and other items.

Change-Id: I3ac8fcfec83e5d35ee07e07cd0d1d04a17cc2ac5
Reviewed-on: https://code.wireshark.org/review/31954
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-02-10 08:28:46 +00:00
Gerald Combs 18b180c59a Windows: Upgrade Kerberos to 1.17-1.
Rebuild with NODEBUG=1.

Bug: 15491
Change-Id: I58764c40557c3b148c928d0460cb5d458147f52c
Reviewed-on: https://code.wireshark.org/review/31936
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-02-08 20:46:31 +00:00
Gerald Combs a43730cb10 Convert WinPcap references to Npcap.
Convert WinPcap references and URLs in error messages and the FAQ
to their Npcap equivalents. Remove some obsolete FAQ entries.

Change-Id: I695d358a2c9cff0939f4ea84ba02d4c62ad7dd01
Reviewed-on: https://code.wireshark.org/review/31943
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-02-08 20:29:06 +00:00
Gerald Combs aabce6151c WSDG: Windows toolchain updates.
Update some items in the toolchain section.

Change-Id: I3c2035873d4ee311b639dd3b5c94e3530abad8bc
Reviewed-on: https://code.wireshark.org/review/31944
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-02-08 20:28:04 +00:00
Peter Wu 2e13c4adb2 mqtt: document UTF-8 requirement for topic_str
If someone changes this in the future and the data is no longer valid
UTF-8, then crashes can occur.

Change-Id: I2b153d48ee1ef7093a5141001a391dd440c30e58
Ping-Bug: 14905
Reviewed-on: https://code.wireshark.org/review/31942
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-02-08 18:19:16 +00:00
Uli Heilmeier 061ebbda56 Fixing some implicit coversations (-Wshorten-64-to-32)
Fixing some "implicit conversion loses integer precision" warnings
reported by clang with -Wshorten-64-to-32 option

Change-Id: Icd641d5f4fd8ff129f03f1b9e1da0fc86329f096
Reviewed-on: https://code.wireshark.org/review/31901
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-02-08 12:12:18 +00:00
nbertin e46686cceb ua3g: update of unsolicited message
added new fields (vpn & encryption status and wlan status)
modified display of hook status and bluetooth support
added reserved bytes

Change-Id: I74298a636f60c09d593288fecc16dd8c0373c65d
Reviewed-on: https://code.wireshark.org/review/31892
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-02-08 12:11:44 +00:00
Swapnil Roy 823ffe29c5 NAS 5Gs: Update AMF Set Id
Change-Id: I86784cace1919ac9f13b35e7b734dd08be217c46
Reviewed-on: https://code.wireshark.org/review/31931
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-02-08 12:11:28 +00:00
Joerg Mayer 7a48f17df6 packet-bgp.c: Add decoding of enhanced next hop capability
Change-Id: I025df39662d404e6ba12cdabe763c4638bb8c157
Reviewed-on: https://code.wireshark.org/review/31932
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2019-02-07 17:15:26 +00:00
Peter Wu 8d7876bace wslua: do not partially disable the Lua API when run as root
Users should not be starting Wireshark as root user (sudo or root
login). If they do, then they can already execute arbitrary code via C
plugins, or read and write arbitrary files. Limiting the Lua API will
not really help these users to prevent breaking their system further.

Therefore remove all artificial restrictions and allow users to run
user-supplied scripts by default. If for whatever policy reason this
flag is set to false, then only Lua dissectors from the global system
directory are executed. It is their responsibility not to provide a free
root shell to the user.

Note that "running_superuser" will also be true if setuid root while the
effective and real user is no longer root. This happens due to
relinquish_special_privs_perm(). In this case, disabling the Lua API is
just annoying with no benefits.

Change-Id: Ie8a38e6160d861f02cbb70dcd1d90462153f4665
Link: https://www.wireshark.org/lists/wireshark-dev/201902/msg00004.html
Reviewed-on: https://code.wireshark.org/review/31913
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Dario Lombardo <lomato@gmail.com>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-02-07 10:30:06 +00:00
Peter Wu 10ef8b717c wslua: do not load console.lua when run as root
dofile is currently disabled whenever Wireshark or tshark was started as
root, calling it will result in Lua errors on startup.

Even if dofile were not disabled, the Lua Evaluate menu option enables
arbitrary Lua code execution. The other options (Console, help links)
are not that important either, so just disable it when run as root.

Change-Id: I0785fe9b3d4678d71ae1e0178811dada471c3525
Link: https://www.wireshark.org/lists/wireshark-dev/201902/msg00004.html
Reviewed-on: https://code.wireshark.org/review/31912
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Dario Lombardo <lomato@gmail.com>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-02-07 10:29:01 +00:00
Michał Łabędzki b54c9b62e8 Qt: move packet list cache from record to model
Change-Id: Idf6a10374382c8521eb205c801a72af329e5d0d2
Reviewed-on: https://code.wireshark.org/review/31528
Petri-Dish: Michal Labedzki <michal.labedzki@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-02-07 07:48:36 +00:00
Dylan Ulis ace33ff48b CIP Motion: Updates
1. Add support for 64-bit Actual Position
2. Add Time Data Set attribute
3. Add warning when format revision in data packet does not match the
   connection point from the original forward open.
4. Sync Status enum updates
5. Minor comment cleanup

Change-Id: I100a6f1576e80d706a028e2f742fdaa3f49fd2b6
Reviewed-on: https://code.wireshark.org/review/31922
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-02-07 07:47:17 +00:00
Gerald Combs 0173337c91 CMake: Make sure we deploy Qt PDBs on Windows.
Pass "--pdb" to windeployqt 5.6 and later.

Add a note about installing the "Qt Debug Information Files" component
to the Developer's Guide.

Change-Id: I81329bc9f9131050b1076fe275445b6325c24794
Reviewed-on: https://code.wireshark.org/review/31921
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>
2019-02-07 04:41:04 +00:00
Dario Lombardo ea75ba8146 debian: fix indentation in postinst script.
Change-Id: I753dd887990660f5218a91767c4e124a8ae1971d
Reviewed-on: https://code.wireshark.org/review/31909
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-02-06 20:37:35 +00:00
Gerald Combs 2b52ca1890 Windows: Upgrade Kerberos to 1.17.
Recent versions of Kerberos are much easier to compile on Windows. Switch
to version 1.17, compiled with Visual Studio 2017 and linked with the
Universal CRT.

Change-Id: I393d51666cd13255ee1419f2164d7fa59fe1c5cb
Reviewed-on: https://code.wireshark.org/review/31919
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-02-06 20:07:27 +00:00
Gerald Combs 9c49840d1c Release notes: Fix our version.
Change-Id: I6b2270c65dcd466fe7bd49f9d0611be85a1fd266
Reviewed-on: https://code.wireshark.org/review/31920
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-02-06 19:53:53 +00:00
Gerald Combs c3a8bb3758 Release notes: Clear out 3.0 content.
Change-Id: Ibfebe2f72878326d9c7abee077d731352851ea41
Reviewed-on: https://code.wireshark.org/review/31918
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-02-06 19:39:04 +00:00
Pascal Quantin 5d80fb8f74 NAS EPS: get rid of a global variable
Change-Id: Ib2d4c5d7b8e2c754c946829843174a83e11fdd6d
Reviewed-on: https://code.wireshark.org/review/31917
Petri-Dish: Pascal Quantin <pascal@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
2019-02-06 19:32:42 +00:00
Kenneth Soerensen 1ff7f8dd19 GBCS: Show field names for empty fields
Change-Id: I5d46ce66d8467c1cd7f45665661eea9c704d582d
Reviewed-on: https://code.wireshark.org/review/31911
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-02-06 15:51:51 +00:00
nbertin bfa0520f15 noe: add new identifiers in evt-local-application message
Change-Id: I3b56a1601f237e4c454b2e433233cd445c9c0706
Reviewed-on: https://code.wireshark.org/review/31905
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-02-06 14:28:08 +00:00
Kenneth Soerensen 6f1a60d2c5 ZigBee: Be consistent and use ENC_NA for all 1 byte fields
Change-Id: Ibd4ec7bef40e5e9a9ed87f1044dfff0f044a7d1f
Reviewed-on: https://code.wireshark.org/review/31904
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-02-06 13:45:49 +00:00
Shudong Zhou c8690b5980 Handle sflow vendor elements properly
Change-Id: Icc676f686eb70fe02214541246e1f808c615f883
Reviewed-on: https://code.wireshark.org/review/31899
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-02-06 13:45:37 +00:00
Dario Lombardo 47b77dfa4f debian: fix wrong version in symbols.
Change-Id: Ia9ad470f8b9137526ceea0358d1ddeaa87aa56c6
Reviewed-on: https://code.wireshark.org/review/31910
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Dario Lombardo <lomato@gmail.com>
2019-02-06 12:26:40 +00:00
Pascal Quantin 6d04390505 GNW: always fully initialize hashgeonw_t structure
Bug: 15484
Change-Id: I082bc578f46958675d32db725014a0b230373cba
Reviewed-on: https://code.wireshark.org/review/31906
Petri-Dish: Pascal Quantin <pascal@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
2019-02-06 10:12:15 +00:00
Pascal Quantin 7753ce58ea Windows: uncheck WinPcap API-compatible mode in Npcap installer
Uninstalling WinPcap through recent Npcap installers seem to fail
for some users. For now install Npcap native mode instead.

Bug: 15476
Change-Id: I9114eb824fb1bd99d5da82e8bff87f7b7eb49a74
Reviewed-on: https://code.wireshark.org/review/31870
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
2019-02-06 09:32:20 +00:00
Peter Wu 78827c8752 Accept protocol aliases in Decode As (-d tcp.port==4433,ssl)
Change-Id: Idb2e4f9964cf0b5c1237a0d4b5e0954adfd5e6b6
Reviewed-on: https://code.wireshark.org/review/31895
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-02-05 22:40:01 +00:00
Peter Wu 62a8d40b5f tshark: recognize protocol aliases such as "-O ssl"
Be sure to map "ssl" to "tls" instead of silently ignoring it.

Change-Id: If1edc10ead4a9f25ee4802e1395390dc3c51796f
Reviewed-on: https://code.wireshark.org/review/31894
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-02-05 22:39:21 +00:00
Dario Lombardo f2df0fc88d debian: update libwireshark symbols.
Change-Id: I69d32009fbd27b05f6eb1da6ee6daa47cca2e1fd
Reviewed-on: https://code.wireshark.org/review/31900
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-02-05 21:23:23 +00:00
Peter Wu 53b55bfb5f editcap: warn when --inject-secrets is given a RSA private key
While the documentation of "editcap --inject-secrets" mentions support
for key log files only, people might misinterpret that and assume
support for RSA private keys. This is explicitly not supported due to
the sensitivity of these files. In order to be helpful, print a warning.

Change-Id: Ia7b464c17f1dfb550729dd35775290ed28e14510
Reviewed-on: https://code.wireshark.org/review/31893
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-02-05 15:36:40 +00:00
Uli Heilmeier af3c6115f2 CMake: Fix build without LibXml2
This is still needed when LibXml2 is missing, otherwise the build fails with:
CMake Error: The following variables are used in this project, but they are set to NOTFOUND.

Fixes: v2.9.1rc0-625-gd17e218918 ("CMake: Update FindLibXml2.cmake")
Change-Id: I06fc2c18aa82dd553d5a10604c1a874c9a2e88a8
Reviewed-on: https://code.wireshark.org/review/31896
Reviewed-by: João Valverde <j@v6e.pt>
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-02-05 15:35:48 +00:00
Kenneth Soerensen bf820d14eb ZigBee: Dissect Metering cluster Request Fast Poll Mode Response
Change-Id: I7a9ec5f992c0856469021e93db22bf3a68ca9c6d
Reviewed-on: https://code.wireshark.org/review/31867
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-02-05 11:29:55 +00:00
Anders Broman a308b751da NAS-5GS: Uptade SM messages to v15.2.1
Change-Id: Id07ffa1d5a417b09b409fb357db34e100532bda2
Reviewed-on: https://code.wireshark.org/review/31877
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-02-05 09:50:56 +00:00
Kenneth Soerensen 83385fbe1d ZigBee: Dissect Metering cluster Schedule Snapshot Response
Change-Id: Idde270ed14b3b874be08e24d9cad5a1473b7dec9
Reviewed-on: https://code.wireshark.org/review/31866
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-02-05 09:24:51 +00:00
Dario Lombardo ac77bcc61e rpm: unconditionally add doc files.
The doc files have been added in v2.9.1rc0-618-g1bb1ffa9ca, and since
then, rpm builds complain:

RPM build errors:
    File listed twice: /usr/local/bin/dumpcap
    Installed (but unpackaged) file(s) found:
    /usr/local/share/doc/wireshark/androiddump.html
    /usr/local/share/doc/wireshark/capinfos.html
    /usr/local/share/doc/wireshark/captype.html
    [cut]

The "with ninja" condition has been removed as well since it leads to a
dead end.

Change-Id: I95185ba8cb0d488a7fd222c04ff7ff2a637a817a
Reviewed-on: https://code.wireshark.org/review/31873
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Dario Lombardo <lomato@gmail.com>
2019-02-05 08:51:50 +00:00
Pantar Ana 8176b492d8 ebhscr: add ebhscr dissector
ElektroBit High Speed Capture and Replay protocol is produced by a
PCIe Card for interfacing high speed automotive interfaces.

Bug: 15474
Change-Id: Ibb3ea36d9281b2779e2cc13d29b66dc382782ca3
Reviewed-on: https://code.wireshark.org/review/31847
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-02-05 05:02:44 +00:00
Gerald Combs d36f4fd676 NSIS: Remove a duplicate definition.
Change-Id: I6fea08b4170d71f5dead12dd9592a9bdd6689281
Reviewed-on: https://code.wireshark.org/review/31889
Reviewed-by: Gerald Combs <gerald@wireshark.org>
(cherry picked from commit 4b39f1b996e8124703cd86da69c43e157810cc02)
Reviewed-on: https://code.wireshark.org/review/31890
2019-02-05 01:47:07 +00:00
Gerald Combs 2ed12a238b 2.9 → 3.1.
Change-Id: Iea6b55037bfb62d2e9b333148cbdc55fcd53dfa2
Reviewed-on: https://code.wireshark.org/review/31888
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-02-05 01:21:10 +00:00
Gerald Combs 7f5c5e4ae7 CMake: Fix config.nsh generation.
Make sure we always define VERSION_MINOR.

Change-Id: I4a79c6d25c1392834703d9ab3cbab2c0f9794ac5
Reviewed-on: https://code.wireshark.org/review/31886
Reviewed-by: Gerald Combs <gerald@wireshark.org>
(cherry picked from commit 2c77f8899ce145a41ede5e848c67ba6cdef31b47)
Reviewed-on: https://code.wireshark.org/review/31887
2019-02-05 01:17:25 +00:00