Commit Graph

2419 Commits

Author SHA1 Message Date
Pascal Quantin 5d342b01e3 Windows: upgrade Npcap to 0.9986
Change-Id: I9ee3144416eb5564aa8974aeec0e33774edc7ed7
Reviewed-on: https://code.wireshark.org/review/35498
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
Petri-Dish: Pascal Quantin <pascal@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2019-12-19 04:57:57 +00:00
Orgad Shaneh a9c79f0159 Uncrustify: Change line length to 100 chars
80 is too small.

Change-Id: I79a702449f72fcf66ae00e3508546389b022b900
Reviewed-on: https://code.wireshark.org/review/35484
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-12-18 09:34:25 +00:00
Gerald Combs c656affc34 Windows: Get rid of textify.ps1.
We used textify.ps1 to ensure that the .txt files in our Windows
installers would render properly in Notepad if the user double-clicked
on them. Newer versions of Windows have a more sane Notepad, so this is
no longer necessary:

https://devblogs.microsoft.com/commandline/extended-eol-in-notepad/

Copy COPYING, NEWS, README.md, and README.windows once.

Update README.windows.

Change-Id: Ibb8b749725f13e0e49d2a2abe04603d9f2be7960
Reviewed-on: https://code.wireshark.org/review/35470
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-12-17 21:52:54 +00:00
Gerald Combs 31414484d4 html2text: Skip generating footnotes for self-links.
Fixes the issue described at
https://www.wireshark.org/lists/wireshark-users/201912/msg00003.html

Change-Id: Ie3fd338ab1c6b216b05eeca002545868d3474bbb
Reviewed-on: https://code.wireshark.org/review/35426
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-12-13 05:29:54 +00:00
Orgad Shaneh 64e5ae4b9d Uncrustify: Remove newline between for and brace
Change-Id: Ib89a159bbc7125b3afcfd72d1a218cb6d7c4af39
Reviewed-on: https://code.wireshark.org/review/35421
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-12-13 05:28:47 +00:00
Orgad Shaneh 4649512b14 Uncrustify: Add spaces between else and braces
Change-Id: Ida8f8638ee226b99804293158e57f4be7a045be8
Reviewed-on: https://code.wireshark.org/review/35420
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-12-13 05:28:01 +00:00
Pascal Quantin 23903925a1 Windows: update c-ares 1.15.0 package
Library was regenerated using g000e963fff596d817d03f366cd49b1fd2d6ec961
to have the proper version info.

Change-Id: I33f26d70ba1ea244aa467e5121b6fb586d8ebd8a
Reviewed-on: https://code.wireshark.org/review/35398
Petri-Dish: Pascal Quantin <pascal@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
2019-12-10 23:01:07 +00:00
Dario Lombardo b116405139 tools: use better operators in package scripts.
Change-Id: I1de75829de5f77fa5fe6c8715b1df76148937bc5
Reviewed-on: https://code.wireshark.org/review/35326
Reviewed-by: João Valverde <j@v6e.pt>
Reviewed-by: Dario Lombardo <lomato@gmail.com>
2019-12-06 13:32:47 +00:00
Dario Lombardo 469228a2e5 tools: fix check of shell variables in other setup scripts.
Change-Id: I7423f994b2295ef8336c37fd2e53418d363a4327
Reviewed-on: https://code.wireshark.org/review/35309
Reviewed-by: Dario Lombardo <lomato@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-12-05 05:37:44 +00:00
Tamir Duberstein 9879850cc3 tools/debian-setup: correctly check the value of shell variables
These conditions would previously always evalute as true.

Change-Id: I7eb35f4eae417819090ba47103a266374847cbc5
Reviewed-on: https://code.wireshark.org/review/35305
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Dario Lombardo <lomato@gmail.com>
2019-12-04 19:15:07 +00:00
Gerald Combs 451a241e50 Add c-ares to the required library list.
Although c-ares support was techically optional, it was either on by
default or required in all of our packaging. Go ahead and require it
globally. C-ares is widely available and synchronous name resolution can
easily result in a horrific user experience.

