Commit Graph

64228 Commits

Author SHA1 Message Date
Dario Lombardo b669ca75c4 androiddump: fix bug in socket retry (CID 1293391).
Change-Id: I61914d208e984d202506cdc885493e841e929990
Reviewed-on: https://code.wireshark.org/review/16948
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2016-08-09 10:19:57 +00:00
Alexis La Goutte 7596268b9b QUIC: Fix typo on diversification nonce display field name
Change-Id: I11455fba1ebc981e3f3865469a6cb537b3cdc11f
Reviewed-on: https://code.wireshark.org/review/16964
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-08-09 03:53:11 +00:00
Günther Deschner 9f72f9e9a3 add clusapi (Windows Cluster Management API) from Samba git tree.
We avoid compiling clusapi_PROPERTY_LIST using pidl.

This struct contains inline arrays and is not strictly needed by clusapi
therefor disable it.

Change-Id: I86efa0c725667083cb252e5df3bfc69118df3059
Signed-off-by: Günther Deschner <gd@samba.org>
Reviewed-on: https://code.wireshark.org/review/16719
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>
2016-08-09 03:51:22 +00:00
João Valverde ba70b88419 checklicenses: Remove whitelisted licenses not being used
Removed a few licenses we shouldn't use (Apache v2, BSD 4-clause) and
removed many others not currently being used. (Add on a need-to basis).

Added GPLv3+ with Bison exception to licensecheck.pl.

Also removed some crud to work around bugs for older licensecheck.pl versions.

The original list came from the chromium project, which has a BSD-like license,
and many more licenses in use, not all of them vetted for GPLv2+ compatibility.

Change-Id: I67f334f21cd94904cf8a0e5d9beb659c82437df4
Reviewed-on: https://code.wireshark.org/review/16966
Petri-Dish: João Valverde <j@v6e.pt>
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: João Valverde <j@v6e.pt>
2016-08-09 02:41:30 +00:00
Guy Harris 8a141febc8 Use -r rather than -i for the "via stdin" tests.
TShark, at least when running in one-pass mode, now supports reading
from the standard input if the file format is one that *can* be read
purely sequentially; both pcap and pcapng can be read purely
sequentially (unlike, for example, Microsoft Network Monitor format,
where you have to read the frame table, at the end of the file, before
you can read the frames, meaning you have to seek backwards, which you
can't do on a pipe).

Using -r 1) tests the "read from standard input" path, which we should
do in versions that support it, and 2) means we can check whether, for
the crashes we're seeing on 32-bit Windows 8.1, it's a problem with
reading from the standard input in general, or just a problem with
*capturing* from the standard input.

Change-Id: I67da34de43f47dd8c63fa2f2072be41148cfe5a7
Reviewed-on: https://code.wireshark.org/review/16968
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-08-09 02:14:28 +00:00
Sander Steffann 5cfb33fd6f DHCPv6: Update Options Codes
From http://www.iana.org/assignments/dhcpv6-parameters/dhcpv6-parameters.txt (2016-06-16)

Change-Id: I03fbcdea0a15e792c51aa514eca73aa68350f8ff
Signed-off-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-on: https://code.wireshark.org/review/16953
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
2016-08-08 22:00:43 +00:00
Dario Lombardo 81f97a963f debian-setup: add customized profiles.
libcap-dev has also been added to optional list.

Change-Id: I52e034603922b694391a30c20316e1a2011fc3b6
Reviewed-on: https://code.wireshark.org/review/16872
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Dario Lombardo <lomato@gmail.com>
2016-08-08 21:19:23 +00:00
Alexis La Goutte 568d6f37d6 DHCPv6: Update Status codes
From http://www.iana.org/assignments/dhcpv6-parameters/dhcpv6-parameters.txt (2016-06-16)

Change-Id: I4f07ff2f3782b72a90a2ca65ff49ca87c0163c41
Reviewed-on: https://code.wireshark.org/review/16954
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-08-08 18:50:39 +00:00
AndersBroman 57fb1abaa5 [BTLE] Dissect LE Information frame.
Change-Id: Id4411526eef895fc0130108457866892216d5b03
Reviewed-on: https://code.wireshark.org/review/16958
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>
2016-08-08 18:47:20 +00:00
Stig Bjørlykke ffbb822b88 nordic-ble: Capitalize header field names.
Change-Id: Ib114b2bad01f768eb7eba4115441d58aadc1b34e
Reviewed-on: https://code.wireshark.org/review/16959
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2016-08-08 17:31:25 +00:00
Dario Lombardo b4ad8c9002 Qt: remove default value from call (CID 1311959).
Change-Id: Ibefdf91269081ab11c7dd62b1b72e0e9a41502ff
Reviewed-on: https://code.wireshark.org/review/16947
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-08-08 15:35:35 +00:00
Dario Lombardo f2bee8dd57 lbmr: restore removed code.
Code was removed in 975b02f879 but is still needed.
This fixes CID 1250810.

