git.samba.org - metze/wireshark/wip.git/log

netlink-netfilter: add NFQUEUE dissection

Update fields to Linux 4.7, add dissection for most important NFQUEUE
structures and attributes. The shared Netfilter header is also dissected
here (except when the NFLOG subdissector is called). Based on the source
code of Linux and libnl, it seems that most (all?) fields are big
endian.

Tested with netlink.pcap and netlink-nflog.pcap from the SampleCaptures
wiki page.

Change-Id: I93bb8e528fdd2575acdae31a17b9b62aaa90fdbc
Reviewed-on: https://code.wireshark.org/review/16933
Reviewed-by: Anders Broman <a.broman58@gmail.com>

gtk: add assert (CID 1159169).

Change-Id: I365bdbc49fe50b6442fd01f56cc7ffdda972585c
Reviewed-on: https://code.wireshark.org/review/16949
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>

netlink: dissect errors and more flags, improve display and help

Print "Protocol-specific" instead of "Unknown (0x0016)" for the type
since its interpretation depend on the subprotocol.

Dissect struct nlmsgerr (refactor and reuse the header dissection code).
Dissect Dump interrupted and Dump filtered flags.

Adjust field descriptions and value_string based on the netlink(7)
manual and linux/netlink.h. Display Flags as hex instead of decimal.
Expanded inline tabs, renamed netlink.hdr_flags.match_all to
netlink.hdr_flags.match for consistency.

Change-Id: If2b5c8d2b68fd94e70d1d8b98e63171b42b0d65c
Reviewed-on: https://code.wireshark.org/review/16932
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>

Qt: add initializers (CID 1328485).

Change-Id: I9135dabc3f656ac17f6269221f795a5dda7552af
Reviewed-on: https://code.wireshark.org/review/16946
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>

[Automatic update for 2016-08-07]

Update manuf, services enterprise-numbers, translations, and other items.

Change-Id: I538e387ddbd546f62fd73381fc068b09dad61822
Reviewed-on: https://code.wireshark.org/review/16941
Reviewed-by: Gerald Combs <gerald@wireshark.org>

prefs: fix crash with -o column.foo:x

The gui.column module is somehow special, it has no name since it is
part of the gui module. This causes a crash when trying to invoke
`strcmp(module->name /* NULL */, "mgcp")`.

Always look up prefs inside gui_column_module when the given prefs
module is "column" instead of matching two specific names.

Change-Id: I47e354d11b6fd01818b0627a249b506a8f9510cc
Reviewed-on: https://code.wireshark.org/review/16937
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>

netlink-route: decode more items (sync with Linux 4.7)

Based on inspection of the Linux 4.7 source code. Replaced tabs by
spaces in enums and value_strings for consistency.

Change-Id: I78b5de53b53dc3f2a7c807a72d8d94880f6406d5
Reviewed-on: https://code.wireshark.org/review/16931
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>

Allow up to 64-bit values to use BASE_RANGE_STRING.

Change-Id: Iea69b5ef533b9b524a624b96bf82e178fd428ce9
Reviewed-on: https://code.wireshark.org/review/16934
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>

Avoid colliding with the (old) UNIX stime() system call.

Rename "stime" to "sys_time", and, for consistency, do the same with
"utime". This failed when I tried a build on an Ubuntu 12.04 LTS
machine.

Change-Id: Ib955b723506346aa742db0de4d26dc157bcd4fc8
Reviewed-on: https://code.wireshark.org/review/16935
Reviewed-by: Guy Harris <guy@alum.mit.edu>

checklicenses.py: Remove some boilerplate from upstream

Change-Id: If8a1537fe5ad0c5decaf2facf6fd0c43b32ffe70
Reviewed-on: https://code.wireshark.org/review/16930
Reviewed-by: João Valverde <j@v6e.pt>

Add licensecheck.pl to our /tools directory and use it

Source: https://anonscm.debian.org/cgit/collab-maint/devscripts.git/plain/scripts/licensecheck.pl?h=v2.16.2

Removed regex to check files without an extension.

Change-Id: Icf98d0da2d201731da7134799ead0d2dc5c3fc39
Reviewed-on: https://code.wireshark.org/review/16913
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: João Valverde <j@v6e.pt>

