Commit graph

2387 commits

Author SHA1 Message Date
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
Roland Knall
390071ed0b Qt: Import Profile information
Allow easy import of profiles. Profiles must be stored inside
a zip file, with no additional hierarchy.

Change-Id: I0ae77460c20ef6b3e447906e671b0cefa6b9b032
Reviewed-on: https://code.wireshark.org/review/33881
Petri-Dish: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Roland Knall <rknall@gmail.com>
2019-07-17 18:25:11 +00:00
Yannik Enss
3697dd4f5f idl2wrs: clean up and add python3 compatibility
Clean up the python scripts using PEP-8 as a guide, with exceptions
made where necessary.
Includes:
 - Move comments to docstrings
 - Remove unnecessary whitespace
 - Remove brackets from if statements where this improves readability
 - Change the debug print statements to output comments
 - Remove semicolons
 - Prefix debug output with '//'
 - Break long lines

Python 3 compatibility changes are mostly converting print statements
and moving away from the string module in favor of `str` methods.
By including the "future" import, compatibility with python 2 is
maintained.

The changes were tested using both omniORB 4.2.2/Python 3.6 and
omniORB 4.1.7/Python 2.7

Change-Id: I8126a49b2fde13982d34e462fced16b9d7b88306
Reviewed-on: https://code.wireshark.org/review/33850
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-07-06 17:52:42 +00:00
Pascal Quantin
97d47139bc Windows: upgrade USBPcap to 1.5.2.0
Change-Id: I06b7e507277af2c8cdf76dfeaf0b5347a56a0eae
Reviewed-on: https://code.wireshark.org/review/33833
Petri-Dish: Pascal Quantin <pascal@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
2019-07-03 20:56:30 +00:00
Pascal Quantin
ddfb6e3901 Windows: upgrade USBPcap to 1.5.1.0
Change-Id: Id376763c07ba97dc7105f7265a6ebb3d30a9adbf
Reviewed-on: https://code.wireshark.org/review/33824
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
Petri-Dish: Pascal Quantin <pascal@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-07-03 03:49:08 +00:00
Jim Young
93079941f1 macos-setup.sh: Allow support for QT_VERSION=5.13.0
The macos-setup.sh script does some tests against the major, minor and
micro values of the requested Qt version.  Add 13 as an allowed minor
value.

Change-Id: Ic0ac7af82ce1fb0cddc8f86d8f6bdae43c2edac6
Reviewed-on: https://code.wireshark.org/review/33786
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-07-01 01:35:09 +00:00
Peter Wu
5d515bd0f3 make-version: remove defunct --git-description option
This option always writes "1" when supplied because of a missing "=s" in
the argument specification. Aside from that, the regex would produce the
wrong output for tagged releases. Finally, this command line approach
would never have worked since version.h is always overwritten by CMake.

Change-Id: I83a4bc3c48a41d566bf70991d2ab181b85071488
Reviewed-on: https://code.wireshark.org/review/33711
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-06-24 08:50:30 +00:00
Peter Wu
7dfcb4425a asn2wrs: use system lex and yacc from ply if available
Tested with python-ply 3.11 and Python 3.7.3 on Arch Linux using the
'ninja asn1' command.

