Commit Graph

74052 Commits

Author SHA1 Message Date
Peter Wu 0a25bfe647 test: enable parallelism by default for pytest
Consistent with tools like "ninja", enable parallelism by default. It
can be disabled again with `pytest -n0`.

This makes pytest-xdist a dependency when pytest is used as test runner.
This does not affect the unittest-based test runnet (test/test.py).

Change-Id: I4dc905f097c57a869aa39487b15361502b431616
Reviewed-on: https://code.wireshark.org/review/31371
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-01-05 06:47:25 +00:00
Peter Wu 5dc1e77298 pytest.ini: declare minimum version requirement
pytest 3.0.0 (2016-08-18) or newer is required due to the use of the
yield keyword in fixtures and the use of getfixturevalue. Do not bother
supporting older versions, install newer versions via pip instead.

Change-Id: I35ae787e2abcc706c19251d29a7d5b8513079c15
Reviewed-on: https://code.wireshark.org/review/31373
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-01-05 06:47:07 +00:00
Peter Wu 2e411dba93 test: allow running pytest without specifying the tests directory
This allows `pytest` to be executed from the top-level source or build
directory (or any other directory below).

Change-Id: Ib7af2ea2aaf01319d6839d2dc67228fbb5a7bc34
Reviewed-on: https://code.wireshark.org/review/31370
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-01-05 06:46:54 +00:00
Gerald Combs f100f7f122 maxmind_db: Close our pipe FDs inside a lock.
Lock our pipe mutex before closing its file descriptors. This should
hopefully fix some infrequent crashes that I'm seeing on my Windows 7 VM.

Add a note about GRWLock behavior on Windows which doesn't appear to be
related to this issue, but which is nevertheless important.

Ping-Bug: 14701
Change-Id: I32e66a24258264fa65a907f319755594f90c0177
Reviewed-on: https://code.wireshark.org/review/31375
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-01-05 06:46:20 +00:00
kanidef 5fa9257704 add encoding windows 1251, cp855, cp866
Change-Id: I0e8507cf63d89942167ca579ef304bc3d679346e
Reviewed-on: https://code.wireshark.org/review/31316
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-01-04 23:37:17 +00:00
Gerald Combs 340ad1793b Finish migrating to Asciidoctor's modern syntax.
Finish migrating the User's and Developer's guides to modern syntax.
Remove :compat-mode: from attributes.asciidoc.

Change-Id: I1232676c6ef4c3638253d070dcbae6d3c1ead284
Reviewed-on: https://code.wireshark.org/review/31374
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-01-04 21:49:59 +00:00
Dario Lombardo 0eff9103b6 debian: add dh-python to debian deps.
Basic Ubuntu installation lacks it.

Change-Id: I208952d15bd32a7813c20625fe94656fb71ae824
Reviewed-on: https://code.wireshark.org/review/31322
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Balint Reczey <balint@balintreczey.hu>
2019-01-04 18:50:45 +00:00
Peter Wu 751ba4fadc test: assume binaries in $PWD\run\RelWithDebInfo by default
Avoid the need to set `pytest --program-path` in the common case.

Change-Id: I3b237e47eee741decb62a74b733110040aa26673
Reviewed-on: https://code.wireshark.org/review/31348
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-01-04 18:08:04 +00:00
Peter Wu aba0e8eec0 extcap: fix --extcap-version argument to include the version
Change-Id: I727864ae0a210fea2dc90624102b793f5a98e395
Fixes: v2.9.0rc0-2648-g9ae02a5918 ("extcap: run --extcap-config in parallel to reduce startup time")
Reviewed-on: https://code.wireshark.org/review/31367
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-01-04 15:29:54 +00:00
Peter Wu a4dad7cb6d commit-msg: accept commit messages with backslashes
Dash (/bin/sh on Ubuntu) treats backslashes specially in an echo
command. This could fail the validate-commit.py script when '\r' or '\n'
occur anywhere in a commit message.