ios15765: tree is used, remove the _U_

Change-Id: Id7fb231fe820308641c09add22dde131757b9e92
Reviewed-on: https://code.wireshark.org/review/16929
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>

tools/pidl: support HRESULT as return code in wireshark autogenerated dissectors.

Guenther

Change-Id: I68b7c579c5a519e429d2f4c2b3f63247e02f24e3
Signed-off-by: Günther Deschner <gd@samba.org>
Reviewed-on: https://code.wireshark.org/review/16718
Reviewed-by: Michael Mann <mmann78@netscape.net>

tools/pidl: Keep case from fieldnames.

Change-Id: I5626cfa0487cc88eb65cc349c05ae1762bc953f4
Signed-off-by: Guenther Deschner <gd@samba.org>
Reviewed-on: https://code.wireshark.org/review/16720
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>

Add support for Windows HRESULT error codes for DCE/RPC

Change-Id: I013549978743740b04b89b5592e63edae5ff3fe4
Signed-off-by: Günther Deschner <gd@samba.org>
Reviewed-on: https://code.wireshark.org/review/16717
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>

test.sh: Don't abort on failed test

This behavior severely limits the usefulness of the test suite. An option
to configure it would still be nice.

Change-Id: I2bc96a043cc4ec76f334a3bfe48967703ef1be5e
Reviewed-on: https://code.wireshark.org/review/16890
Reviewed-by: João Valverde <j@v6e.pt>

Remove old Qt code.

Our minimum version has been 4.7 for a while. Remove dead
QT_VERSION_CHECK code.

Change-Id: Ia003c1aa4275eefdda707975774d886643ff1538
Reviewed-on: https://code.wireshark.org/review/16888
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>

CMake: Look for vcredist_x??.exe in more places.

Look for the redistributable installer in the project library directory
before %VCINSTALLDIR%. This lets us ship a specific version of the
redistributable.

Change-Id: I70e5aa90ac5addba5355d1964aeb50e277d1a8d4
Ping-Bug: 12712
Reviewed-on: https://code.wireshark.org/review/16922
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>

extcap: move defines from sshdump & ciscodump to ssh-base.

Change-Id: I51769e2427b0119aefe57ebcc08406434ffbfead
Reviewed-on: https://code.wireshark.org/review/16918
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>

doc: fix typos.

Change-Id: Id34affcb33c00e224dafbccc347b1d91b9e74c8d
Reviewed-on: https://code.wireshark.org/review/16914
Reviewed-by: Michael Mann <mmann78@netscape.net>

Update FSF address.

Change-Id: I2a36a833f00f4acda253e5741c96c519588aa046
Reviewed-on: https://code.wireshark.org/review/16919
Reviewed-by: Guy Harris <guy@alum.mit.edu>

Fix FSF address.

Change-Id: Icf473af9487e60003813435f18551225224c6d58
Reviewed-on: https://code.wireshark.org/review/16915
Reviewed-by: Guy Harris <guy@alum.mit.edu>

docbook: fix typos.

Change-Id: If94a1427d91a5de2f5f2308be454479e6b4d8d5a
Reviewed-on: https://code.wireshark.org/review/16900
Reviewed-by: Anders Broman <a.broman58@gmail.com>

Fix copyright.

I'd just copied and pasted the copyright notice from test/test.sh; Ulf
wrote test/test.sh, but didn't write test/run_and_catch_crashes - I did,
but, hey, might as well give the copyright to Gerald. Fix the date as
well.

Change-Id: Id307f354289ca72931dd83f472d879d733618e3c
Reviewed-on: https://code.wireshark.org/review/16910
Reviewed-by: Guy Harris <guy@alum.mit.edu>

Add copyright notices.

Change-Id: I481968f154008d62c124ca6f71d6cc0114c293c1
Reviewed-on: https://code.wireshark.org/review/16907
Reviewed-by: Guy Harris <guy@alum.mit.edu>

Put the usual copyright notice on test/run_and_catch_crashes.

Change-Id: I397e5483baa79b5bf043d746aabab6c54499fabc
Reviewed-on: https://code.wireshark.org/review/16903
Reviewed-by: Guy Harris <guy@alum.mit.edu>

checklicenses.py: Whitelist some plaintext files without license requirements