Bundling lex.py and yacc.py is one distribution method suggested by PLY
upstream (https://www.dabeaz.com/ply/README.txt), but since it is also
available in many Linux distributions, we could potentially remove it in
the future. Windows developers can install it through pip if needed.

Change-Id: I9c847072916ee33da49994820b435ec1d7110303
Reviewed-on: https://code.wireshark.org/review/33708
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-06-23 17:31:15 +00:00
Gerald Combs
7d3fffc3f2 Tools: Add a "last n commits" option to cppcheck.sh.
Add a `-l n` option which will check the .c and .cpp files from the last
[n] commits.

Fix some shellcheck warnings.

Change-Id: I8185d6c6c5b08576315b47847795d210d47b042e
Reviewed-on: https://code.wireshark.org/review/33646
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-06-19 03:20:32 +00:00
Pascal Quantin
6b20a4f2d6 Windows: upgrade Npcap to 0.996 and USBPcap to 1.5.0.0
Change-Id: Ie6590e1a31a5aaa6e96f6f718991cc42a1e40d8a
Reviewed-on: https://code.wireshark.org/review/33639
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
Petri-Dish: Pascal Quantin <pascal@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-06-18 06:20:10 +00:00
Dario Lombardo
24138a0a74 tools: add speex to rpm-setup.
Change-Id: Ie430eab506d1311cc8bf8f995f72489f4a990aea
Reviewed-on: https://code.wireshark.org/review/33593
Reviewed-by: Dario Lombardo <lomato@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-06-14 13:37:27 +00:00
João Valverde
63af1da7e7 Kill libwscodecs plugin library, just use plugins
Change-Id: I085d04840acb53b0b7681787429a2b4e10547cd5
Reviewed-on: https://code.wireshark.org/review/33068
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-06-11 20:59:39 +00:00
Gerald Combs
e1a57c61f9 Sysdig event updates.
Convert generate-sysdig-event.py to Python 3. Update it to fetch from
the current version of Sysdig (0.26.1). Add logic to work around
mismatched parameter counts and mismatched types and formats.

The following warnings were generated:

WARNING: Forcing semget INT32 format to DEC. Params: [('key', 'INT32', 'HEX'), ('nsems', 'INT32', 'DEC'), ('semflg', 'FLAGS32', 'HEX')]
WARNING: Forcing notification STRING format to NONE. Params: [('id', 'CHARBUF', 'DEC'), ('desc', 'CHARBUF', 'NA')]
WARNING: Forcing infra STRING format to NONE. Params: [('source', 'CHARBUF', 'DEC'), ('name', 'CHARBUF', 'NA'), ('description', 'CHARBUF', 'NA'), ('scope', 'CHARBUF', 'NA')]
WARNING: seccomp: found 2 parameters. Expected 1. Params: [('op', 'UINT64', 'DEC'), ('flags', 'UINT64', 'HEX')]

Bug: 15826
Change-Id: I5f8a7530f1003270cbbcb1f7dfd86f7b63066bba
Reviewed-on: https://code.wireshark.org/review/33513
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-06-09 04:53:31 +00:00
Gerald Combs
20568aa8b9 tools: Switch some scripts exclusively to Python 3.
Convert asn2wrs.py to Python 3 via `2to3 --print-function --write` along
with additional tweaks.

Convert asn2deb and idl2deb using `2to3 --write`.

Work around what appears to be a Debian packaging bug:
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=818609

Change-Id: I5cc246f7162c2d713673955c10c092e1b91adf82
Reviewed-on: https://code.wireshark.org/review/33504
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-06-09 04:53:08 +00:00
Pascal Quantin
c603fac072 Windows: upgrade USBPcap to 1.4.1.0
Change-Id: I1a9d97a58201dadc6c50a15d1518053c980bd62f
Reviewed-on: https://code.wireshark.org/review/33514
Petri-Dish: Pascal Quantin <pascal@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
2019-06-07 05:33:46 +00:00
Yannik Enss
4ebf72d232 idl2wrs: extend aggressive mode
Add a "_loop" header field also when processing attributes

Change-Id: I109b34d8f6cb8fbf3c38dc09f58b740b4d96436b
Reviewed-on: https://code.wireshark.org/review/33460
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2019-06-06 08:04:57 +00:00
Yannik Enss
443df93896 idl2wrs: fix 'undeclared identifier' error
the 'x_octetx' variables were removed a few years back, replace them with get_CDR_xxx()

Change-Id: I8cf3410d8a152c834e7019f7d1d80de3798530c3
Reviewed-on: https://code.wireshark.org/review/33457
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-06-05 17:02:21 +00:00
Yannik Enss
3f3337b2ca idl2wrs: add aggressive mode
add a mode to ignore a few optimisations in favor of working output

Change-Id: I875cec5a80e9449e9fd954d4ff6a21e5b128db5e
Reviewed-on: https://code.wireshark.org/review/33459
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-06-05 16:51:50 +00:00
Yannik Enss
1c09af410d idl2wrs: fix recursion loop
wireshark_gen goes into an infinite recursion if it encounters a multi-level
alias, this is prevented

Change-Id: Icec678fb326b7c14344dc6df51015dad980587a9
Reviewed-on: https://code.wireshark.org/review/33458
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-06-05 16:48:45 +00:00
Yannik Enss
54db60f4e5 idl2wrs: add debug command line parameter
convert the "DEBUG" constant to a command line parameter

Change-Id: I7f873d85fa053cb9298bd03444125d0160ef4640
Reviewed-on: https://code.wireshark.org/review/33456
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-06-05 16:35:00 +00:00
Pascal Quantin
76785a12b3 Windows: upgrade USBPcap to 1.4.0.0
Change-Id: I79b8ece52e89e4e646954e965649b0cf5ae69a6a
Reviewed-on: https://code.wireshark.org/review/33379
Petri-Dish: Pascal Quantin <pascal@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
2019-05-26 21:19:52 +00:00
Dario Lombardo
aab172fbda tools: add alpine-setup script.
As for debian/rpm/bsd add a script that helps the user to setup
a development environment for alpine.

Tested on s390x alpine.

Change-Id: Ib4e002385ce748b764ae7ff51f39a9cfce61590c
Reviewed-on: https://code.wireshark.org/review/33268
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-05-21 11:01:11 +00:00
Dario Lombardo
1a7b83c20f tools: fix rpm-setup script.
Some packages are missing, others are in the wrong place.

Change-Id: I396716e85e2106f527b7ff7ad5ee7a519061cbdd
Reviewed-on: https://code.wireshark.org/review/33264
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-05-20 04:17:39 +00:00
Guy Harris
038470b597 Clean up some signed vs. unsigned warnings.
Octet arrays are octets of guint8s, not gchars/chars.

Make some strings arrays of chars/gchars, not guint8s; this needs more
thought (throughout Wireshark).

Offsets into tvbuffs are signed, not unsigned.  (This is to support
negative offsets, which are offsets from the end of the tvbuff.  We
might want to remove that and go with unsigned offsets, and have the
few, if any, places where that feature is used explicitly calculate the
offset from the end based on the tvbuff's length; most if not all of our
handling of trailers/end-of-packet FCSes/etc. does so, and makes sure it
handles the case where the end-of-packet information isn't present, to
better report errors and dissect the stuff before it.)

Change-Id: Ia46ed3fc7c2d8ac97cd14824d521cbc461fb7f45
Reviewed-on: https://code.wireshark.org/review/33239
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-05-17 02:55:59 +00:00
Guy Harris
32a014a4f1 Update the warning-suppression statements in idl2wrs.
Update them to use ws_diag_control.h and ws_compiler_tests.h, and the
DIAG_OFF() macros therein.

Regenerate the CORBA dissectors.

Change-Id: I26f0add0ec8dd920bfe80571b4141c1b0e2f0640
Reviewed-on: https://code.wireshark.org/review/33238
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-05-17 01:41:20 +00:00
Peter Wu
a68627ae96 version: include version information for tarballs from git
Embed the git commit hash as well as the tag information for tarballs
produced by 'git archive' (this includes the Github tarball). Example:

    TShark (Wireshark) 3.0.1 (Git commit ea351cd80516)

Note that the embedded git ref names can include branch information, see
for example `git log -n1 -s --format=%D v3.0.1`:

    tag: wireshark-3.0.1, tag: v3.0.1
    HEAD -> bug/15544, tag: v99.99
    HEAD, origin/master, origin/HEAD, master

Thus, when creating release tarballs, I would recommend using the above
command to see whether unnecessary branch information is present. If so,
create a new post-release commit first on the same branch. This way, the
release tarballs should be reproducible.

While at it, increase the commit abbreviation length from 8 to 12.
Currently git describe abbreviates to 10 by default. The default length
is at minimum 7 and is dependent on the number of objects:

    git count-objects -v | perl -lne 'print int(log($1)/log(2)/2)+1 if /^in-pack: (\d+)/'

Bug: 15544
Change-Id: Ifd1ed636b69f7687a7272775686f51387040a596
Reviewed-on: https://code.wireshark.org/review/33214
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Dario Lombardo <lomato@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2019-05-16 17:31:50 +00:00
Greg Morris
715f46b768 Updates to NCP protocol dissector
Add NCP 98
Fix NDSrequestprotocolflags not being captured on request so that reply
would offset correctly with CRC flag.

Change-Id: Ie45a1017326dd38393baf3f005f3ec9195438565
Reviewed-on: https://code.wireshark.org/review/33146
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-05-16 12:47:47 +00:00
Dario Lombardo
23744c9be7 tools: add speexdsp to debian-setup.
Internal support of libspeexdsp has been removed in favour of system
one in g186f985793. Add it to the list of optional debian packages.

Change-Id: Ie15c367c2a113349614351da8bbcc26ef6353028
Reviewed-on: https://code.wireshark.org/review/33180
Reviewed-by: João Valverde <j@v6e.pt>
Reviewed-by: Dario Lombardo <lomato@gmail.com>
2019-05-13 05:44:04 +00:00
Pascal Quantin
3586da308f Windows: upgrade Npcap to 0.995
Change-Id: I9e1bea5daf8aa49e4de4efa070819da8d3844fc1
Reviewed-on: https://code.wireshark.org/review/33156
Petri-Dish: Pascal Quantin <pascal@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
2019-05-11 13:17:00 +00:00
Pascal Quantin
fd2f439e33 Revert "Windows: upgrade Npcap to 0.994"
This reverts commit 2f82518f72.

Npcap 0.994 introduced a crash that will be fixed in next version:
https://github.com/nmap/nmap/issues/1591

Change-Id: Iff9a29e6d28c57774844d25f2990e0f8c214bf75
Reviewed-on: https://code.wireshark.org/review/33143
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
2019-05-10 05:38:32 +00:00
Guy Harris
2e3dcd479e Fix dissection of gatewayed/bridged LLAP packets.
EtherTalk and TokenTalk frames use LLC/SNAP headers with an OUI of
08:00:07 and a PID of 0x809B.

Frames with an Ethertype of 0x809B - either as the Ethertype field of an
Ethernet frame or as the PID, in combination of an OUI of 00:00:00, of
an LLC/SNAP frame - have an LLAP frame, complete with an LLAP header, as
the payload.

Don't treat 08:00:07 as a special case - register it as an OUI and give
it a dissector table, and register the DDP dissector in that dissector
table with ETHERTYPE_ATALK.  Register the LLAP dissector in the
"ethertype" table with the Ethertype ETHERTYPE_ATALK.

This means we now have two separate LLC+SNAP PID tables for Apple; name
them appropriately.

That also means we need to add packet-atalk.c to the list of files
allowed to add "llc." named fields.

Change-Id: I00bafd692f83f73bd347628cb9e950863c26a2b7
Reviewed-on: https://code.wireshark.org/review/33125
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-05-09 04:27:52 +00:00
Pascal Quantin
2f82518f72 Windows: upgrade Npcap to 0.994
Change-Id: I3b64041723a72600a9ef5a6fb9d22b0b30578cfc
Reviewed-on: https://code.wireshark.org/review/33114
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
Petri-Dish: Pascal Quantin <pascal@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-05-08 16:04:38 +00:00
Anders Broman
85773a21a9 OER: Dissect Boolean and IA5String types.
Change-Id: I12f1f605807809b94a7e51a5be2a4c3588f2d16f
Reviewed-on: https://code.wireshark.org/review/33106
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-05-08 12:50:59 +00:00