aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2019-01-21add variable ie infothomas/dectthomasDOTwtf1-5/+159
2019-01-16add additional DECT typesthomasDOTwtf1-0/+109
2019-01-15added additional 7.4.5 MM valuesthomasDOTwtf1-3/+28
2019-01-05WIP: Initial dissector for DECT NWK layerHarald Welte2-0/+336
Change-Id: Idf0b97ce40ec5b2dd1b507a72fed64cfee288354
2019-01-05dect-dlc: Don't call NWK dissector if there's no payloadHarald Welte1-4/+6
Change-Id: Ia86185f52b724be61db2d94ffaf51fd00ebab84c
2019-01-04WIP: Initial dissector for DECT DLC protocol layerHarald Welte3-2/+306
Change-Id: Iabd75b0f9b12ea9162dc164741123feb1ba7992d
2019-01-04WIP: Dissector for Aastra/Mitel DECT over RAW EthernetHarald Welte2-0/+242
Change-Id: I2c5cebd0fc9eb329f07b89a06045116cf612f422
2019-01-04extcap: fix --extcap-version argument to include the versionPeter Wu1-1/+1
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-04commit-msg: accept commit messages with backslashesPeter Wu1-2/+2
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-04wsutil: fix code according to clang-tidy.Dario Lombardo1-3/+3
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-04wiretap: fix code according to clang-tidy.Dario Lombardo6-13/+13
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-04Qt: Add "Show in Finder/Folder" for plugins.Stig Bjørlykke2-0/+29
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-04ws_mempbrk_sse42: use same var names.Dario Lombardo1-12/+12
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-04ws_pipe: use same var name.Dario Lombardo1-1/+1
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-04xtea: use same var name.Dario Lombardo1-8/+8
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-04CRC6: Fixed CRC lookup table and functionsRoss5-1075/+58
* 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-04epan: remove return from functions returning void.Dario Lombardo2-3/+0
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-04WSDG: Add a note about Npcap licensing.Gerald Combs1-2/+20
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-04WSDG: Stop recommending DDD.Gerald Combs2-27/+12
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-04test/dissectorstest: assert that text2pcap and tshark runsPeter Wu1-2/+2
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-04test: split SubprocessTestCase.run into setUp/tearDownPeter Wu1-38/+31
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-04Remove a no-longer-needed DIAG_OFF/DIAG_ON pair.Guy Harris1-2/+0
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-03doc/README.display_filter: Fix typo: asser -> assertJim Young1-1/+1
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-03epan: remove redundant casts.Dario Lombardo9-17/+17
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-03file: remove redundant cast.Dario Lombardo1-1/+1
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-03sharkd: remove redundant cast.Dario Lombardo1-1/+1
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-03extcap: remove redundant casts.Dario Lombardo1-3/+3
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-03rawshark: remove redundant cast.Dario Lombardo1-1/+1
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-03Put a period at the end of a sentence.Guy Harris1-1/+1
Change-Id: Ifad6b9a09bc052d687cefe3ccda8c07ad765abda Reviewed-on: https://code.wireshark.org/review/31350 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-01-03Slight fixup for where the capture code lives.Guy Harris1-2/+3
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-03WSDG: Miscellaneous updates and fixes.Gerald Combs9-125/+170
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-03test: print command output for dfiltertest failuresPeter Wu1-1/+2
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-03Avoid definition collisions for INVALID_SOCKET.Guy Harris1-0/+2
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-03Fix indentation.Guy Harris1-1/+1
Change-Id: I60d9b7b5dce04dae560a68feb329041c0374c241 Reviewed-on: https://code.wireshark.org/review/31342 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-01-03tshark: remove redundant casts.Dario Lombardo1-5/+5
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-03capture_sync: use the same var name as in other places.Dario Lombardo1-1/+1
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-03doc: update README.display_filter for new test locationPeter Wu1-30/+19
Change-Id: I29bb00dbec43692d940ef6f389743af56dfd6995 Reviewed-on: https://code.wireshark.org/review/31341 Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-01-03release-notes: document TLS and library changesPeter Wu1-0/+11
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-03epan: use json_dumper for json outputs.Dario Lombardo4-356/+216
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-03json_dumper: make json_dumper_bad fatal.Dario Lombardo1-1/+1
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-03GeoNetworking cleanup and minor correctionsChristophe GUERBER2-48/+28
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-03debian: update symbols.Dario Lombardo1-0/+1
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-03ieee80211: print the RU Allocation in decimalEmmanuel Grumbach1-2/+2
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-03knsxip: fix headerAlexis La Goutte2-4/+4
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-03geonw: Fix Dead Store (Dead assignement/Dead increment) Warning found by ClangAlexis La Goutte1-3/+3
Change-Id: Ib1e26cc20ad30889a56455bcf529ba404f14506f Reviewed-on: https://code.wireshark.org/review/31320 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-01-03knxip: Fix Dead Store (Dead assignement/Dead increment) Warning found by ClangAlexis La Goutte1-11/+11
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-03Add dissector for Great Britain Companion Specification (GBCS)Kenneth Soerensen3-0/+1773
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-03Couchbase: Fixup a shadow variable.Gerald Combs1-4/+4
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-03Windows: use lua-unicode as built with VS 2017Peter Wu1-4/+4
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-02Don't fall out of the loop on a write error.Guy Harris1-1/+1
Doing so means we'd close the FD, but we've already closed it. Addresses Coverity CID 1442274. Change-Id: I5aab1bd4b82e9ac0901bcdbc1ddb6b16eec30573 Reviewed-on: https://code.wireshark.org/review/31312 Reviewed-by: Guy Harris <guy@alum.mit.edu>