Change-Id: I029ef1d52ac6edd44c0bac41adb86361ddd94272
Reviewed-on: https://code.wireshark.org/review/16898
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>

Add PI_DEPRECATED expert info group

Change-Id: Ibc43b1976d5827e8c40252a5200852fbcd00b70c
Reviewed-on: https://code.wireshark.org/review/16763
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: João Valverde <j@v6e.pt>

gsm_abis_om2000: Dissect "Reason Code" and "Result Code"

Change-Id: Ie2495b6333b021de53c674ca8bdad0712228a7c1
Reviewed-on: https://code.wireshark.org/review/16820
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>

gsm_abis_om2000: Decode "Attribute ID" Information Element

The "Attribute ID" IE is used by the RBS to indicate which particular
setting has caused it to reject a given request by the BSC.

Change-Id: I05621831f70fb53b5b752afceed9337f6cd0edb7
Reviewed-on: https://code.wireshark.org/review/16819
Reviewed-by: Michael Mann <mmann78@netscape.net>

[Diameter] Dissect RX Feature list.

Change-Id: I64fc582bb9330402c18aeeadea52c968032ccb2c
Reviewed-on: https://code.wireshark.org/review/16895
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>

Add UDS dissector

Change-Id: Icc9b6c6bcaac1f3056fa83a4ae9ef66e1537b1a5
Reviewed-on: https://code.wireshark.org/review/16492
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>

pkix1implicit: Make sure distribution takes in all the files.

By including ../Makefile.inc (like all other ASN1 based dissectors)
assure the symbols are setup correctly for all make related actions,
including packaging the files for distribution.

Bug: 12703
Change-Id: Ia7279fcc30bb08e749f35b6d893136b053f3544c
Reviewed-on: https://code.wireshark.org/review/16893
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>

logcat-text: add cleanup function.

Found by valgrind.

==23399== 209 (40 direct, 169 indirect) bytes in 1 blocks are definitely lost in loss record 2,431 of 2,696
==23399==    at 0x4C2FB55: calloc (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so)
==23399==    by 0xAAA2780: g_malloc0 (in /lib/x86_64-linux-gnu/libglib-2.0.so.0.4800.1)
==23399==    by 0xAAB0760: g_regex_new (in /lib/x86_64-linux-gnu/libglib-2.0.so.0.4800.1)
==23399==    by 0x6B03162: proto_register_logcat_text (packet-logcat-text.c:373)
==23399==    by 0x71BA16D: register_all_protocols (register.c:2881)
==23399==    by 0x7296E67: proto_init (proto.c:529)
==23399==    by 0x7272A76: epan_init (epan.c:128)
==23399==    by 0x1160F2: main (tshark.c:804)

Change-Id: Ia47a4371a62eaadcdc8613d35030792d57e7f9dc
Reviewed-on: https://code.wireshark.org/review/16881
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>

kafka: remove unused assignment.

Found by valgrind:

==21035== 12 bytes in 1 blocks are definitely lost in loss record 279 of 2,696
==21035==    at 0x4C2DB8F: malloc (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so)
==21035==    by 0xAAA2728: g_malloc (in /lib/x86_64-linux-gnu/libglib-2.0.so.0.4800.1)
==21035==    by 0x72A361F: range_convert_str_work.part.0 (range.c:109)
==21035==    by 0x6AACBEC: proto_register_kafka (packet-kafka.c:1459)
==21035==    by 0x71BA055: register_all_protocols (register.c:2769)
==21035==    by 0x7296E67: proto_init (proto.c:529)
==21035==    by 0x7272A76: epan_init (epan.c:128)
==21035==    by 0x1160F2: main (tshark.c:804)
==21035==

Change-Id: I3249925acd3ed26d40be992fd228447d1b381b66
Reviewed-on: https://code.wireshark.org/review/16880
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Evan Huus <eapache@gmail.com>

asn2wrs: put back parsetab.py file in ASN.1 source folder

Otherwise it breaks multi threaded compilation.
Follow-up of gd04be01

Bug: 12621
Change-Id: I2f6b7d6ca85a1cf5a6713c2b36c823a520d3bf3d
Reviewed-on: https://code.wireshark.org/review/16886
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>

