metze/wireshark/wip.git
23 months agoRename "ws_version_info.h", also .c
João Valverde [Tue, 26 Sep 2017 14:04:56 +0000 (15:04 +0100)]
Rename "ws_version_info.h", also .c

It's not installed so like most other files it doesn't need or benefit
from the prefix.

Change-Id: I01517e06f12b3101fee21b68cba3bc6842bbef5c
Reviewed-on: https://code.wireshark.org/review/23751
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>
23 months agoMove some DIAG_OFFs to make code less ugly
João Valverde [Tue, 26 Sep 2017 15:28:02 +0000 (16:28 +0100)]
Move some DIAG_OFFs to make code less ugly

Change-Id: I0f343ab69a6592a466e12e5d258f0878b9c32c25
Reviewed-on: https://code.wireshark.org/review/23752
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>
23 months agoDOCSIS: Adding Attribute masks to Service Flow
Bruno Verstuyft [Tue, 26 Sep 2017 13:32:03 +0000 (15:32 +0200)]
DOCSIS: Adding Attribute masks to Service Flow

Change-Id: I626b8a1d85e3062c58f9e3bd7bd6c6123c4b8272
Reviewed-on: https://code.wireshark.org/review/23749
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: Alexis La Goutte <alexis.lagoutte@gmail.com>
23 months agoplugins: Use g_slist_prepend() instead.
João Valverde [Tue, 26 Sep 2017 13:13:48 +0000 (14:13 +0100)]
plugins: Use g_slist_prepend() instead.

Change-Id: If145137bfd44025ccab762b67960072777efd302
Reviewed-on: https://code.wireshark.org/review/23750
Reviewed-by: João Valverde <j@v6e.pt>
23 months agoGTP: fix display of GTP Prime in frame.protocols field
Pascal Quantin [Tue, 26 Sep 2017 11:29:43 +0000 (13:29 +0200)]
GTP: fix display of GTP Prime in frame.protocols field

Bug: 14083
Change-Id: Ieabdfd2399df9136f6fd9d556ea3b96230710860
Reviewed-on: https://code.wireshark.org/review/23743
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
23 months agocoap: Added dissection for LWM2M JSON inside CoAP protocol
Anton Butenko [Tue, 26 Sep 2017 09:23:29 +0000 (12:23 +0300)]
coap: Added dissection for LWM2M JSON inside CoAP protocol

Change-Id: I29429f731b7e2f25568d44de455816ac70e079b6
Reviewed-on: https://code.wireshark.org/review/23740
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
23 months agoplugins: Build the description string while loading
João Valverde [Mon, 25 Sep 2017 23:15:24 +0000 (00:15 +0100)]
plugins: Build the description string while loading

Change-Id: Ia67133c1c9d005fc4a81b0727a7b1849571ab29c
Reviewed-on: https://code.wireshark.org/review/23742
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>
23 months agoAdd GRPC dissector
Huang Qiangxiong [Mon, 31 Jul 2017 15:22:59 +0000 (15:22 +0000)]
Add GRPC dissector

GRPC dissector register it self to media_type dissector table using
patterns "application/grpc", "application/grpc+proto" and
"application/grpc+json".

GRPC stack (at least in grpc-java) can send JSON over GRPC using
content-type = "application/grpc" which normally means default protobuf
format.  A preference is added to detect the message body, if it starts
with '{', and ends with '}', will force to use JSON subdissector instead
of searching in 'grpc_message_type' table.

Ping-Bug: 13932
Change-Id: I910961ca06370e678d19b78cac533ca566d87628
Reviewed-on: https://code.wireshark.org/review/22891
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
23 months agoZigBee ZCL SE Events: Dissect commands within ZCL SE Events Cluster
Martin Boye Petersen [Mon, 25 Sep 2017 20:22:35 +0000 (22:22 +0200)]
ZigBee ZCL SE Events: Dissect commands within ZCL SE Events Cluster

Change-Id: I6baf02fc0a194a776fb02fc265902b0eafd710e9
Reviewed-on: https://code.wireshark.org/review/23734
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
23 months agoplugins: Sort the descriptions
João Valverde [Mon, 25 Sep 2017 19:42:29 +0000 (20:42 +0100)]
plugins: Sort the descriptions

Change-Id: I8113ba9782962856ce86475cddf40d69ed267fb4
Reviewed-on: https://code.wireshark.org/review/23733
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>
23 months agoplugins: Use hash table for book-keeping
João Valverde [Mon, 25 Sep 2017 18:05:40 +0000 (19:05 +0100)]
plugins: Use hash table for book-keeping

Avoid having to walk the list to check for existence on every file
load.

Now the binary plugin description list in About Wireshark is randomized
instead of sorted by load order. We may want to change that.

Add missing "const" to plugin->version.

Fix an apparent trivial leak where the GModule handle was not closed on
exit.

Change-Id: I774215a84b080bbe889f88cc6a9b777bcf60b335
Reviewed-on: https://code.wireshark.org/review/23732
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>
23 months agoHTTP2: Store all packets' header indexes in header_stream_info struct
Huang Qiangxiong [Sun, 30 Jul 2017 13:39:11 +0000 (13:39 +0000)]
HTTP2: Store all packets' header indexes in header_stream_info struct