Change-Id: Id67c797316ed6b8a0ab5052e55a43a1b9e2a2464
Reviewed-on: https://code.wireshark.org/review/35188
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-11-23 22:45:59 +00:00
Graham Bloice 6a0b558ac1 tools: remove obsolete VS2015 deployment file
The xml deployment file for VS2015 is obsolete as we haven't
used that version for some time and the newer choco packages
for VS2017 & 2019 are simpler and supported.

Change-Id: I5bd29144d7a2f01a6f56147a51fbc51ce891e83c
Reviewed-on: https://code.wireshark.org/review/35189
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2019-11-23 08:25:05 +00:00
Gerald Combs 45c6ba587d cppcheck: Exclude the doc directory.
Change-Id: I8d739c7cae7b1b5676cb04e7140d2dd81ebae1d3
Reviewed-on: https://code.wireshark.org/review/35168
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-11-21 04:55:44 +00:00
Joerg Mayer 0468ead898 macos-setup.sh: Sparkle setup fixes
- mkdir on macos 10.14.6 doesn't have a -f parameter
- set file ownership on tar extraction

Change-Id: I5d6341aba02b56abe0c1aa48e68c4c1b6af15379
Reviewed-on: https://code.wireshark.org/review/35115
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2019-11-18 11:26:29 +00:00
Dario Lombardo e624545b95 tools: fix echo in bsd-setup.
Change-Id: I17479e30ea70e7c9d080994330388b205bcf56e8
Reviewed-on: https://code.wireshark.org/review/35099
Reviewed-by: Dario Lombardo <lomato@gmail.com>
2019-11-15 22:22:31 +00:00
Gerald Combs 02057200fd macOS: Add support for automatic updates using Sparkle.
Add support for automatic updates using the Sparkle framework. Add
FindSparkle.cmake and associated CMake plumbing. Add a public key and
other info to Info.plist.in. Add ui/macosx/sparkle_bridge.{h,m}, which
wraps the Sparkle API. Make code that's specific to WinSparkle
Windows-only.

Add Sparkle installation steps to the macos-setup scripts. Sparkle
prints a warning if your bundle is unsigned (which is the case during
development) so disable installing it by default.

Updating here takes a long time. We might be able to fix that by
shipping our DSYMs separately.

Change-Id: I6cc6671db5657dadc514bda6bf6e1c8bbc9468a5
Reviewed-on: https://code.wireshark.org/review/35090
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-11-15 18:39:04 +00:00
Dario Lombardo 5b661c586f tools: fix typos in generate-dissector.
Change-Id: Idd41f622aa1d14bc28dea38a7b8075a0934d619b
Reviewed-on: https://code.wireshark.org/review/35092
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-11-15 12:19:30 +00:00
Dario Lombardo 40d822ed61 tools: add automatic C skeleton dissector generator.
Generate a dissector based on doc/packet-PROTOABBREV.c.

Change-Id: I9233c1212acb30f7166ba91e39d98bc3fb123731
Reviewed-on: https://code.wireshark.org/review/35062
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Reviewed-by: Dario Lombardo <lomato@gmail.com>
2019-11-14 12:33:10 +00:00
Gerald Combs ba62446a6a cppcheck: Re-ignore asn1.
The asn1 directory was moved to epan/dissectors back in 2016.

Change-Id: Id22c99fa4e0cacf19ab0c5a6055e71abf94f6159
Reviewed-on: https://code.wireshark.org/review/35074
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-11-12 19:31:12 +00:00
Pascal Quantin 99effcada2 Windows: upgrade Npcap to 0.9984
While we are at it, let's deactivate by default the legacy loopback adapter installation