Remove missed header

Follow up to d21295f9a6da65420254afba0bb8a64cb4155947.

Change-Id: I971e2bb44d8d1b2977b6fcf6e4e492e45038b85e
Reviewed-on: https://code.wireshark.org/review/16889
Reviewed-by: João Valverde <j@v6e.pt>

Qt: fix a NULL pointer dereference in extcap_argument_multiselect.cpp

Guard treeView dereference by a cehck on viewModel (as it is done elsewhere in
the file, both are allocated at the same time).
This can happen for example when USBPcap lists a USB Hub with no devices connected.

Change-Id: Iee412b8c95539e9e3d65706c14f62194cafcaffc
Reviewed-on: https://code.wireshark.org/review/16885
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Roland Knall <rknall@gmail.com>

Bump GLib minimum required version to 2.22.0

Change-Id: I0ab85be8090f234f9ca10914063f97f13c894413
Reviewed-on: https://code.wireshark.org/review/16879
Petri-Dish: João Valverde <j@v6e.pt>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: João Valverde <j@v6e.pt>

openSAFETY: Remove SCM UDID check

This leads to too many false-negatives in certain traces

Change-Id: Ia081dc802b6f55926beec2383a864173cae6eb51
Reviewed-on: https://code.wireshark.org/review/16883
Reviewed-by: Roland Knall <rknall@gmail.com>
Petri-Dish: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>

extcap: restyle the help function.

Change-Id: Ia742dffb1fd4cd5780b8ba44f7064d1874e473da
Reviewed-on: https://code.wireshark.org/review/16842
Petri-Dish: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Roland Knall <rknall@gmail.com>

[BTLE-Nordic] Set pinfo->p2p_dir as seen from "Master".

Change-Id: I12ad3a9b092e35a3418a11ec4d17cce157f320b6
Reviewed-on: https://code.wireshark.org/review/16882
Reviewed-by: Anders Broman <a.broman58@gmail.com>

extcap: prevent registration of wrong version.

This prevents the user to run

extcap_base_set_util_info(extcap, "1", NULL, "0", NULL);

that would result in version = 1.0.

Change-Id: I67532459c852bdceb16693553e90da88a1043435
Reviewed-on: https://code.wireshark.org/review/16858
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Roland Knall <rknall@gmail.com>

extcap: preference name must only contain lower case ASCII, numbers, dots or underscores

This chage set restores the normalization that was done before g485bc45.
Without it, USBPcap extacp utility triggers a crash.

Change-Id: Id960db186888452ec3d04df1ee48dcc3899e8951
Reviewed-on: https://code.wireshark.org/review/16871
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Roland Knall <rknall@gmail.com>

extcap: restyle the output subsystem.

Change-Id: I3e0674751eb97bf30ae6d70c4e51f347d63b1697
Reviewed-on: https://code.wireshark.org/review/16849
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Roland Knall <rknall@gmail.com>

[GSM A RR] Some updates from rel 13,

Change-Id: Ib847ec3d019b3a8ba0f8e5502fcbe80aa47c266b
Reviewed-on: https://code.wireshark.org/review/16873
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>

Ply parser updated to 3.8 from www.dabeaz.com/ply/

The Ubuntu packaged Ply 3.7 with Ubuntu 16.04's Python makes
ASN.1 based dissector generation fail.

Ply's API changed after 3.5 and the small change to asn2wrs.py
adapts to that.
The commit breaking the API in Ply's repository is the following:

commit af651673ba6117a0a5405055a92170fffd028106
Author: David Beazley <dave@dabeaz.com>
Date: Tue Apr 21 16:31:32 2015 -0500

Added optional support for defaulted states

Change-Id: I1db33fdcccf7c39ecdb0e435a5ea9183362471ad
Bug: 12621
Reviewed-on: https://code.wireshark.org/review/16864
Reviewed-by: Balint Reczey <balint@balintreczey.hu>
Petri-Dish: Balint Reczey <balint@balintreczey.hu>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: João Valverde <j@v6e.pt>
Tested-by: João Valverde <j@v6e.pt>

Add ISO15765 dissector

Bug: 12657
Change-Id: Ib0d9e18b31c1252f63025b10f7a67de6a5e4462c
Reviewed-on: https://code.wireshark.org/review/16491
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>