Change-Id: Icec2c1e8ad1b365b4326ecc6ba9667ac64866fdd
Reviewed-on: https://code.wireshark.org/review/31368
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-01-04 14:45:03 +00:00
Dario Lombardo bbf77f935e wsutil: fix code according to clang-tidy.
Change-Id: I7b4caed147c5813d7c9737c551b8bf1a7be48929
Reviewed-on: https://code.wireshark.org/review/31361
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-01-04 14:21:56 +00:00
Dario Lombardo 905d87a28f wiretap: fix code according to clang-tidy.
Change-Id: I7f539968e9dce3a49112b7aeaa052b8cdb7501a6
Reviewed-on: https://code.wireshark.org/review/31364
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-01-04 14:15:58 +00:00
Stig Bjørlykke 393b22047b Qt: Add "Show in Finder/Folder" for plugins.
Add a menu item for "Show in Finder/Folder" for plugins in cases where
Wireshark loads plugins from other folders than is listed in "Folders".

Change-Id: I8cc42d9992d885f1ca37f5769d7292bed1584f4b
Reviewed-on: https://code.wireshark.org/review/31270
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-01-04 12:00:57 +00:00
Dario Lombardo 2fe46f29c4 ws_mempbrk_sse42: use same var names.
Found by clang-tidy.

Change-Id: I2f89c6860d591c5c1563b9ca01306bb3d9e5e42c
Reviewed-on: https://code.wireshark.org/review/31359
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-01-04 11:33:32 +00:00
Dario Lombardo bab774d260 ws_pipe: use same var name.
Found by clang-tidy.

Change-Id: I0d324faf494f6b68275d6ff600304f716529778b
Reviewed-on: https://code.wireshark.org/review/31358
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-01-04 11:30:21 +00:00
Dario Lombardo e0e1f3ff31 xtea: use same var name.
Found by clang-tidy.

Change-Id: I5afce9464536cbbaf8f7f84b165d2ef56e166c2e
Reviewed-on: https://code.wireshark.org/review/31357
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-01-04 11:29:47 +00:00
Ross 29bfeccc8d CRC6: Fixed CRC lookup table and functions
* Generated code and 256-element lookup table with pycrc
* Combined 2 crc6 functions which both have same poly 0x6f and lookup table
* Using the example file from the bug report,

    $ tshark -r ~/Downloads/M1_header_crc.pcapng -V | grep "Calculated CRC"
    1101 00.. = Header CRC: 0x34 [Calculated CRC 0x34]

Header and Calculated CRC are now both 0x34 (correct value)

* pycrc settings for generation:
    $ python pycrc.py --reflect-in False \
                      --reflect-out False \
                      --xor-in 0 \
                      --xor-out 0 \
                      --algorithm table-driven
                      --width 6 \
                      --poly 0x2f

* To manually check 3GPP protocol header CRCs, use above command with flag

    --check-hexstring=<HEADER HEX>

Bug: 14875
Change-Id: I283f52fcae10b2f92f107df6988629d49d692428
Reviewed-on: https://code.wireshark.org/review/31356
Reviewed-by: Ross Jacobs <rossbjacobs@gmail.com>
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-01-04 06:04:07 +00:00
Dario Lombardo 9aa63d2406 epan: remove return from functions returning void.
Found by clang-tidy.

Change-Id: Ibedfec5e5d3eca7c2e65319b7ecb4dcbe974b88b
Reviewed-on: https://code.wireshark.org/review/31337
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-01-04 05:07:58 +00:00
Gerald Combs 1db84c9330 WSDG: Add a note about Npcap licensing.
Expand the Npcap text. Make it clear that you might need to purchase a
license to redistribute Npcap.