Change-Id: I4950e9dc6de8a2faeda272c03165a9f305862f6b
Reviewed-on: https://code.wireshark.org/review/35004
Petri-Dish: Pascal Quantin <pascal@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
2019-11-06 16:37:57 +00:00
Alexis La Goutte 86b0fe361c validate-clang-check (PD): Display also warning
Change-Id: Ie9f36ddbd95b5ebe94b9fc5e2a18ab12c1fb031f
Reviewed-on: https://code.wireshark.org/review/34903
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2019-11-02 11:46:47 +00:00
Pascal Quantin eb4e83d589 asn2wrs.py: fix parsing of integer unions with extension
When parsing the description
ExpectedActivityPeriod ::= INTEGER (1..30|40|50|60|80|100|120|150|180|181,...)
asn2wrs.py was generating some code where the has_extension flag was
wrongly set to false, leading to a decoding error.

Bug: 16145
Change-Id: I0d54994c0656f5b48f3dcd1864218c45a4ebc308
Reviewed-on: https://code.wireshark.org/review/34837
Petri-Dish: Pascal Quantin <pascal@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
2019-10-23 20:16:32 +00:00
Gerald Combs 4308ae3d47 tools: Add update-appdata.py
Add a script that fills in the <releases/> section of
wireshark.appdata.xml.

Change-Id: I643a8271f2bf1a5c2cd0be9930a6ca7c71935e42
Reviewed-on: https://code.wireshark.org/review/34824
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-10-22 17:09:41 +00:00
Guy Harris 9f374047ad We don't compile Qt, we just install a binary.
Change-Id: Ieeaa2b393775ae58782c0f2447b51fd068ffc185
Reviewed-on: https://code.wireshark.org/review/34763
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-10-13 04:26:36 +00:00
Joerg Mayer 0cadd7e4ed Update qt 5.12.1 -> 5.12.4 and update a comment (twice)
Change-Id: I2eab2f73305918a354b8b9b9c5616ef290a40284
Reviewed-on: https://code.wireshark.org/review/34733
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2019-10-08 15:36:52 +00:00
Joerg Mayer 723433f750 Update ASCIIDOCTOR to current version(s)
Change-Id: Ieb87169ffc7dae709954e2f361202cec88d3dedb
Reviewed-on: https://code.wireshark.org/review/34732
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2019-10-08 15:34:30 +00:00
Peter Wu b5d6c9922b sharkd_shell.py: add interactive debug shell for sharkd
Interactive shell for sharkd with some auto-completion, history, and
JSON beautification support. Quick and dirty, tested with Python 3.7.4
on Arch Linux.

Change-Id: I5dec1ac07230bfcbc3165a36b5c7f088ee65a8f7
Reviewed-on: https://code.wireshark.org/review/34583
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-10-02 22:05:29 +00:00
Anders Broman 41cf95c4eb win-setup: Use an environment variable to chose not to use 7zip.
Company security policies may make it impossible to use 7zip from a
powershell script. Use an environment variable to chose to use the built
in Expand-Archive instead.

Change-Id: I4fc914c089e25e9cfedf79aef14c42a54b44b845
Reviewed-on: https://code.wireshark.org/review/34601
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-09-24 10:46:47 +00:00
Peter Wu ceb2ee2e44 rpm: use python3 to fix CentOS 7 builds
CentOS 7 (1908) started including python3 (Python 3.6), see
https://wiki.centos.org/Manuals/ReleaseNotes/CentOS7.1908

Change-Id: I6418e7839f1119cf1152f445759e92acd4f39cc4
Reviewed-on: https://code.wireshark.org/review/34593
Reviewed-by: Dario Lombardo <lomato@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-09-23 08:50:10 +00:00
Gerald Combs a97c157d0d macos-setup: Add minizip.
Change-Id: I4f668e8a61e62f3c50ad9d39747c0d73b0196c55
Reviewed-on: https://code.wireshark.org/review/34556
Reviewed-by: Jim Young <jim.young.ws@gmail.com>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-09-19 18:25:11 +00:00
Gerald Combs 8428d8f899 macos-setup: Rename libtool* at configure time.
Pass --program-prefix=g to configure, similar to Homebrew's libtool
formula.