Store all packets' headers indexes of oneway stream in its header_stream_info struct.
(Just store pointers refer to each HEADERS or CONTINUATION packets' header arrays)

Add http2_get_header_value() function to allow other dissectors to get HTTP2
headers of this stream later in DATA frames.

Ping-Bug: 13932
Change-Id: I9f623f66045845c338cd6233d4c6da3f6875fc69
Reviewed-on: https://code.wireshark.org/review/22859
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>
23 months agoZigBee PP Dissector: Increase number of subtrees
Martin Boye Petersen [Mon, 25 Sep 2017 17:06:26 +0000 (19:06 +0200)]
ZigBee PP Dissector: Increase number of subtrees

Increase number of subtrees from 10 to 30 for PublishTopUpLog and PublishDebtLog.
Before the total APS size of PublishDebtLog could only be about 132 bytes.
Same goes for PublishTopUpLog.

Change-Id: I7e70977526de2f6d6e84af178bee91eabb132962
Reviewed-on: https://code.wireshark.org/review/23731
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
23 months agoEditcap: Don't treat plain -F and -T as errors.
Gerald Combs [Mon, 25 Sep 2017 23:18:21 +0000 (16:18 -0700)]
Editcap: Don't treat plain -F and -T as errors.

The editcap man page says that you can pass in -F and -T without
arguments in order to get a list of valid capture and encapsulation
types. Instead of treating these as errors just print the information to
stdout and return 0.

Adjust the docbook _tools_help targets accordingly.

Change-Id: I590cbd59059dd8965299bef4434f522eff8a4e2c
Reviewed-on: https://code.wireshark.org/review/23741
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: Michael Mann <mmann78@netscape.net>
23 months agoQt: Free MainWindow at shutdown
Mikael Kanstrup [Mon, 25 Sep 2017 21:18:31 +0000 (23:18 +0200)]
Qt: Free MainWindow at shutdown

MainWindow is allocated on heap on startup but not freed on shutdown.
Free the object at shutdown mainly to silent Valgrind.

When at it also fix two problems with the MainWindow destructor:
- Deleting main_ui_ triggers a currentChanged signal which in turn
  calls mainStackChanged that references the freed main_ui_ object.
  Prevent use after free error by disconnecting from the signal before
  freeing.

- Explicitly free file_set_dialog_ as no rparent perform the cleanup.

Bug: 14071
Change-Id: I9c1fbef04cf68bfffffea57ef298f4896d6583f9
Reviewed-on: https://code.wireshark.org/review/23739
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: Michael Mann <mmann78@netscape.net>
23 months agoDocbook: Automatically generate the tools help output.
Gerald Combs [Mon, 25 Sep 2017 21:06:37 +0000 (14:06 -0700)]
Docbook: Automatically generate the tools help output.

Add a CMake target that dumps the help output for our command line tools
to individual files. Include those files in the tools appendix instead
of pasting them in manually.

Fixup the output of some tools so that they pass the pre-commit checks.

Change-Id: I925f24818422a190927a96531c21f4d16d3fe5b5
Reviewed-on: https://code.wireshark.org/review/23737
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
23 months agoQt: Fix leaked interfaces array in Wireless frame
Mikael Kanstrup [Mon, 25 Sep 2017 14:55:21 +0000 (16:55 +0200)]
Qt: Fix leaked interfaces array in Wireless frame

The array of ws80211_interface:s is not freed when the wireless
frame is destroyed causing minor leaks. Fix leaks by freeing the
array using appropriate utility function.

Bug: 14071
Change-Id: I35ec578062bfee4a4f0d0ac05a6d7613996a8822
Reviewed-on: https://code.wireshark.org/review/23738
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
23 months agoNAS EPS: upgrade dissector to v14.5.0
Pascal Quantin [Mon, 25 Sep 2017 20:48:39 +0000 (22:48 +0200)]
NAS EPS: upgrade dissector to v14.5.0

Change-Id: I0cf79dc37804db60b50cfb87355d0537361e214f
Reviewed-on: https://code.wireshark.org/review/23736
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>
23 months ago3GPP NAS: upgrade dissector to v14.5.0
Pascal Quantin [Mon, 25 Sep 2017 20:26:53 +0000 (22:26 +0200)]
3GPP NAS: upgrade dissector to v14.5.0

Change-Id: Ibf45c6b5930ee122004afc8d2ac84a751491f3a4
Reviewed-on: https://code.wireshark.org/review/23735
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
23 months agoplugins: Fix crash loading binary module twice
João Valverde [Mon, 25 Sep 2017 11:51:27 +0000 (12:51 +0100)]
plugins: Fix crash loading binary module twice

If a plugin is repeated we destroy the GModuleHandle in plugins_scan_dir()
but we have already added the entry points to the list of registered
plugins.

Check for repeated plugins before adding it to the list of registered
plugins, not after.

Don't check for both name and version, check only for repeated names.

Give the plugin callback a more descriptive name.

Change-Id: I22cbbb059b8029877580fc33517310496c93e5d5
Reviewed-on: https://code.wireshark.org/review/23726
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>
23 months agoudpdump: Add missing include for timeval struct.
Jakub Zawadzki [Mon, 25 Sep 2017 16:10:01 +0000 (18:10 +0200)]
udpdump: Add missing include for timeval struct.

struct timeval is defined in <sys/time.h>, include it.

It should fix building with musl:

udpdump.c: In function 'setup_listener':
udpdump.c:126:9: error: variable 'timeout' has initializer but incomplete type
  struct timeval timeout = { 1, 0 };

Change-Id: Id9be579e50ea2845ca609708e8ec4d1a3858ecc0
Reviewed-on: https://code.wireshark.org/review/23728
Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Jakub Zawadzki <darkjames-ws@darkjames.pl>
23 months agomacOS: Fixup plugin signing.
Gerald Combs [Mon, 25 Sep 2017 16:36:38 +0000 (09:36 -0700)]
macOS: Fixup plugin signing.

Use `find` to find plugins.

Change-Id: I6df8877547ecbd19644a846e5cb02e8b65f19e61
Reviewed-on: https://code.wireshark.org/review/23730
Reviewed-by: Gerald Combs <gerald@wireshark.org>
23 months agotext2pcap: fix crash when there is no argument
Pascal Quantin [Mon, 25 Sep 2017 15:51:05 +0000 (17:51 +0200)]
text2pcap: fix crash when there is no argument

Bug: 14082
Change-Id: Ifd8b2bf9bee817967e3b00e01b8b4ae90970e984
Reviewed-on: https://code.wireshark.org/review/23727
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
23 months agoAdd toy plugin to doc/ as an out-of-tree build example
João Valverde [Sat, 23 Sep 2017 21:50:28 +0000 (22:50 +0100)]
Add toy plugin to doc/ as an out-of-tree build example

Change-Id: I9b7abb27d30dbe83996a01b7f722693a974948c5
Reviewed-on: https://code.wireshark.org/review/23665
Reviewed-by: João Valverde <j@v6e.pt>
23 months agoDocsis: fix an infinite loop
Pascal Quantin [Sat, 23 Sep 2017 20:22:28 +0000 (22:22 +0200)]
Docsis: fix an infinite loop

Add missing decrement of concatlen based on master-2.2 version.

Bug: 14080
Change-Id: I00f7e34f8e599718316a4ce8916d91b780ec7c14
Reviewed-on: https://code.wireshark.org/review/23663
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
23 months agopacket-brcm-tag: Add Broadcom tag dissection
Florian Fainelli [Sun, 17 Sep 2017 04:45:49 +0000 (21:45 -0700)]
packet-brcm-tag: Add Broadcom tag dissection

Add support for dissecting the old-style Broadcom tag with Ethertype 0x8874,
this was supported by switches like Broadcom BCM5325. Newer switches use a
different tag format (with no Ethertype) which will be supported later.

Change-Id: Iec26f8d13058399a35fb258ccadc48f7f5ac8474
Reviewed-on: https://code.wireshark.org/review/23592
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
23 months agopidl: fix field2name wireshark dissector test.
Guy Harris [Mon, 25 Sep 2017 07:20:04 +0000 (00:20 -0700)]
pidl: fix field2name wireshark dissector test.

Pick up change from Samba:

    commit 82778a6d04580fc05f3f83d44f57f221ad4e8ac4
    Author: Günther Deschner <gd@samba.org>
    Date:   Tue Sep 6 22:37:12 2016 +0200

        pidl: fix field2name wireshark dissector test.

        Guenther

Signed-off-by: Guenther Deschner <gd@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
        Autobuild-User(master): Günther Deschner <gd@samba.org>
        Autobuild-Date(master): Wed Sep  7 16:05:26 CEST 2016 on sn-devel-144

Change-Id: Ia02de7d36b2fcb0e7a5145361548acae844f73ed
Reviewed-on: https://code.wireshark.org/review/23724
Reviewed-by: Guy Harris <guy@alum.mit.edu>
23 months agopidl: Fix array range checks in python output
Guy Harris [Mon, 25 Sep 2017 07:16:26 +0000 (00:16 -0700)]
pidl: Fix array range checks in python output

Pick up change from Samba:

    commit 67040cf61232dd1cdcc820237919ac1e073c31c2
    Author: Volker Lendecke <vl@samba.org>
    Date:   Tue Jun 20 15:31:18 2017 +0200

        pidl: Fix array range checks in python output

        Without this, we generated code like

        if (ndr_table_dnsserver.num_calls < 0) {
                PyErr_SetString(PyExc_TypeError, "Internal Error, ndr_interface_call missing for py_DnssrvOperation_ndr_pack");
                return NULL;
        }
        call = &ndr_table_dnsserver.calls[0];

        This does not really make sense, and Coverity found comparing the unsigned
        num_calls against <0 a bit pointless.

        Should fix 138 Coverity findings and make the code a bit more correct.

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Change-Id: I401e3771e6f3c1125ff847749073693af23884fc
Reviewed-on: https://code.wireshark.org/review/23723
Reviewed-by: Guy Harris <guy@alum.mit.edu>
23 months agopython3: Use "y#" instead of "s#" for binary data in PyArg_ParseTuple
Guy Harris [Mon, 25 Sep 2017 07:13:58 +0000 (00:13 -0700)]
python3: Use "y#" instead of "s#" for binary data in PyArg_ParseTuple

Pick up change from Samba:

    commit 40e409bf9e89a163c771b2a58493d2c1b496fae7
    Author: Petr Viktorin <pviktori@redhat.com>
    Date:   Wed May 3 16:57:07 2017 +0200

        python3: Use "y#" instead of "s#" for binary data in PyArg_ParseTuple

        The "s#" format code for PyArg_ParseTupleAndKeywords and Py_BuildValue
        converts a char* and size to/from Python str (with utf-8 encoding under
        Python 3).
        In some cases, we want bytes (str on Python 2, bytes on 3) instead. The
        code for this is "y#" in Python 3, but that is not available in 2.

        Introduce a PYARG_BYTES_LEN macro that expands to "s#" or "y#", and use
        that in:
        - credentials.get_ntlm_response (for input and output)
        - ndr_unpack argument in PIDL generated code

Signed-off-by: Petr Viktorin <pviktori@redhat.com>
Reviewed-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Change-Id: If4d9cdabc5016127f60682caf300f6801a360083
Reviewed-on: https://code.wireshark.org/review/23722
Reviewed-by: Guy Harris <guy@alum.mit.edu>
23 months agopidl: Fix Coverity warnings from duplicate NULL checks.
Guy Harris [Mon, 25 Sep 2017 07:11:53 +0000 (00:11 -0700)]
pidl: Fix Coverity warnings from duplicate NULL checks.

Pick up change from Samba:

    commit 9703464b942fdddbf7bc4380cbd26d1803f9bc00
    Author: Jeremy Allison <jra@samba.org>
    Date:   Tue May 2 08:10:40 2017 -0700

        pidl: Fix Coverity warnings from duplicate NULL checks.

        Pair-Programmed-With: Stefan Metzmacher <metze@samba.org>

Signed-off-by: Jeremy Allison <jra@samba.org>
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
        Autobuild-User(master): Andrew Bartlett <abartlet@samba.org>
        Autobuild-Date(master): Sat May  6 16:03:17 CEST 2017 on sn-devel-144

Change-Id: I25c6ae984c6a963c05f33d9a649b64f9795c7292
Reviewed-on: https://code.wireshark.org/review/23721
Reviewed-by: Guy Harris <guy@alum.mit.edu>
23 months agopython: pidl: Port Python interface generator
Guy Harris [Mon, 25 Sep 2017 05:10:02 +0000 (22:10 -0700)]
python: pidl: Port Python interface generator

Pick up change from Samba:

    commit 2de5fa45e0abfdb50f604f87e494bf334c39003a
    Author: Lumir Balhar <lbalhar@redhat.com>
    Date:   Mon Jan 23 21:03:17 2017 +0100

        python: pidl: Port Python interface generator

        Port PIDL generator of Python interfaces to generate interfaces in
        Python 3 compatible form.

        Python 2.7 is now required, so we can use PyCapsule in both versions.

Signed-off-by: Lumir Balhar <lbalhar@redhat.com>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Pair-programmed-by: Andrew Bartlett <abartlet@samba.org>
Change-Id: I981993e326132a1911bfbb686ca5ae033dd1df49
Reviewed-on: https://code.wireshark.org/review/23720
Reviewed-by: Guy Harris <guy@alum.mit.edu>
23 months agopidl:Python: use of pytalloc_GenericObject_reference*() for pyrpc_{ex,im}port_union...
Guy Harris [Mon, 25 Sep 2017 05:08:23 +0000 (22:08 -0700)]
pidl:Python: use of pytalloc_GenericObject_reference*() for pyrpc_{ex,im}port_union() wrapping

Pick up change from Samba:

    commit 2170f556299c6ab4ce33f22169ca26ecad3440e3
    Author: Stefan Metzmacher <metze@samba.org>
    Date:   Mon Feb 20 18:02:09 2017 +0100

        pidl:Python: use of pytalloc_GenericObject_reference*() for pyrpc_{ex,im}port_union() wrapping

        BUG: https://bugzilla.samba.org/show_bug.cgi?id=12601

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
        Autobuild-User(master): Andrew Bartlett <abartlet@samba.org>
        Autobuild-Date(master): Sat Feb 25 06:33:33 CET 2017 on sn-devel-144

Change-Id: I4d3cb70c79531e5faf5249b67948cc6d354c1bd0
Reviewed-on: https://code.wireshark.org/review/23719
Reviewed-by: Guy Harris <guy@alum.mit.edu>
23 months agopidl:Python: replace pytalloc_CObject_FromTallocPtr() with pytalloc_GenericObject_ref...
Guy Harris [Mon, 25 Sep 2017 05:02:41 +0000 (22:02 -0700)]
pidl:Python: replace pytalloc_CObject_FromTallocPtr() with pytalloc_GenericObject_reference_ex()

Pick up change from Samba:

    commit 1ee0c0f8280393c708f23361ebcba0776e8b4d33
    Author: Stefan Metzmacher <metze@samba.org>
    Date:   Wed Feb 22 09:07:54 2017 +0100

        pidl:Python: replace pytalloc_CObject_FromTallocPtr() with pytalloc_GenericObject_reference_ex()

        BUG: https://bugzilla.samba.org/show_bug.cgi?id=12601

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Change-Id: I19d04a1a248d35799ec41a79113fe588cd05e3de
Reviewed-on: https://code.wireshark.org/review/23718
Reviewed-by: Guy Harris <guy@alum.mit.edu>
23 months agoBUG: https://bugzilla.samba.org/show_bug.cgi?id=12601
Guy Harris [Mon, 25 Sep 2017 05:01:11 +0000 (22:01 -0700)]
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12601

Pick up change from Samba:

    commit d62eb3cc9f97b203d21ec6e75c48c739a43bc163
    Author: Stefan Metzmacher <metze@samba.org>
    Date:   Wed Feb 22 10:08:46 2017 +0100

        pidl:Python: make sure print HASH references for STRUCT types

        BUG: https://bugzilla.samba.org/show_bug.cgi?id=12601

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Change-Id: Ieef766844ce66160eaaacecc73a51f94f69319fb
Reviewed-on: https://code.wireshark.org/review/23717
Reviewed-by: Guy Harris <guy@alum.mit.edu>
23 months agopidl:Python: add PyTypeObject objects for function structs
Guy Harris [Mon, 25 Sep 2017 04:56:47 +0000 (21:56 -0700)]
pidl:Python: add PyTypeObject objects for function structs

Pick up change from Samba:

    commit 57539c84416aeb8fc8e3a8653f790b329e6fa9a1
    Author: Stefan Metzmacher <metze@samba.org>
    Date:   Mon Sep 12 09:20:44 2016 +0200

        pidl:Python: add PyTypeObject objects for function structs

        They provide get/set methods for the in_* and out_* elements
        and the magic __ndr_{push,pull,print}_{in,out}__ hooks to enable
        the marshalling via ndr_{push,pull,print}_{in,out}().

        This provides an easy way to generate and parse the payload of
        DCERPC requests and responses, which is very useful for writing
        tests.

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
Change-Id: I8f0e70fb771a91ba9590e2e92b5713b48313d2de
Reviewed-on: https://code.wireshark.org/review/23716
Reviewed-by: Guy Harris <guy@alum.mit.edu>
23 months agopidl:Python: split out a PythonElementGetSet() helper function
Guy Harris [Mon, 25 Sep 2017 04:51:46 +0000 (21:51 -0700)]
pidl:Python: split out a PythonElementGetSet() helper function

Pick up a change from Samba:

    commit a546124f10d1e2bee29bc06c0b8754257d2bdc23
    Author: Stefan Metzmacher <metze@samba.org>
    Date:   Mon Sep 12 09:20:04 2016 +0200

        pidl:Python: split out a PythonElementGetSet() helper function

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
Change-Id: Ica8b699189b69833abfa6049dd3c4e489788ce54
Reviewed-on: https://code.wireshark.org/review/23715
Reviewed-by: Guy Harris <guy@alum.mit.edu>
23 months agopidl:Python: the py_{import,export}_*() functions can be static now.
Guy Harris [Mon, 25 Sep 2017 04:50:25 +0000 (21:50 -0700)]
pidl:Python: the py_{import,export}_*() functions can be static now.

Pick up change from Samba:

    commit 40175613519e7405a16e8f896dfdc2949430bc4b
    Author: Stefan Metzmacher <metze@samba.org>
    Date:   Tue Sep 13 01:06:18 2016 +0200

        pidl:Python: the py_{import,export}_*() functions can be static now.

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
Change-Id: I6e06c97b44a04cab36d134916eddf4c501ccc35d
Reviewed-on: https://code.wireshark.org/review/23714
Reviewed-by: Guy Harris <guy@alum.mit.edu>
23 months agopidl:Python: make use of the pyrpc_{import,export}_union() functions
Guy Harris [Mon, 25 Sep 2017 04:49:05 +0000 (21:49 -0700)]
pidl:Python: make use of the pyrpc_{import,export}_union() functions

Pick up a change from Samba:

    commit f7707c04a5e039e757b288ad67a0c3cac9c6466a
    Author: Stefan Metzmacher <metze@samba.org>
    Date:   Mon Sep 12 16:33:38 2016 +0200

        pidl:Python: make use of the pyrpc_{import,export}_union() functions

        This avoids the linking problems at C shared object level.

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
Change-Id: I62c1d03b10e965552a4d598fa2370692ee0cd12a
Reviewed-on: https://code.wireshark.org/review/23713
Reviewed-by: Guy Harris <guy@alum.mit.edu>
23 months agopidl:Python: provide a PyTypeObject with METH_CLASS __import__() and __export__(...
Guy Harris [Mon, 25 Sep 2017 04:47:37 +0000 (21:47 -0700)]
pidl:Python: provide a PyTypeObject with METH_CLASS __import__() and __export__() hooks

Pick up a change from Samba:

    commit e0324c0cf7e7c363a5791c2e35c8820b79640a47
    Author: Stefan Metzmacher <metze@samba.org>
    Date:   Mon Sep 12 16:33:38 2016 +0200

        pidl:Python: provide a PyTypeObject with METH_CLASS __import__() and __export__() hooks

        These are wrappers around the currently public C functions
        'py_import_*() and 'py_export_*().

        In order to let other python module use these function, we should
        resolve the needed type object and call the __import__() or __export__()
        hooks instead of linking to the other shared module at C level.

        We already do the same for structs.

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
Change-Id: I47813a544365085407a31d174ee180778674e42b
Reviewed-on: https://code.wireshark.org/review/23712
Reviewed-by: Guy Harris <guy@alum.mit.edu>
23 months agopidl:Python: provide the abstract syntax as <module>.<interface>_abstract_syntax
Guy Harris [Mon, 25 Sep 2017 04:46:05 +0000 (21:46 -0700)]
pidl:Python: provide the abstract syntax as <module>.<interface>_abstract_syntax

Pick up change from Samba:

    commit 3a0ce3e41d9fdab58273c239955862b03396ea19
    Author: Stefan Metzmacher <metze@samba.org>
    Date:   Sun Sep 25 00:48:29 2016 +0200

        pidl:Python: provide the abstract syntax as <module>.<interface>_abstract_syntax

        The <module>.abstract_syntax alias is only kept as legacy for
        the first interface in a module.

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
Change-Id: Ie6d3d48ea3012bd328eb20e2e6693928fe24ead8
Reviewed-on: https://code.wireshark.org/review/23711
Reviewed-by: Guy Harris <guy@alum.mit.edu>
23 months agopidl:Python: prettify names of constants
Guy Harris [Mon, 25 Sep 2017 04:44:27 +0000 (21:44 -0700)]
pidl:Python: prettify names of constants

Pick up change from Samba:

    commit 1bebccaeb93f7fb7b6e2538d63223f01587ed14d
    Author: Stefan Metzmacher <metze@samba.org>
    Date:   Fri Sep 23 06:49:13 2016 +0200

        pidl:Python: prettify names of constants

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
Change-Id: If9905b914c0d559bd6e7808fadbd154ae56ae2b1
Reviewed-on: https://code.wireshark.org/review/23710
Reviewed-by: Guy Harris <guy@alum.mit.edu>
23 months agopidl:Python: improve the .doc string for the get/set elements
Guy Harris [Mon, 25 Sep 2017 04:42:58 +0000 (21:42 -0700)]
pidl:Python: improve the .doc string for the get/set elements

Pick up change from Samba:

    commit a560116aa5228885e5f52fc46fa92151357de69c
    Author: Stefan Metzmacher <metze@samba.org>
    Date:   Tue Sep 13 09:07:32 2016 +0200

        pidl:Python: improve the .doc string for the get/set elements

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
Change-Id: I8ecb22fd88298ecd4e350b1815d8720b493aac27
Reviewed-on: https://code.wireshark.org/review/23709
Reviewed-by: Guy Harris <guy@alum.mit.edu>
23 months agopidl:Python: make use of NDR_ERR_CODE_IS_SUCCESS()
Guy Harris [Mon, 25 Sep 2017 04:41:38 +0000 (21:41 -0700)]
pidl:Python: make use of NDR_ERR_CODE_IS_SUCCESS()

Pick up change from Samba:

    commit 47b40ac96afbd4fb28e519b9658256ecaa304e71
    Author: Stefan Metzmacher <metze@samba.org>
    Date:   Mon Sep 12 15:12:24 2016 +0200

        pidl:Python: make use of NDR_ERR_CODE_IS_SUCCESS()

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
Change-Id: I550b83596fe27bad5ba4f7d91eb0ac62380f4eac
Reviewed-on: https://code.wireshark.org/review/23708
Reviewed-by: Guy Harris <guy@alum.mit.edu>
23 months agopidl:Python: __ndr_print__ functions don't get arguments and need METH_NOARGS
Guy Harris [Mon, 25 Sep 2017 04:39:47 +0000 (21:39 -0700)]
pidl:Python: __ndr_print__ functions don't get arguments and need METH_NOARGS

Pick up change from Samba:

    commit d4660e869790c7da1cb97e9d95a995e5a32b34ef
    Author: Stefan Metzmacher <metze@samba.org>
    Date:   Sun Sep 25 01:07:14 2016 +0200

        pidl:Python: __ndr_print__ functions don't get arguments and need METH_NOARGS

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
Change-Id: Ic0648f65b8c3f60e614361778d2c0bf72d61be35
Reviewed-on: https://code.wireshark.org/review/23707
Reviewed-by: Guy Harris <guy@alum.mit.edu>
23 months agopidl:Python: check the return values of talloc_ptrtype()
Guy Harris [Mon, 25 Sep 2017 04:17:03 +0000 (21:17 -0700)]
pidl:Python: check the return values of talloc_ptrtype()

Pick up change from Samba:

    commit b728c63bcb5860aed2db43139d191bc149ceba83
    Author: Stefan Metzmacher <metze@samba.org>
    Date:   Mon Sep 12 15:12:50 2016 +0200

        pidl:Python: check the return values of talloc_ptrtype()

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
Change-Id: Icfe8837b5b998e3c5c4ea98df21cf620f53cdcd7
Reviewed-on: https://code.wireshark.org/review/23706
Reviewed-by: Guy Harris <guy@alum.mit.edu>
23 months agolib: modules: Change XXX_init interface from XXX_init(void) to XXX_init(TALLOC_CTX *)
Guy Harris [Mon, 25 Sep 2017 04:12:25 +0000 (21:12 -0700)]
lib: modules: Change XXX_init interface from XXX_init(void) to XXX_init(TALLOC_CTX *)

Pick up change from Samba:

    commit 306783d6f5d577a0b8bd31d659d8c802f22f0333
    Author: Jeremy Allison <jra@samba.org>
    Date:   Thu Apr 20 12:24:43 2017 -0700

        lib: modules: Change XXX_init interface from XXX_init(void) to XXX_init(TALLOC_CTX *)

        Not currently used - no logic changes inside.

        This will make it possible to pass down a long-lived talloc
        context from the loading function for modules to use instead
        of having them internally all use talloc_autofree_context()
        which is a hidden global.

        Updated all known module interface numbers, and added a
        WHATSNEW.

Signed-off-by: Jeremy Allison <jra@samba.org>
Signed-off-by: Ralph Böhme <slow@samba.org>
        Autobuild-User(master): Jeremy Allison <jra@samba.org>
        Autobuild-Date(master): Sat Apr 22 01:17:00 CEST 2017 on sn-devel-144

Change-Id: I549e24e2e1fec12d8e7d3f3304cdac29882892a5
Reviewed-on: https://code.wireshark.org/review/23705
Reviewed-by: Guy Harris <guy@alum.mit.edu>
23 months agos4-rpc_server: Allow each interface to declare if it uses handles
Guy Harris [Mon, 25 Sep 2017 04:09:13 +0000 (21:09 -0700)]
s4-rpc_server: Allow each interface to declare if it uses handles

Pick up change from Samba:

    commit ffb8b50e3c07c833fb7b1a583d21f9dc1166a0a6
    Author: Andrew Bartlett <abartlet@samba.org>
    Date:   Mon Nov 14 11:24:03 2016 +1300

        s4-rpc_server: Allow each interface to declare if it uses handles

        This will allow the NETLOGON server in the AD DC to declare that it does not use
        handles, and so allow some more flexibility with association groups

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Change-Id: Ic09452d27493ff913f5a5c064a038e3783e91df2
Reviewed-on: https://code.wireshark.org/review/23704
Reviewed-by: Guy Harris <guy@alum.mit.edu>
23 months agos4-rpc_server: Add back support for lsa over \\pipe\\netlogon optionally
Guy Harris [Mon, 25 Sep 2017 04:07:04 +0000 (21:07 -0700)]
s4-rpc_server: Add back support for lsa over \\pipe\\netlogon optionally

Pick up change from Samba:

    commit 31d625bcd2b0cb33dd98a37c202f5b371b871362
    Author: Andrew Bartlett <abartlet@samba.org>
    Date:   Tue Dec 13 09:06:25 2016 +1300

        s4-rpc_server: Add back support for lsa over \\pipe\\netlogon optionally

        The idea here is that perhaps some real client relies on this (and not just Samba torture
        commands), so we need a way to support it for the 4.6 release.

        If no such client emerges, it can be deprecated and removed in the normal way.

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Change-Id: Id20f98ffbc5eb4752bebee455e7b2b2c0f5017e0
Reviewed-on: https://code.wireshark.org/review/23703
Reviewed-by: Guy Harris <guy@alum.mit.edu>
23 months agopidl: Make dcesrv\_$name\_interface "static const"
Guy Harris [Mon, 25 Sep 2017 04:05:11 +0000 (21:05 -0700)]
pidl: Make dcesrv\_$name\_interface "static const"

Pick up change from Samba:

    commit 50dff7e094d48793b432992a28571a6f7e5cc73c
    Author: Andrew Bartlett <abartlet@samba.org>
    Date:   Mon Nov 21 11:21:50 2016 +1300

        pidl: Make dcesrv\_$name\_interface "static const"

        This moves it out of the global namespace

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
        Autobuild-User(master): Stefan Metzmacher <metze@samba.org>
        Autobuild-Date(master): Thu Dec  8 13:25:57 CET 2016 on sn-devel-144

Change-Id: Ifa9fca377dc217b131f87cef4463624a679660f9
Reviewed-on: https://code.wireshark.org/review/23702
Reviewed-by: Guy Harris <guy@alum.mit.edu>
23 months agopidl: Use a static const initialised struct in dcerpc_server_$name_init(void)
Guy Harris [Mon, 25 Sep 2017 04:03:40 +0000 (21:03 -0700)]
pidl: Use a static const initialised struct in dcerpc_server_$name_init(void)

Pick up change from Samba:

    commit 778fc58eb281e38eb1a3346b58cfdf9682f104c4
    Author: Andrew Bartlett <abartlet@samba.org>
    Date:   Mon Nov 21 11:38:24 2016 +1300

        pidl: Use a static const initialised struct in dcerpc_server_$name_init(void)

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
Change-Id: I5bbc8cfdd94f4c13250fc3b1cb0a61351220116c
Reviewed-on: https://code.wireshark.org/review/23701
Reviewed-by: Guy Harris <guy@alum.mit.edu>
23 months agolibndr/compression: pass down compressed length in ndr_pull_compression_start
Guy Harris [Mon, 25 Sep 2017 03:58:08 +0000 (20:58 -0700)]
libndr/compression: pass down compressed length in ndr_pull_compression_start

Pick up change from Samba:

    commit a44bce6dfab59a6440ccc30ef0968d59b9f43fd3
    Author: Günther Deschner <gd@samba.org>
    Date:   Tue Sep 20 00:18:43 2016 +0200

        libndr/compression: pass down compressed length in ndr_pull_compression_start

        Guenther

Signed-off-by: Guenther Deschner <gd@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Change-Id: I038c28cafce1248f4208119ba47f1c94ce970067
Reviewed-on: https://code.wireshark.org/review/23700
Reviewed-by: Guy Harris <guy@alum.mit.edu>
23 months agopidl:NDR/Parser: add missing {start,end}_flags() to ParseElementPrint()
Guy Harris [Mon, 25 Sep 2017 03:51:44 +0000 (20:51 -0700)]
pidl:NDR/Parser: add missing {start,end}_flags() to ParseElementPrint()

Pick up change from Samba:

    commit 81bbfb010599b65308aca89cc50532372ca4cb00
    Author: Stefan Metzmacher <metze@samba.org>
    Date:   Mon Jun 12 18:58:49 2017 +0200

        pidl:NDR/Parser: add missing {start,end}_flags() to ParseElementPrint()

        BUG: https://bugzilla.samba.org/show_bug.cgi?id=12782

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
Change-Id: Iaf4192083c49a15eaf722da1a3b55ad987bdbc82
Reviewed-on: https://code.wireshark.org/review/23699
Reviewed-by: Guy Harris <guy@alum.mit.edu>
23 months agopidl:NDR/Parser: initialize [skip] values in ndr_pull_*
Guy Harris [Mon, 25 Sep 2017 03:04:54 +0000 (20:04 -0700)]
pidl:NDR/Parser: initialize [skip] values in ndr_pull_*

Pick up change from Samba:

    commit 823bc4c07add242a5a1d0cd25942ebaab3cd0e23
    Author: Stefan Metzmacher <metze@samba.org>
    Date:   Tue Jun 13 09:57:33 2017 +0200

        pidl:NDR/Parser: initialize [skip] values in ndr_pull_*

        It's too dangerous to leave values uninitialzed!
        [skip_noinit] can be used if required.

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
Change-Id: I85a173e21fca509fc417ff2532097fd9a220ccd9
Reviewed-on: https://code.wireshark.org/review/23698
Reviewed-by: Guy Harris <guy@alum.mit.edu>
23 months agopidl:NDR/Parser: add "skip_noinit" element
Guy Harris [Mon, 25 Sep 2017 03:03:07 +0000 (20:03 -0700)]
pidl:NDR/Parser: add "skip_noinit" element

Pick up change from Samba:

    commit b922472fd683235fde3abc69ee09d9d8bfdb8644
    Author: Stefan Metzmacher <metze@samba.org>
    Date:   Wed Jun 21 15:05:35 2017 +0200

        pidl:NDR/Parser: add "skip_noinit" element

        In future "skip" will be changed to initialize the element
        with ZERO_STRUCT() on ndr_pull_*.

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
Change-Id: I4b886c18c9eff27ae446e68fb7220e812721c4e0
Reviewed-on: https://code.wireshark.org/review/23697
Reviewed-by: Guy Harris <guy@alum.mit.edu>
23 months agopidl:NDR/Parser: fix "skip" for pointers
Guy Harris [Mon, 25 Sep 2017 03:00:16 +0000 (20:00 -0700)]
pidl:NDR/Parser: fix "skip" for pointers

Pick up change from Samba:

    commit 3bc6b55385894691792962ecc15978a3b158eca4
    Author: Stefan Metzmacher <metze@samba.org>
    Date:   Mon Jun 19 12:15:21 2017 +0200

        pidl:NDR/Parser: fix "skip" for pointers

        We should handle the "skip" at the element level before
        we traverse trough the element levels.

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
Change-Id: I8b52e1ad0e0ad2c8a4fc20b94f07441b458e5638
Reviewed-on: https://code.wireshark.org/review/23696
Reviewed-by: Guy Harris <guy@alum.mit.edu>
23 months agopidl: use ndr_push_charset_to_null() when [to_null] keyword is used in IDL
Guy Harris [Mon, 25 Sep 2017 02:57:35 +0000 (19:57 -0700)]
pidl: use ndr_push_charset_to_null() when [to_null] keyword is used in IDL

Pick up change from Samba:

    commit d30b008a642c9bb0d85519f42aef56a53e44cc77
    Author: Günther Deschner <gd@samba.org>
    Date:   Mon Jan 23 14:50:45 2017 +0100

        pidl: use ndr_push_charset_to_null() when [to_null] keyword is used in IDL

        Guenther

Signed-off-by: Guenther Deschner <gd@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Change-Id: I26d53e3c4d0aa9fc959f2d9f0455e480c6cd45e2
Reviewed-on: https://code.wireshark.org/review/23695
Reviewed-by: Guy Harris <guy@alum.mit.edu>
23 months agos4: COM: Remove talloc_autofree_context() from (unused) COM code.
Guy Harris [Mon, 25 Sep 2017 02:54:34 +0000 (19:54 -0700)]
s4: COM: Remove talloc_autofree_context() from (unused) COM code.

Pick up change from Samba:

    commit fe2ac3e304201d18ca15d388b622a4f15f72ad0a
    Author: Jeremy Allison <jra@samba.org>
    Date:   Mon Jul 24 12:00:21 2017 -0700

        s4: COM: Remove talloc_autofree_context() from (unused) COM code.

        BUG: https://bugzilla.samba.org/show_bug.cgi?id=12932

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Change-Id: I44a4e3794569957c3cdf0721e78e73972ba06085
Reviewed-on: https://code.wireshark.org/review/23694
Reviewed-by: Guy Harris <guy@alum.mit.edu>
23 months agopidl: Make static struct api_struct also const
Guy Harris [Mon, 25 Sep 2017 02:45:41 +0000 (19:45 -0700)]
pidl: Make static struct api_struct also const

Pick up change from Samba:

    commit c6c1463852533ed8234911835b8b1fce29b2d3d8
    Author: Andrew Bartlett <abartlet@samba.org>
    Date:   Mon Nov 21 11:58:07 2016 +1300

        pidl: Make static struct api_struct also const

        This moves the table to read-only memory

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
Change-Id: I2a7ce154dff4584c5db445cfd789a8c4f928a338
Reviewed-on: https://code.wireshark.org/review/23693
Reviewed-by: Guy Harris <guy@alum.mit.edu>
23 months agopidl: Change *_get_pipe_fns() to return const struct api_struct *
Guy Harris [Mon, 25 Sep 2017 02:43:42 +0000 (19:43 -0700)]
pidl: Change *_get_pipe_fns() to return const struct api_struct *

Pick up change from Samba:

    commit d368ee2298bc472caca940a3db7a4f855df6ca21
    Author: Andrew Bartlett <abartlet@samba.org>
    Date:   Mon Nov 21 11:57:48 2016 +1300

        pidl: Change *_get_pipe_fns() to return const struct api_struct *

        This will allow the table to be made static const in the next commit

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
Change-Id: Ib8cecaf695ccf70a78f97152e3286723cbc233ec
Reviewed-on: https://code.wireshark.org/review/23692
Reviewed-by: Guy Harris <guy@alum.mit.edu>
23 months agopidl:NDR: add ReturnTypeElement() helper function
Guy Harris [Mon, 25 Sep 2017 01:33:56 +0000 (18:33 -0700)]
pidl:NDR: add ReturnTypeElement() helper function

Pick up change from Samba:

    commit d5e4707e98f3613acebb9d0de7e6f944f0b1efaf
    Author: Stefan Metzmacher <metze@samba.org>
    Date:   Tue Sep 13 09:06:50 2016 +0200

        pidl:NDR: add ReturnTypeElement() helper function

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
Change-Id: I3f4c8fb9b18ee10b031d9c58209d1c6c45bbec63
Reviewed-on: https://code.wireshark.org/review/23691
Reviewed-by: Guy Harris <guy@alum.mit.edu>
23 months agopidl:NDR: keep interface->{ORIGINAL}
Guy Harris [Mon, 25 Sep 2017 01:32:09 +0000 (18:32 -0700)]
pidl:NDR: keep interface->{ORIGINAL}

Pick up change from Samba:

    commit 7423d8106ef08b94821f5fc666892234feff6f05
    Author: Stefan Metzmacher <metze@samba.org>
    Date:   Tue Sep 13 07:57:25 2016 +0200

        pidl:NDR: keep interface->{ORIGINAL}

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
Change-Id: I8f088a7bbbdbd756a0d28169f8ed00f99d9a8cc3
Reviewed-on: https://code.wireshark.org/review/23690
Reviewed-by: Guy Harris <guy@alum.mit.edu>
23 months agoWindows: fix NSIS and WiX installers
Pascal Quantin [Sun, 24 Sep 2017 21:07:13 +0000 (23:07 +0200)]
Windows: fix NSIS and WiX installers

Change-Id: I10f21de6ee9cf403690c66d02cbbd43ebb9d52bc
Reviewed-on: https://code.wireshark.org/review/23689
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
23 months agoGTK: Fix warning for missing action
João Valverde [Sun, 24 Sep 2017 18:05:42 +0000 (19:05 +0100)]
GTK: Fix warning for missing action

(wireshark-gtk:17990): Gtk-WARNING **: 29WestUIMStreamFlowGraph: missing action /Statistics/29West/UIM/StreamFlowGraph

Change-Id: I02bd6a172390ac072485cf2158b7c5205fd11ee2
Fixes: b5759cafae8f1cf852f39fe68accd126d40955cb
Reviewed-on: https://code.wireshark.org/review/23678
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
23 months agosharkd: close server file descriptor in child.
Jakub Zawadzki [Sun, 24 Sep 2017 15:00:29 +0000 (17:00 +0200)]
sharkd: close server file descriptor in child.

Change-Id: I65713f6d49fccb2045a99636d0d2f1aa5be44b83
Reviewed-on: https://code.wireshark.org/review/23677
Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Jakub Zawadzki <darkjames-ws@darkjames.pl>
23 months agoReplace DISSECTOR_ASSERT(hfinfo->type == FT_STRING) with DISSECTOR_ASSERT_FIELD_TYPE.
Guy Harris [Sun, 24 Sep 2017 20:01:49 +0000 (13:01 -0700)]
Replace DISSECTOR_ASSERT(hfinfo->type == FT_STRING) with DISSECTOR_ASSERT_FIELD_TYPE.

That produces better error messages, giving the name of the offending
field.

Change-Id: I155ac29c68ecd7811cc9752980db9cdc37fea72e
Reviewed-on: https://code.wireshark.org/review/23685
Reviewed-by: Guy Harris <guy@alum.mit.edu>
23 months agoMove DISSECTOR_ASSERT_FIELD_TYPE_IS_TIME after __DISSECTOR_ASSERT_FIELD_TYPE_IS_TIME().
Guy Harris [Sun, 24 Sep 2017 19:36:53 +0000 (12:36 -0700)]
Move DISSECTOR_ASSERT_FIELD_TYPE_IS_TIME after __DISSECTOR_ASSERT_FIELD_TYPE_IS_TIME().

That's consistent with the other DISSECTOR_ASSERT_FIELD_TYPE... macros.

Change-Id: I1f5711b29ae8a440b0529373eb7903ff122ea18e
Reviewed-on: https://code.wireshark.org/review/23681
Reviewed-by: Guy Harris <guy@alum.mit.edu>
23 months agoUse proto_tree_add_ipv4(), not proto_tree_add_uint(), to add FT_IPV4 fields.
Guy Harris [Sun, 24 Sep 2017 19:03:31 +0000 (12:03 -0700)]
Use proto_tree_add_ipv4(), not proto_tree_add_uint(), to add FT_IPV4 fields.

Change-Id: I178171e03d0ab7bedfeb9f04be01de22f7c177d4
Reviewed-on: https://code.wireshark.org/review/23679
Reviewed-by: Guy Harris <guy@alum.mit.edu>
23 months agosharkd: don't go to background when using stdin and stdout.
Jakub Zawadzki [Sun, 24 Sep 2017 11:08:13 +0000 (13:08 +0200)]
sharkd: don't go to background when using stdin and stdout.

Patch will allow to use stdin/stdout on other than windows platforms.

Change-Id: I729ebd4efaa1675956b085e74b413805125a7d7a
Reviewed-on: https://code.wireshark.org/review/23676
Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Jakub Zawadzki <darkjames-ws@darkjames.pl>
23 months agoautotools: Use package flags to configure libpcap
João Valverde [Thu, 31 Aug 2017 13:39:30 +0000 (14:39 +0100)]
autotools: Use package flags to configure libpcap

Change-Id: Icd64014b597a8e60d2aff9d180c441c6ffccff26
Reviewed-on: https://code.wireshark.org/review/23329
Reviewed-by: João Valverde <j@v6e.pt>
23 months agoCMake: Print build flags just before feature summary
João Valverde [Sun, 24 Sep 2017 08:19:54 +0000 (09:19 +0100)]
CMake: Print build flags just before feature summary

Change-Id: I79cc1df1eb04c5ed9bed722f07fdea7db2adcede
Reviewed-on: https://code.wireshark.org/review/23674
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>
23 months agoCMake: Pretty print PACKAGELIST
João Valverde [Sun, 24 Sep 2017 08:31:12 +0000 (09:31 +0100)]
CMake: Pretty print PACKAGELIST

Change-Id: Ib87e0d4111f466e660435acf871036c0f1bb1555
Reviewed-on: https://code.wireshark.org/review/23673
Reviewed-by: João Valverde <j@v6e.pt>
23 months agoInstall libwiretap and libwscodecs headers
João Valverde [Sat, 23 Sep 2017 20:47:02 +0000 (21:47 +0100)]
Install libwiretap and libwscodecs headers

Change-Id: Ie7376ac5fd8a950e3c1c744ce4701b14ee1849ea
Reviewed-on: https://code.wireshark.org/review/23664
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>
23 months ago[Automatic update for 2017-09-24]
Gerald Combs [Sun, 24 Sep 2017 08:06:56 +0000 (08:06 +0000)]
[Automatic update for 2017-09-24]

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

Change-Id: Iad48b3a81e83cf56ccec6cfb9075169379a775f4
Reviewed-on: https://code.wireshark.org/review/23669
Reviewed-by: Gerald Combs <gerald@wireshark.org>
23 months agomegaco: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
Alexis La Goutte [Sun, 24 Sep 2017 06:14:03 +0000 (08:14 +0200)]
megaco: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang

Change-Id: Ie85aa5806d3766c386970e8285a0755b61fca489
Reviewed-on: https://code.wireshark.org/review/23668
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>
23 months agoDon't use proto_tree_add_uint() with FT_BYTES.
Guy Harris [Sun, 24 Sep 2017 06:01:15 +0000 (23:01 -0700)]
Don't use proto_tree_add_uint() with FT_BYTES.

Change-Id: Ic647f39824e3d18a1a8d1aaef997ccd41db445c0
Reviewed-on: https://code.wireshark.org/review/23667
Reviewed-by: Guy Harris <guy@alum.mit.edu>
23 months agoGPRSCDR: decoding of PDPType
Joakim Karlsson [Sat, 23 Sep 2017 11:32:10 +0000 (13:32 +0200)]
GPRSCDR: decoding of PDPType

Change-Id: Iec007c5276e30c982e776263ef753c002e2a9c72
Reviewed-on: https://code.wireshark.org/review/23660
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
23 months agoDon't look at the comment or process table with pre-2.2 files.
Guy Harris [Sun, 24 Sep 2017 00:35:54 +0000 (17:35 -0700)]
Don't look at the comment or process table with pre-2.2 files.

NetMon apparently didn't zero out the file header, so those fields have
random values in pre-2.2.

Change-Id: I3aeede6ab273d57ca937a5e18e67223fb4ed18da
Reviewed-on: https://code.wireshark.org/review/23666
Reviewed-by: Guy Harris <guy@alum.mit.edu>
23 months agoWebSocket: remove useless pointer checks (CID 1418346)
Pascal Quantin [Sat, 23 Sep 2017 19:56:24 +0000 (21:56 +0200)]
WebSocket: remove useless pointer checks (CID 1418346)

websocket_conv is always allocated

Change-Id: Ic119e22ee37703ccea2a42e53d6616faa0901cf9
Reviewed-on: https://code.wireshark.org/review/23662
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>
23 months agoPFCP: fix a typo (CID 1418345)
Pascal Quantin [Sat, 23 Sep 2017 19:47:48 +0000 (21:47 +0200)]
PFCP: fix a typo (CID 1418345)

Change-Id: If87fa31dc4933f0b54946910559b4260424848e7
Reviewed-on: https://code.wireshark.org/review/23661
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>
23 months agoAdd lcap file extension to nsis and wix installers.
Joerg Mayer [Fri, 22 Sep 2017 12:50:38 +0000 (14:50 +0200)]
Add lcap file extension to nsis and wix installers.

Also add ntar file extention to wix installer to match nsis

Change-Id: Idb6f660fda27c6ad3c3cd70acd482eafa2c14307
Reviewed-on: https://code.wireshark.org/review/23656
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: Jörg Mayer <jmayer@loplof.de>
23 months agoplugins: Fixups for g9260461f4f
João Valverde [Fri, 22 Sep 2017 18:13:33 +0000 (19:13 +0100)]
plugins: Fixups for g9260461f4f

Put plugins in CMake build dir with a version subdir. This avoids some
weird special cases, however running with autotools from build dir
displays the wrong global folder in about->folders. Unfortunately
the hack to run from the autotools build dir is troublesome.

Various fixes for Windows builds.

Try to fix also build dir issue loading plugins on macOS with
ENABLE_APPLICATION_BUNDLE (blind).

Change-Id: Ic3c7c21f5850c12a53844202d61fa0592b45739c
Reviewed-on: https://code.wireshark.org/review/23657
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Reviewed-by: João Valverde <j@v6e.pt>
23 months agoZigBee ZCL SE Metering: Dissect functional notification flags and notification flags...
Martin Boye Petersen [Thu, 21 Sep 2017 15:04:23 +0000 (17:04 +0200)]
ZigBee ZCL SE Metering: Dissect functional notification flags and notification flags 2 to 5

Change-Id: Ia79c3e2609247846731a4b375b198702f06954de
Reviewed-on: https://code.wireshark.org/review/23649
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
23 months agoHave sequence analysis properly use filters from taps.
Michael Mann [Sat, 23 Sep 2017 01:57:50 +0000 (21:57 -0400)]
Have sequence analysis properly use filters from taps.

Sequence analysis has its own "filtering" system that required its
tap functions to look for some "filter flags".  register_tap_listener()
already comes with a filter argument, so use that to simplify logic
of tap functions in dissectors.
Also have Qt GUI for Flow Graph look like other dialogs that have a
"Limit to display filter" checkbox.

Change-Id: I91d9d9599309786892f5b50c98692e52651e7174
Reviewed-on: https://code.wireshark.org/review/23659
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
23 months agoRevert "CMake: Print a warning if CCACHE_CPP2 is unset."
Gerald Combs [Fri, 22 Sep 2017 22:08:26 +0000 (22:08 +0000)]
Revert "CMake: Print a warning if CCACHE_CPP2 is unset."

CCACHE_CPP2 / run_second_cpp is enabled by default in ccache 3.3 and later. (Unfortunately our builders have 3.2.4 installed.)

This reverts commit ed1ecfb39cf0f3344810fabb7a1b855d373aa0a8.

Change-Id: I3cc88fa70bb04db5ae254bc9b878ce379e47527d
Reviewed-on: https://code.wireshark.org/review/23658
Reviewed-by: Gerald Combs <gerald@wireshark.org>
23 months agonsis: Always create the extcap directory
Stig Bjørlykke [Fri, 22 Sep 2017 10:46:29 +0000 (12:46 +0200)]
nsis: Always create the extcap directory

Change-Id: I6955c242036c3aa76be4ceb545905ffeef906518
Reviewed-on: https://code.wireshark.org/review/23654
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
23 months agoZigBee ZCL Attributes: Set length of attribute subtrees
Martin Boye Petersen [Thu, 21 Sep 2017 21:46:33 +0000 (23:46 +0200)]
ZigBee ZCL Attributes: Set length of attribute subtrees

Set length of attribute subtree by setting the end after the attribute has been dissected

Change-Id: Ic8bb66206658525635c08f807651a37369d16f6a
Reviewed-on: https://code.wireshark.org/review/23651
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
23 months agoCMake: Print a warning if CCACHE_CPP2 is unset.
Gerald Combs [Wed, 20 Sep 2017 23:19:04 +0000 (16:19 -0700)]
CMake: Print a warning if CCACHE_CPP2 is unset.

If we're compiling with clang and ccache, print a warning if CCACHE_CPP2
is unset. Doing so avoids generating a bunch of unwanted output when
warnings are enabled.

Change-Id: I6a796e8b910074ffa028ea45bc639b9461e1629e
Reviewed-on: https://code.wireshark.org/review/23646
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>
23 months agoAdd Flow Graph functionality to TShark
Michael Mann [Fri, 22 Sep 2017 03:20:03 +0000 (23:20 -0400)]
Add Flow Graph functionality to TShark

Add flow graph functionality to tshark through -z option.
Output is same as ASCII format saved from GUI.

Change-Id: Iee0bfea7215858e6488b4728581be28287e9ea1a
Reviewed-on: https://code.wireshark.org/review/23652
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>
23 months agoComplete move of tap-sequence-analysis.c functionality to sequence_analysis.c
Michael Mann [Thu, 21 Sep 2017 15:28:26 +0000 (11:28 -0400)]
Complete move of tap-sequence-analysis.c functionality to sequence_analysis.c

Since dissectors are now populating the timestamp of the seq_analysis_item_t
structure within the tap function, don't have the sequence_anaylsis redo it
when writing an ASCII file.  This removes the need for the capture_file
parameter and simplifies the logic a bit.

Also just have GUI register the tap itself.  It will provide for some more
flexibility in the future.

Change-Id: I55b2f951b977ea70ac9f7eb4929245b0779e5f0e
Reviewed-on: https://code.wireshark.org/review/23650
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
23 months agoDiameter 3GPP: update S6a/S6d/S13/S13' AVPs
Pascal Quantin [Thu, 21 Sep 2017 13:40:40 +0000 (15:40 +0200)]
Diameter 3GPP: update S6a/S6d/S13/S13' AVPs

Change-Id: Ief76bcd529576ccd5324efb042acc4cad7d79c9b
Reviewed-on: https://code.wireshark.org/review/23648
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
23 months ago[PFCP] Add more IE dissection.
AndersBroman [Thu, 21 Sep 2017 13:07:27 +0000 (15:07 +0200)]
[PFCP] Add more IE dissection.

Change-Id: I6fa21972bf937e92a0907c3cc544239e759659f9
Reviewed-on: https://code.wireshark.org/review/23647
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>
2 years agopacketlogger: Add Syslog and Config types
Stig Bjørlykke [Wed, 20 Sep 2017 13:11:50 +0000 (15:11 +0200)]
packetlogger: Add Syslog and Config types

Change-Id: I2b023283a004c4dd80e0afb1077493612c1cecc6
Reviewed-on: https://code.wireshark.org/review/23642
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2 years agocmake: look for Qt5 from Homebrew on macOS
Peter Wu [Sun, 27 Aug 2017 13:39:50 +0000 (14:39 +0100)]
cmake: look for Qt5 from Homebrew on macOS

When Qt5 is installed using Homebrew on macOS, Qt5 is not available in
the default prefix. Remove the hack from macos-setup-brew.sh and adjust
the search path instead. Note that is needed for development, "brew
install" has already set this option in the environment.

See https://github.com/Homebrew/homebrew-core/issues/8392

Change-Id: I57ea09b649a94c9a4cb18b1b2d334808e47ec27e
Reviewed-on: https://code.wireshark.org/review/23232
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2 years agoUMTS RLC: Removing unused 'is ciphered' function
Darien Spencer [Fri, 18 Aug 2017 07:03:06 +0000 (10:03 +0300)]
UMTS RLC: Removing unused 'is ciphered' function

All calls to this function were commented out in a previous commit.
Also dealing with the state of the payload (ciphred or not) should be done within the RLC dissector

Change-Id: Ice3a3ca8392d73c7b67308537d7568ab71a98b5e
Reviewed-on: https://code.wireshark.org/review/23644
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>
2 years agoFP: Removed unused code
Darien Spencer [Wed, 20 Sep 2017 19:48:22 +0000 (22:48 +0300)]
FP: Removed unused code

Removed old code which checked if frames are
ciphered and was '#if 0'ed.
Corresponding logic was implemented in the
RLC dissector in a previous commit.

Change-Id: Ie362771277b5c0b41e790c0297ded5ed91f813e2
Reviewed-on: https://code.wireshark.org/review/23645
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>
2 years agoplugins: Add backward compatibility for personal lua scripts
João Valverde [Tue, 19 Sep 2017 11:12:31 +0000 (12:12 +0100)]
plugins: Add backward compatibility for personal lua scripts

Relax requirements for upgrades and make running side-by-side installations
more convenient.

Change-Id: I5299eed005a4748c54465dec90f477adb577e056
Reviewed-on: https://code.wireshark.org/review/23619
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>
2 years agoplugins: Be more descriptive in "about wireshark"->"folders"
João Valverde [Mon, 18 Sep 2017 15:25:20 +0000 (16:25 +0100)]
plugins: Be more descriptive in "about wireshark"->"folders"

Display separate entries for binary plugins and lua scripts.

This is explained in the user guide, that the binary folder is
a subfolder of the lua folder, but it's probably a good idea to be more
explicit about it, at the risk of cluttering the interface a bit.

Move GeoIP information down because it seems the least important.

Add helper functions to provide plugin version subdir.

Change some #ifdefs while at it for legibility.

Change-Id: Ieb8665df029b3c14de19e2c973bd9b1cc4ec4621
Reviewed-on: https://code.wireshark.org/review/23609
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>
2 years ago[MEGACO] In dissect_megaco_eventsdescriptor() check for dm(DigitMap) not
AndersBroman [Wed, 20 Sep 2017 14:08:56 +0000 (16:08 +0200)]
[MEGACO] In dissect_megaco_eventsdescriptor() check for dm(DigitMap) not
only d as it may get confused with dt(delayTime).

Change-Id: Ie5ac2a117f2d9e4a231d8ee15c795b3abdc4da07
Reviewed-on: https://code.wireshark.org/review/23643
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>
2 years agotibia: fix 'tibia.vip' exists multiple times with NOT compatible types: FT_BOOLEAN...
Alexis La Goutte [Wed, 20 Sep 2017 11:46:01 +0000 (11:46 +0000)]
tibia: fix 'tibia.vip' exists multiple times with NOT compatible types: FT_BOOLEAN and FT_UINT32

Change-Id: Icd9171d01ba06faf2e109879de2f5685ac5964bc
Reviewed-on: https://code.wireshark.org/review/23638
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>
2 years agomessageanalyzer: fix 'etw.ndis.packet_metadata.wifi_channel' exists multiple times...
Alexis La Goutte [Wed, 20 Sep 2017 11:54:55 +0000 (11:54 +0000)]
messageanalyzer: fix 'etw.ndis.packet_metadata.wifi_channel' exists multiple times with NOT compatible types: FT_INT32 and FT_UINT32

Change-Id: I402eb393da5a4cfd4fa19e4f3166bcf9ee058f96
Reviewed-on: https://code.wireshark.org/review/23641
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>