Change-Id: I9340ed2d363e66443797478c59859ce10d648aff
Reviewed-on: https://code.wireshark.org/review/31351
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-01-04 05:07:07 +00:00
Gerald Combs 5dfec5f64f WSDG: Stop recommending DDD.
Drop mentions of DDD in favor of Qt Creator, CLion, and Eclipse. From
looking at https://sourceware.org/gdb/wiki/GDB%20Front%20Ends I'm
guessing that those have superseded DDD, as nice at it is/was.

Change-Id: I445a909ab8c8aa73c90f868d6b0958bb8faf62d6
Reviewed-on: https://code.wireshark.org/review/31353
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-01-04 05:02:37 +00:00
Peter Wu 874d09ce02 test/dissectorstest: assert that text2pcap and tshark runs
Fail early if these commands fail.

Change-Id: I6ba6cfa4b0b68c7282b79204b4f2bfedfefa4326
Reviewed-on: https://code.wireshark.org/review/31352
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-01-04 05:01:25 +00:00
Peter Wu 6c5da2804b test: split SubprocessTestCase.run into setUp/tearDown
The run method is not invoked when running in debug mode (for example,
with `pytest --pdb`) and would result in spurious errors due to "log_fd"
being None. Split the method to resolve this incompatibility.

Note that with `pytest --pdb`, the tearDown method is not called when
exceptions occur, see https://docs.pytest.org/en/latest/unittest.html

Change-Id: I4b66c03d5b050b53311ec64021fe17dc91bb48dd
Reviewed-on: https://code.wireshark.org/review/31339
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-01-04 04:58:25 +00:00
Guy Harris da4aea6b55 Remove a no-longer-needed DIAG_OFF/DIAG_ON pair.
If you're not casting anything, you're not casting away qualifiers, so
there's no need to disable warnings about casting away constness.

Change-Id: Ib6bb75a8683ce129078a09df385159c13d2cf306
Reviewed-on: https://code.wireshark.org/review/31355
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-01-04 02:28:19 +00:00
Jim Young 1cc4c15ef0 doc/README.display_filter: Fix typo: asser -> assert
Change-Id: If49baf3e2b4e01f4ca4ea85415a3a291f8c04c92
Reviewed-on: https://code.wireshark.org/review/31354
Petri-Dish: Jim Young <jim.young.ws@gmail.com>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-01-03 23:45:15 +00:00
Dario Lombardo b67b47558d epan: remove redundant casts.
Found by clang-tidy.

Change-Id: Iaf6cf84c33b03ddfcd39a333b49f4987002afa56
Reviewed-on: https://code.wireshark.org/review/31338
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-01-03 23:39:43 +00:00
Dario Lombardo 58b71c754c file: remove redundant cast.
Found by clang-tidy.

Change-Id: I58c11e09ed89e99457635dd843311ce3cf3c6bae
Reviewed-on: https://code.wireshark.org/review/31334
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-01-03 23:36:51 +00:00
Dario Lombardo ce52cf4f8f sharkd: remove redundant cast.
Found by clang-tidy.

Change-Id: Ie02a77ffc17050743de216594d40faa65e1dabc2
Reviewed-on: https://code.wireshark.org/review/31336
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-01-03 23:36:20 +00:00
Dario Lombardo 14c61f14fc extcap: remove redundant casts.
Found by clang-tidy.

Change-Id: Icd4a72d840092ce9c5e18e3d16a94b785b4521dc
Reviewed-on: https://code.wireshark.org/review/31333
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-01-03 22:19:55 +00:00
Dario Lombardo 0ed9656b90 rawshark: remove redundant cast.
Found by clang-tidy.