Report the pathname of the color filter file in "Could not compile" messages.

This also fixes some cases where we wouldn't report the path in a read
error message, as we'd already freed the path up and set the path string
pointer to null.

Change-Id: Ia0e1ca0bf4880075bfa1957b0778a177de1a824f
Reviewed-on: https://code.wireshark.org/review/16868
Reviewed-by: Guy Harris <guy@alum.mit.edu>

SSL utils: Add proper check while getting bag type

Implementing proper return value check, as done for other gnutls function
calls, catches (unlikely) errors and allows C++ compatible build.

Change-Id: Idf5bd3fe6e68d006a469fe72663dea1c7e2d17f7
Reviewed-on: https://code.wireshark.org/review/16865
Reviewed-by: Guy Harris <guy@alum.mit.edu>

Text2Pcap doc update

Minor docs update

Change-Id: Iea44e4963aab75db1d875d27af41e4f38ff74e2d
Reviewed-on: https://code.wireshark.org/review/16859
Reviewed-by: Anders Broman <a.broman58@gmail.com>

Update USBPcap installer packaged in our Windows installer

This new version contains kernel drivers with an EV certificate that is cross-signed
by Microsoft as it will become mandatory.
See https://blogs.msdn.microsoft.com/windows_hardware_certification/2016/07/26/driver-signing-changes-in-windows-10-version-1607/
for details.

Change-Id: I76bb1005ea540f39dca8874abb88d71a3ad53625
Reviewed-on: https://code.wireshark.org/review/16862
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>

[BSSGP] Update messages and IEs.

Change-Id: Ida8c59b19213f2a2ab3448d1cbeddd98f06ba4b9
Reviewed-on: https://code.wireshark.org/review/16857
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>

Text2Pcap docs update

Minor update to docs

Change-Id: If9464f00d69bb9a8bb5638f3bb0d0f73a56aad50
Reviewed-on: https://code.wireshark.org/review/16856
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>

Set correct length for Req_Seq_Nr field

Change-Id: Iec228708423743e0268305da6ed606d464d1e1ea
Reviewed-on: https://code.wireshark.org/review/16854
Reviewed-by: Anders Broman <a.broman58@gmail.com>

openSAFETY: Add two checks for scm udid validity

This is being done, to prevent false-positives which can
not be filtered out using the heuristics, but have to be
caught using additional check measurements

Change-Id: I2ff2c97decf8a93d43f8f5b54e4d147552970b3f
Reviewed-on: https://code.wireshark.org/review/16843
Petri-Dish: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Roland Knall <rknall@gmail.com>

Don't snprintf() into a string with one of the arguments being the same string.

That doesn't work - you could be writing into the string from which
you're reading.

Bug: 12700
Change-Id: I70f3ce6048dea582ec5e08c24c99e9a553b352df
Reviewed-on: https://code.wireshark.org/review/16850
Reviewed-by: Guy Harris <guy@alum.mit.edu>

Qt: remove dead code.

Fix CID: 1362828, 1362829, 1362889.
Change-Id: I15045c32e96896323ae4d788b7891b2608a0c102
Reviewed-on: https://code.wireshark.org/review/16833
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>

[BTLE] Change address from unknown_0x... to master or slave.

Change-Id: I571a2f6f96c37e608201092e7ea7f53862b8d2ad
Reviewed-on: https://code.wireshark.org/review/16844
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>

[BLE] Make the Nordic BLE dissector fill in the btle_context_t struct.

Change-Id: I14e62126d022dde10dcce2d7e974def0dc664b20
Reviewed-on: https://code.wireshark.org/review/16840
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>

Fix compilation on FreeBSD.

Includes are needed for using macros like WIFEXITED.

Change-Id: Ia09ca58eeab2d151a756d285b0aeb55141c4d24a
Reviewed-on: https://code.wireshark.org/review/16841
Reviewed-by: Michael Tüxen <tuexen@wireshark.org>

Bugfix endian issues with 802.11 FCS

Rather than trying to swap fields to be big-endian, just make everything
little-endian.

Bug: 12697
Change-Id: I07e7fd651c4a32dba764d111b34acdf32958c195
Reviewed-on: https://code.wireshark.org/review/16836
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>