Change-Id: I556a0abd0e2715704ddaf4bb94bd5f22dd310d5a
Reviewed-on: https://code.wireshark.org/review/34560
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-09-18 21:52:11 +00:00
Alexis La Goutte 27ebed0a5c macos-setup: Update to libssh 0.9.0
Bug: 16032
Change-Id: Iaf9a58f76cef7906e00c1f3c3fecf51260b627a5
Reviewed-on: https://code.wireshark.org/review/34477
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-09-11 15:14:12 +00:00
Pascal Quantin 31abf81250 Windows: upgrade Npcap to 0.9983
Change-Id: I05a0eb274d8890711d47c95db1b925682baa63cd
Reviewed-on: https://code.wireshark.org/review/34457
Petri-Dish: Pascal Quantin <pascal@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
2019-09-05 22:03:15 +00:00
Dmitry Linikov 22fd28940a packet-ieee1722: Added TSCF and NTSCF control frames support
Only CAN, CAN_BRIEF and LIN messages supported.

Change-Id: Id79574bcdab9f1ec66390357dd5860c73f194ccc
Reviewed-on: https://code.wireshark.org/review/31765
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-08-22 10:32:36 +00:00
Piotr Smolinski ad94c4d459 Kafka: include zstd compression in Kafka message batches
Change-Id: I1d06486ccf7b174ee9aa621fa3d8acb8b3673777
Reviewed-on: https://code.wireshark.org/review/34222
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-08-20 13:50:45 +00:00
Gerald Combs a3c81d328f cppcheck: Make sure it's installed.
Change-Id: I1e33de118c8e022e63f4a2783927e05fe88c364c
Reviewed-on: https://code.wireshark.org/review/34305
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-08-16 19:16:55 +00:00
Pascal Quantin 3eea735cc1 Windows: upgrade Npcap to 0.9982, USBPcap to 1.5.3.0 and nghttp2 to 1.39.2
Change-Id: I9dcff1c6714c6bbe211997195ff78537c334fdbd
Reviewed-on: https://code.wireshark.org/review/34303
Petri-Dish: Pascal Quantin <pascal@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
2019-08-16 17:39:49 +00:00
Gerald Combs b48b1c0e80 macos-setup: Update nghttp2 to 1.39.2.
1.39.2 fixes CVE-2019-9511 and CVE-2019-9513.

Change-Id: Id8f8ed52769522671ffc80c90014cf3b4c6f38ec
Reviewed-on: https://code.wireshark.org/review/34287
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-08-14 21:39:26 +00:00
Gerald Combs 6193c3a5b4 cppcheck: Fix our target selection.
Change-Id: If0fdd7737150357026524a0884b938b809e1244f
Reviewed-on: https://code.wireshark.org/review/34277
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-08-13 22:34:16 +00:00
Peter Wu 86a35ac6a2 cmake: allow VCSVERSION to be overridden with VCSVERSION_OVERRIDE
The default VCSVERSION from make-version.pl is based on the "git
archive" information (for tarballs) or uses "git describe" to discover
the version. Distributors such as Debian who directly build from a Git
repository might want to include a deterministic value, therefore add a
new option to achieve this.

Change-Id: I5a39670519f4d846020d917b124fc4d548d00137
Reviewed-on: https://code.wireshark.org/review/34100
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-08-12 20:26:32 +00:00
Gerald Combs 9a1d7caac3 tools: Add oxipng to compress-pngs.sh.
Change-Id: I2dc6871fe2288d86bdfda1161afcc25200ded823
Reviewed-on: https://code.wireshark.org/review/34208
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-08-08 16:36:31 +00:00
Dario Lombardo b69f032d03 tools: add libnl to rpm-setup.
Add libnl-devel on RHEL.