Change-Id: I50912055e0230173af3a6b008fafb12144b02f8d
Reviewed-on: https://code.wireshark.org/review/31335
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-01-03 22:10:33 +00:00
Guy Harris c7ac27b288 Put a period at the end of a sentence.
Change-Id: Ifad6b9a09bc052d687cefe3ccda8c07ad765abda
Reviewed-on: https://code.wireshark.org/review/31350
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-01-03 22:01:43 +00:00
Guy Harris fae1db0326 Slight fixup for where the capture code lives.
The full explanation is a bit more complicated - we'd have to mention
the dumpcap/*shark split, and the code on both sides of the split.

Change-Id: I43f8fc3c589bdf900e20714b55a3b4f544879bc2
Reviewed-on: https://code.wireshark.org/review/31349
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-01-03 21:57:34 +00:00
Gerald Combs c39bc2a4f6 WSDG: Miscellaneous updates and fixes.
Update the Windows CRT text to mention the Universal CRT.

Replace references to WinPcap with Npcap.

Update the Qt LTS text.

Add a WiX / .msi section

Use curly quotes.

Use the {cpp} attribute so that the "++" in "C++" doesn't trigger
monospace formatting.

Make the various "Unix" and "Windows" subsection title names uniform.
Give them the "discrete" attribute so that they don't clutter up the
TOC.

Title-case section titles.

Remove the reference to m4. As far as I can tell we don't require it.

Change-Id: I73f851adae640f77205781d6c4962002c2d53f49
Reviewed-on: https://code.wireshark.org/review/31343
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-01-03 21:38:49 +00:00
Peter Wu 8dbca7320d test: print command output for dfiltertest failures
The buildbot detects random errors on Windows. Log some more details in
order to understand the problem better.

Change-Id: I903457894985273a63b8907b6784a2897cd93d93
Reviewed-on: https://code.wireshark.org/review/31340
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-01-03 20:59:56 +00:00
Guy Harris 20ad0ffbaf Avoid definition collisions for INVALID_SOCKET.
Newer versions of libpcap define it (due to the somewhat infelicitous
API for "active mode" remote capture, which returns a socket); don't
define it ourselves if it's already defined.

Change-Id: I620576620fd2708ebd503da696e17b472bc20472
Reviewed-on: https://code.wireshark.org/review/31344
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-01-03 20:21:52 +00:00
Guy Harris f727e8b387 Fix indentation.
Change-Id: I60d9b7b5dce04dae560a68feb329041c0374c241
Reviewed-on: https://code.wireshark.org/review/31342
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-01-03 19:41:05 +00:00
Dario Lombardo 86ea0055f3 tshark: remove redundant casts.
Found by clang-tidy.

Change-Id: I7fe1c3219758d8daf411d094e2df17916f2eb57b
Reviewed-on: https://code.wireshark.org/review/31330
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-01-03 19:34:10 +00:00
Dario Lombardo b44f07c8b3 capture_sync: use the same var name as in other places.
error_message -> error_msg.

Change-Id: Ie1bc1b72800dc6c93e481cfffa202d5bd0743b5c
Reviewed-on: https://code.wireshark.org/review/31329
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-01-03 19:33:00 +00:00
Peter Wu 461264bc39 doc: update README.display_filter for new test location
Change-Id: I29bb00dbec43692d940ef6f389743af56dfd6995
Reviewed-on: https://code.wireshark.org/review/31341
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-01-03 19:16:34 +00:00
Peter Wu 1d7ed3d8fe release-notes: document TLS and library changes
Change-Id: I3af4cb96a6c87205cdd6c85c27977366cb77291f
Reviewed-on: https://code.wireshark.org/review/31327
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-01-03 15:54:45 +00:00
Dario Lombardo 30c90fa745 epan: use json_dumper for json outputs.
They include -Tjson, -Tjsonraw, -Tek.

Change-Id: Ib3d700482ce5c29727c3f778cc3c46a1bf7756c4
Reviewed-on: https://code.wireshark.org/review/31000
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-01-03 14:33:48 +00:00
Dario Lombardo 19d787d051 json_dumper: make json_dumper_bad fatal.
A call to this function means a programming error. g_error makes it
fatal and terminates the program, making the debug easier.

Change-Id: I5c9e82507482733b4d450ed6c3a9fc17fb0fcdca
Reviewed-on: https://code.wireshark.org/review/31310
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-01-03 14:04:23 +00:00
Christophe GUERBER 7c788fd459 GeoNetworking cleanup and minor corrections
Removes obsoleted dissector tables, cleanup comments, correct elevation
display and intx display.

Change-Id: I7224bede0cecbbd5cab91630193e17a7e12615b1
Reviewed-on: https://code.wireshark.org/review/31323
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-01-03 14:00:09 +00:00
Dario Lombardo a4d7d156b1 debian: update symbols.
Change-Id: I550dd3b6bdf29cb8c5a80ba8d08b29ffbe3246cd
Reviewed-on: https://code.wireshark.org/review/31321
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-01-03 13:59:26 +00:00
Emmanuel Grumbach 310d4a861c ieee80211: print the RU Allocation in decimal
The RU Allocation is really a decimal number and the
standard uses it as a decimal number. It is not a bitmap.
Print it in decimal.

Change-Id: I2f8ff9798aa1af855ad3c8b0a26704282fe18189
Reviewed-on: https://code.wireshark.org/review/31315
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>
2019-01-03 12:19:17 +00:00
Alexis La Goutte 66de3fcf9d knsxip: fix header
it is no longer Ethereal (=> Wireshark)

Change-Id: I2a59aa0ec4e18b05612bbce6ede18db9ae350e49
Reviewed-on: https://code.wireshark.org/review/31317
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-01-03 12:18:32 +00:00
Alexis La Goutte 1ccb0b7a8e geonw: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
Change-Id: Ib1e26cc20ad30889a56455bcf529ba404f14506f
Reviewed-on: https://code.wireshark.org/review/31320
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-01-03 12:17:35 +00:00
Alexis La Goutte b842b8e7c4 knxip: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
Change-Id: Ifa64a819d50b730eae4a5c2447b502580a871f16
Reviewed-on: https://code.wireshark.org/review/31318
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-01-03 12:16:34 +00:00
Kenneth Soerensen 6fa164e7c4 Add dissector for Great Britain Companion Specification (GBCS)
The Smart Metering Equipment Technical Specifications (SMETS) requires
that Gas Smart Metering Equipment (GSME), and Electricity Smart
Metering Equipment (ESME) including variants, meet the requirements
described in the Great Britain Companion Specification (GBCS).

GBCS messages are end-to-end and contains ZigBee, DLMS or ASN.1
formatted payloads. The GBCS messages are transported via IPor via
the ZigBee Tunneling cluster.

https://smartenergycodecompany.co.uk/document-download-centre/download-info/gbcs-v2-1/

Bug: 15381
Change-Id: I28ca9831fc266a6abd310db103306b98786e63f9
Reviewed-on: https://code.wireshark.org/review/31168
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Martin Boye Petersen <martinboyepetersen@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-01-03 04:02:15 +00:00
Gerald Combs e4c53ec28c Couchbase: Fixup a shadow variable.
Rename index to byte_idx.

Change-Id: I49d09d6db71d5db9e1c65f2abadc1413b3ccb7ec
Reviewed-on: https://code.wireshark.org/review/31313
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-01-03 04:01:03 +00:00
Peter Wu 7c04036e72 Windows: use lua-unicode as built with VS 2017
These binaries were built by AppVeyor using VS 2017 (MSVC 19.16.27025.1)
and replaces locally built binaries using VS 2015 (MSVC 19.0.24215.1).
I believe that these are the same as both of them use VCRUNTIME140.dll
and import the same symbols. Using a newer compiler should however
remove any doubt of compatibility with VS 2017 and should address
concerns from Anders and Graham.

These files are actually the "msvc2017_*.zip" files from
https://github.com/Lekensteyn/lua-unicode/releases/tag/5.2.4-release1

Change-Id: Ib3fdf4678267fa10c0729f98ae0ce3153ac278a4
Reviewed-on: https://code.wireshark.org/review/31307
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-01-03 04:00:25 +00:00