CANopen: Added some improvements to CANopen emergency dissector

-Added description to Emergency error code
-Added bitmask dissector to Emergency register
-Added descriptions to object dictionary SDO related index
All these changes were found inside the CiA CANopen norm, and were useful
in my work while debugging CANopen frames

Change-Id: I76bc1eab9f75fc242eaf3200af81593f65570658
Reviewed-on: https://code.wireshark.org/review/16823
Reviewed-by: João Valverde <j@v6e.pt>
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>

extcap: Remove g_spawn_check_exit_status

This function is not supported in the min GLIB version, therefore
the code is to be removed

Change-Id: Ie39170bfc0662e5a477cbc45d7eadebcf2c70d4e
Reviewed-on: https://code.wireshark.org/review/16827
Petri-Dish: Roland Knall <rknall@gmail.com>
Reviewed-by: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Roland Knall <rknall@gmail.com>

RPM: Download from https://www.wireshark.org/.

Download from https://www.wireshark.org/ instead of
https://wireshark.org/. This conforms to README.packaging and avoids a
redirect.

Change-Id: I0ed63f446bc16cbd501444c8743809672c4a084b
Reviewed-on: https://code.wireshark.org/review/16829
Reviewed-by: Anders Broman <a.broman58@gmail.com>

extcap: add null check (CID 1364683).

Change-Id: I1d81d6f043fa695ed507cf733fffa832922a708c
Reviewed-on: https://code.wireshark.org/review/16832
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>

extcap: extend buffer (CID 1364684).

Change-Id: I4ed6965fa1173b69d9e325bc814e382b5368d40c
Reviewed-on: https://code.wireshark.org/review/16831
Reviewed-by: Anders Broman <a.broman58@gmail.com>

autotools: Fix make dist without Qt

Change-Id: I62b1d73eede471535b4ccc7ca68c9f94f25b7417
Reviewed-on: https://code.wireshark.org/review/16826
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>

Fix checkAPI warning for printf.

Another legitimate use, so use ws_debug_printf.

Change-Id: I9bebe01e80987caf8e18a59b93a48f9a2d6ee397
Reviewed-on: https://code.wireshark.org/review/16835
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>

Remove trailing "." from OID strings.

The previous change removed code that did that.

Change-Id: If297018f5902af7a2d9cacb0cc9a5f1ffe1e1d00
Reviewed-on: https://code.wireshark.org/review/16834
Reviewed-by: Guy Harris <guy@alum.mit.edu>

Fix compilation without extcap.

Change-Id: I627dd6c514066ba67cd501925ff95e9cf819c0e9
Reviewed-on: https://code.wireshark.org/review/16828
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Roland Knall <rknall@gmail.com>

Add OSI Layer 4 to exported PDU to handle TCP and UDP payloads.

This allows for much easier anonymized captures for protocols running
atop TCP/UDP.

Added support for "TCP dissector data" tag within export PDU (34) so that
the tcpinfo struct that TCP dissector normally passes to its subdissectors
can be saved.

Change-Id: Icd63c049162332e5bcb2720159e5cf8aac893788
Reviewed-on: https://code.wireshark.org/review/16285
Reviewed-by: Michael Mann <mmann78@netscape.net>

Reorder ns_dir_vals into numerical order

Change-Id: I21a50015dd382c62aa2dc84d90bbb4b86ea8b1dc
Reviewed-on: https://code.wireshark.org/review/16825
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>

Make dumpcap build without extcap

Change-Id: I70c7bc270946d104218afc4d9c8ac888471f6524
Reviewed-on: https://code.wireshark.org/review/16821
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>

IPv6: Display reassembly information under root_tree

Change-Id: Ibfa934dba59f96b8820d2616d4d3d3990af00918
Reviewed-on: https://code.wireshark.org/review/16822
Reviewed-by: João Valverde <j@v6e.pt>

Remove checkAPI warnings from wmem.

printf and g_warning are not allowed in epan or its subdirectories

Change-Id: I4c07a7258f4c9566384bef93af35c350b5c88758
Reviewed-on: https://code.wireshark.org/review/16801
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>

Remove proto_help.[ch]