Change-Id: I82a147ee6c67292d8e2571f91545ae5af5a5e8ff
Reviewed-on: https://code.wireshark.org/review/34191
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Dario Lombardo <lomato@gmail.com>
2019-08-08 08:59:52 +00:00
Juergen Kosel e7852aa3ba debian-setup.sh: Correct order of apt-get update and add_package
apt-get update must be called before calling add_package
otherwise available packages appear as unavailable.

Change-Id: Ie449ca9037950b82908f72a3951401cc0c6496d1
Signed-off-by: Juergen Kosel <juergen.kosel@gmx.de>
Reviewed-on: https://code.wireshark.org/review/34162
Reviewed-by: Dario Lombardo <lomato@gmail.com>
2019-08-01 19:52:08 +00:00
Dario Lombardo ecd731ca92 tools: add missing packages to bsd-setup.
Change-Id: I2d9272c5f320891420a7336d648e1ee23d2f20e8
Reviewed-on: https://code.wireshark.org/review/34128
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Dario Lombardo <lomato@gmail.com>
2019-07-29 21:28:55 +00:00
Dario Lombardo bcd19c9f86 tools: add brotli to alpine-setup.
Change-Id: Ica9c46e1fa75ad1bdc52fba9acda9ef4ecf4e9be
Reviewed-on: https://code.wireshark.org/review/34109
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-07-28 17:53:12 +00:00
Guy Harris 245086eb83 HTTPS In Still More Places, update more URLs.
Microsoft reshuffled their documentation - almost all of it moved from
msdn.microsoft.com to docs.microsoft.com.  Some blogs moved to
devblogs.microsoft.com; the comments *didn't* move, so in one case we go
to the Wayback Machine - the link isn't dead, but it formats horribly,
at least on my browser, but the archived version formats OK.

Use the Wayback Machine for some URLs, and update others.

Update the sections for MS-ADTS.

Point to the HTML versions of some RFCs and I-Ds.

Change-Id: I344b20f880de63f1ae2a4e3f9ff98af78a7fe139
Reviewed-on: https://code.wireshark.org/review/34101
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-07-27 22:56:35 +00:00
Guy Harris 5cf3fd03f1 HTTPS In More Places, update some URLs.
Change-Id: Ice2e1e2e4d94f6c9da7c651866cfa1a8ac4a31d8
Reviewed-on: https://code.wireshark.org/review/34096
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-07-27 07:55:36 +00:00
Guy Harris 20800366dd HTTPS (almost) everywhere.
Change all wireshark.org URLs to use https.

Fix some broken links while we're at it.

Change-Id: I161bf8eeca43b8027605acea666032da86f5ea1c
Reviewed-on: https://code.wireshark.org/review/34089
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-07-26 18:44:40 +00:00
Juergen Kosel 76e227bcef debian-setup.sh: Add package lsb-release
The package lsb-release is a build requirement.
Especially needed to build wireshark in a docker container based on
debian:stable.

This change is a prerequisite for the change discussed in
https://code.wireshark.org/review/#/c/34042

Change-Id: Ib8ec73c8bffcb8761ad5748882aa9418e8cd7948
Signed-off-by: Juergen Kosel <juergen.kosel@gmx.de>
Reviewed-on: https://code.wireshark.org/review/34071
Petri-Dish: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Roland Knall <rknall@gmail.com>
2019-07-25 18:02:30 +00:00
João Valverde 6e5ba74b31 Remove ABI compliance checker code.
It's broken, unmaintained, poorly implemented and obsoleted by saner
debug-info methods.

Note: To do the compliance check properly would require much more
extensive work to clearly define public and private interfaces (without
manual bookeeping of files or symbols either, of course, because who
would want that...).

Change-Id: Ib801f3c152ca2369f95ca1f4af4d37cd8cc7c47a
Reviewed-on: https://code.wireshark.org/review/33928
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: João Valverde <j@v6e.pt>
2019-07-21 15:54:41 +00:00