Change-Id: Ic0df5043c4486417e93d431898ff1493eb027b1c
Reviewed-on: https://code.wireshark.org/review/16950
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-08-08 14:43:06 +00:00
AndersBroman 40e6017d84 [BTLE] Implement reassembly of BTLE messages.
Change-Id: I93eb7dbc834ffc9bf74faf98a13b58a73bf4ae99
Reviewed-on: https://code.wireshark.org/review/16901
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-08-08 14:03:20 +00:00
Maka0 d62c497938 Updated dictionary.ruckus to include additional radius attributes
Change-Id: I36e64ba198b251dc68d40609c9fdda86ea811096
Reviewed-on: https://code.wireshark.org/review/16896
Reviewed-by: Dario Lombardo <lomato@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-08-08 10:54:39 +00:00
Dario Lombardo a683f28b88 corosync-totemnet: remove dead code (CID 1223483).
Change-Id: I83aaeca7d000a5e328e0aded38093adc45a9d315
Reviewed-on: https://code.wireshark.org/review/16951
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-08-08 10:49:30 +00:00
Dario Lombardo 8025b01207 Qt: remove obsolete members (CID 1159364).
Change-Id: Ic5c1e472d130a122333bfb26f1e7cde25db6ac8f
Reviewed-on: https://code.wireshark.org/review/16945
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-08-08 10:20:17 +00:00
Peter Wu 1767e088d4 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>
2016-08-08 04:26:31 +00:00
Dario Lombardo f3b15abf7f 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>
2016-08-07 22:11:28 +00:00
Peter Wu ef8098cb37 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>
2016-08-07 21:04:47 +00:00
Dario Lombardo bad783b38a 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>
2016-08-07 18:27:16 +00:00
Gerald Combs 313048830b [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>
2016-08-07 15:09:13 +00:00
Peter Wu 1ea6b4fe2e 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>
2016-08-07 12:32:48 +00:00
Peter Wu 2a80b407ea 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>
2016-08-07 09:09:51 +00:00
Michael Mann 600eca15fe 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>
2016-08-07 07:39:12 +00:00
Guy Harris 66711eb261 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>
2016-08-07 03:07:38 +00:00
João Valverde e32890af11 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>
2016-08-06 19:19:38 +00:00
João Valverde 57be744df5 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>
2016-08-06 19:17:40 +00:00
Martin Kaiser 77c41eba6f 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>
2016-08-06 17:53:18 +00:00
Günther Deschner 6e3ebccf22 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>
2016-08-06 15:34:02 +00:00
Günther Deschner 29cc1817b9 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>
2016-08-06 14:06:24 +00:00
Günther Deschner 3bbbfd059c 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>
2016-08-06 13:49:10 +00:00
João Valverde 0ceff86a83 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>
2016-08-06 12:14:49 +00:00
Gerald Combs 86bf0357fe 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>
2016-08-06 07:29:55 +00:00
Gerald Combs 0eee62affe 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>
2016-08-06 07:28:41 +00:00
Dario Lombardo b626ad1f85 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>
2016-08-06 02:13:47 +00:00
Dario Lombardo 37649c4d0f doc: fix typos.
Change-Id: Id34affcb33c00e224dafbccc347b1d91b9e74c8d
Reviewed-on: https://code.wireshark.org/review/16914
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-08-06 00:31:23 +00:00
Guy Harris d1847f0b49 Update FSF address.
Change-Id: I2a36a833f00f4acda253e5741c96c519588aa046
Reviewed-on: https://code.wireshark.org/review/16919
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-08-05 20:25:12 +00:00
Guy Harris d1f0ffd7e7 Fix FSF address.
Change-Id: Icf473af9487e60003813435f18551225224c6d58
Reviewed-on: https://code.wireshark.org/review/16915
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-08-05 20:16:51 +00:00
Dario Lombardo 704c12a572 docbook: fix typos.
Change-Id: If94a1427d91a5de2f5f2308be454479e6b4d8d5a
Reviewed-on: https://code.wireshark.org/review/16900
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-08-05 19:02:28 +00:00
Guy Harris 746e04976e 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>
2016-08-05 18:31:09 +00:00
Guy Harris fd00a4a38d Add copyright notices.
Change-Id: I481968f154008d62c124ca6f71d6cc0114c293c1
Reviewed-on: https://code.wireshark.org/review/16907
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-08-05 18:21:47 +00:00
Guy Harris 73c7cc67b6 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>
2016-08-05 18:15:42 +00:00
João Valverde 78ef23f0d2 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>
2016-08-05 14:05:36 +00:00
João Valverde 917d34c4de 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>
2016-08-05 13:59:25 +00:00
Harald Welte be16ff5f12 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>
2016-08-05 13:46:59 +00:00
Harald Welte e6e0a905bb 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>
2016-08-05 13:46:46 +00:00
AndersBroman c02e3e713c [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>
2016-08-05 10:45:30 +00:00
Yann Diorcet f5af708026 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>
2016-08-05 07:08:53 +00:00
Jaap Keuter 333ba807e7 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>
2016-08-05 07:06:42 +00:00
Dario Lombardo 9057699127 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>
2016-08-05 00:24:18 +00:00