The functionality hasn't been used for awhile and was deprecated with GTK 2.4 (while our minimum support is at least 2.14). It's also causing unnecessary checkAPI warnings.

Change-Id: Ib8da8300a50e2129a46ad188b4ed4d7b2d44b1ca
Reviewed-on: https://code.wireshark.org/review/16813
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>

IPv6: Expand blurb for IPv4 embedded addresses

Change-Id: I540e80517092ab1e475532d8e20a54be24858c5d
Reviewed-on: https://code.wireshark.org/review/16816
Reviewed-by: Binh Trinh <beango@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>

Qt: remove unused constructors.

Fix CID 1356297 and 1356300.

Change-Id: I17e882addc2fb4a12630940cc1ae3ad62f0b793c
Reviewed-on: https://code.wireshark.org/review/16818
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>

Qt: add initializer (CID 1159352).

Change-Id: I2603b1873acb82bd9840ea4deddcbbb422c018e8
Reviewed-on: https://code.wireshark.org/review/16817
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>

wireshark: update WERR definitions from Samba's werror.h.

Guenther

Change-Id: I457f50dcf86f6e7c74afd9ff773aaf8bfdb52426
Signed-off-by: Günther Deschner <gd@samba.org>
Reviewed-on: https://code.wireshark.org/review/16722
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>

BER: Fix segmentation fault when configuring new OIDs

Program terminated with signal 11, Segmentation fault.
#0  0x00007f573e5bdecf in uat_fld_chk_oid (u1=0x2eb1830, strptr=0x7f573c8431e4 "", len=0, u2=0x0, u3=0x0, err=0x7ffee1668748) at uat.c:494
494     if(strptr[len-1] == '.') {
(gdb)
(gdb) bt
#0  0x00007f573e5bdecf in uat_fld_chk_oid (u1=0x2eb1830, strptr=0x7f573c8431e4 "", len=0, u2=0x0, u3=0x0, err=0x7ffee1668748) at uat.c:494
#1  0x0000000000485dfc in uat_dlg_cb (win=0x3844290, user_data=0x3632bc0) at uat_gui.c:364
#2  0x00007f573b2f19a7 in _g_closure_invoke_va (closure=0x3367130, return_value=0x0, instance=0x3844290, args=0x7ffee1668a78, n_params=0,

Change-Id: Ic61480f8c1f2cd833c58de0b2acc24dcb831578f
Reviewed-on: https://code.wireshark.org/review/16800
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>

IPv6: Remove an unused #define and two macros

Change-Id: I0866e4b28b660063ab351022ac943bb5717b5a23
Reviewed-on: https://code.wireshark.org/review/16811
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: João Valverde <j@v6e.pt>

extcap: fix indentation in extcap-base.

Change-Id: Ic8e9634c9568d32fdeca8cc84a9c2f5b9757a5ae
Reviewed-on: https://code.wireshark.org/review/16806
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>

packet-erf.c: Pacify OS X buildbot.

Change-Id: I6ec30e77eac91d1b02eaddada75741b2063426f2
Reviewed-on: https://code.wireshark.org/review/16812
Reviewed-by: Michael Mann <mmann78@netscape.net>

oids.c: Use wmem_strbuf instead of trying to accommodate snprintf.

Change-Id: I5222fbd07b7d1301386f7a206fef688793dd6be7
Reviewed-on: https://code.wireshark.org/review/16802
Reviewed-by: Michael Mann <mmann78@netscape.net>

lbm_uimflow_dlg.c: Pacify another GTK checkAPIs.pl warning.

Add another "Wireshark" macros to old-gtk-compat.h for GTK API that has been deprecated.

Change-Id: Icae4ebae365329fad076324c23d5cee4c89893b5
Reviewed-on: https://code.wireshark.org/review/16803
Reviewed-by: Michael Mann <mmann78@netscape.net>

Cleanup the final checkAPI g_warning complaints.

Change-Id: I7606ee55be4428909e255496c0344fffe5847f02
Reviewed-on: https://code.wireshark.org/review/16804
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>

IPv6: Fix typo in comment from gd2cd779

Change-Id: Id1a053c189fdd374da2447123e5e47d80000b802
Reviewed-on: https://code.wireshark.org/review/16805
Reviewed-by: João Valverde <j@v6e.pt>

[Automatic update for 2016-07-31]

Update manuf, services enterprise-numbers, translations, and other items.

Change-Id: Ia414edeaf04efafd0b5eb2e899dbc69d5b42f07d
Reviewed-on: https://code.wireshark.org/review/16807
Reviewed-by: Gerald Combs <gerald@wireshark.org>

extcap: fix a compile error with Qt4

declare ExtcapArgument * as a metatype so it can be used by QVariant

  CXX    extcap_argument.moc.o
In file included from /usr/include/qt4/QtCore/qvariant.h:48:0,
                 from /usr/include/qt4/QtCore/qabstractitemmodel.h:45,
                 from /usr/include/qt4/QtGui/qabstractitemview.h:46,
                 from /usr/include/qt4/QtGui/qtreeview.h:45,
                 from /usr/include/qt4/QtGui/qtreewidget.h:45,
                 from /usr/include/qt4/QtGui/QTreeWidget:1,
                 from ./interface_tree.h:38,
                 from ./extcap_options_dialog.h:35,
                 from extcap_options_dialog.cpp:26:
/usr/include/qt4/QtCore/qmetatype.h: In instantiation of ‘static int QMetaTypeId2<T>::qt_metatype_id() [with T = ExtcapArgument*]’:
/usr/include/qt4/QtCore/qmetatype.h:230:44:   required from ‘int qMetaTypeId(T*) [with T = ExtcapArgument*]’
/usr/include/qt4/QtCore/qvariant.h:341:47:   required from ‘bool QVariant::canConvert() const [with T = ExtcapArgument*]’
extcap_options_dialog.cpp:378:74:   required from here /usr/include/qt4/QtCore/qmetatype.h:169:80: error: ‘qt_metatype_id’ is not a member of ‘QMetaTypeId<ExtcapArgument*>’
make[2]: *** [extcap_options_dialog.o] Error 1

Change-Id: Ib7d052a5cb550ab2595b8d9580d35ffeb62093da
Reviewed-on: https://code.wireshark.org/review/16799
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>

ERF: Add ERF_TYPE_META clock tags

Adds various clock configuration related tags.
Uses ptp_v2 value strings exported from packet-ptp.

Refactor out common ERF_TYPE_META bitfield code.
Also clean up field registration a bit.
Add flow_hash_mode enum, other minor wording cleanup.
Manually display relative timestamps as nanoseconds for <1ms.
Fix ns_host_* tag subtree summary field name duplication.

Ping-Bug: 12303
Change-Id: I76264d141f1c4a3590627637daa5dcd4fdfd2e93
Reviewed-on: https://code.wireshark.org/review/16782
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>

packet-smb2: fix field type of hf_smb2_ea_data_len

Change-Id: I85f1ab8777f178dd710564eb0cb15f19383677a7
Reviewed-on: https://code.wireshark.org/review/16798
Reviewed-by: Michael Mann <mmann78@netscape.net>

IPv6: Add support for embedded IPv4 addressess (RFC 6052)

For Well-Known Prefix 64:ff9b::/96.

Change-Id: Ib2d7b42b9c7e6bbe388dca46d6a5eb516242c881
Reviewed-on: https://code.wireshark.org/review/16780
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: João Valverde <j@v6e.pt>

Fix indentation

Change-Id: I6b0c7cda7130f1912b9a83991b43f234ff9d9cec
Reviewed-on: https://code.wireshark.org/review/16797
Reviewed-by: João Valverde <j@v6e.pt>

IPv6: Move a declaration

Change-Id: I94ace6b1837e1f3398a2784945322cde91d4d232
Reviewed-on: https://code.wireshark.org/review/16796
Reviewed-by: João Valverde <j@v6e.pt>

IPv6: Capitalize some field names

Change-Id: Ie1d95b521a354df69b4a70b0a8fb209eb97a07fd
Reviewed-on: https://code.wireshark.org/review/16795
Reviewed-by: João Valverde <j@v6e.pt>

packet-nstrace.c: General cleanup

Motivation was to clean up the use of offsetof() as the structure definitions
aren't necessary for Wireshark.

Change-Id: I6fadce0d4823842270be89bbed6081d37254ff2b
Reviewed-on: https://code.wireshark.org/review/16791
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>