aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2017-09-25pidl:Python: replace pytalloc_CObject_FromTallocPtr() with ↵Guy Harris1-9/+11
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>
2017-09-25BUG: https://bugzilla.samba.org/show_bug.cgi?id=12601Guy Harris1-1/+7
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>
2017-09-25pidl:Python: add PyTypeObject objects for function structsGuy Harris1-1/+477
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>
2017-09-25pidl:Python: split out a PythonElementGetSet() helper functionGuy Harris1-29/+35
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>
2017-09-25pidl:Python: the py_{import,export}_*() functions can be static now.Guy Harris1-4/+2
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>
2017-09-25pidl:Python: make use of the pyrpc_{import,export}_union() functionsGuy Harris1-7/+25
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>
2017-09-25pidl:Python: provide a PyTypeObject with METH_CLASS __import__() and ↵Guy Harris1-0/+214
__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>
2017-09-25pidl:Python: provide the abstract syntax as <module>.<interface>_abstract_syntaxGuy Harris1-12/+34
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>
2017-09-25pidl:Python: prettify names of constantsGuy Harris1-2/+2
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>
2017-09-25pidl:Python: improve the .doc string for the get/set elementsGuy Harris1-1/+1
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>
2017-09-25pidl:Python: make use of NDR_ERR_CODE_IS_SUCCESS()Guy Harris1-2/+2
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>
2017-09-25pidl:Python: __ndr_print__ functions don't get arguments and need METH_NOARGSGuy Harris1-1/+1
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>
2017-09-25pidl:Python: check the return values of talloc_ptrtype()Guy Harris1-0/+18
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>
2017-09-25lib: modules: Change XXX_init interface from XXX_init(void) to ↵Guy Harris1-2/+2
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>
2017-09-25s4-rpc_server: Allow each interface to declare if it uses handlesGuy Harris1-8/+13
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>
2017-09-25s4-rpc_server: Add back support for lsa over \\pipe\\netlogon optionallyGuy Harris1-1/+4
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>
2017-09-25pidl: Make dcesrv\_$name\_interface "static const"Guy Harris1-1/+1
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>
2017-09-25pidl: Use a static const initialised struct in dcerpc_server_$name_init(void)Guy Harris1-9/+8
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>
2017-09-25libndr/compression: pass down compressed length in ndr_pull_compression_startGuy Harris1-1/+2
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>
2017-09-25pidl:NDR/Parser: add missing {start,end}_flags() to ParseElementPrint()Guy Harris1-0/+4
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>
2017-09-25pidl:NDR/Parser: initialize [skip] values in ndr_pull_*Guy Harris1-0/+3
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>
2017-09-25pidl:NDR/Parser: add "skip_noinit" elementGuy Harris2-6/+7
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>
2017-09-25pidl:NDR/Parser: fix "skip" for pointersGuy Harris1-10/+30
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>
2017-09-25pidl: use ndr_push_charset_to_null() when [to_null] keyword is used in IDLGuy Harris1-1/+5
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>
2017-09-25s4: COM: Remove talloc_autofree_context() from (unused) COM code.Guy Harris1-3/+3
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>
2017-09-25pidl: Make static struct api_struct also constGuy Harris1-1/+1
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>
2017-09-25pidl: Change *_get_pipe_fns() to return const struct api_struct *Guy Harris1-3/+3
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>
2017-09-25pidl:NDR: add ReturnTypeElement() helper functionGuy Harris1-1/+20
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>
2017-09-25pidl:NDR: keep interface->{ORIGINAL}Guy Harris1-1/+2
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>
2017-09-24Windows: fix NSIS and WiX installersPascal Quantin2-28/+28
Change-Id: I10f21de6ee9cf403690c66d02cbbd43ebb9d52bc Reviewed-on: https://code.wireshark.org/review/23689 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2017-09-24GTK: Fix warning for missing actionJoão Valverde1-1/+0
(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>
2017-09-24sharkd: close server file descriptor in child.Jakub Zawadzki1-0/+1
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>
2017-09-24Replace DISSECTOR_ASSERT(hfinfo->type == FT_STRING) with ↵Guy Harris3-4/+4
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>
2017-09-24Move DISSECTOR_ASSERT_FIELD_TYPE_IS_TIME after ↵Guy Harris1-7/+7
__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>
2017-09-24Use proto_tree_add_ipv4(), not proto_tree_add_uint(), to add FT_IPV4 fields.Guy Harris1-2/+2
Change-Id: I178171e03d0ab7bedfeb9f04be01de22f7c177d4 Reviewed-on: https://code.wireshark.org/review/23679 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-09-24sharkd: don't go to background when using stdin and stdout.Jakub Zawadzki1-10/+13
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>
2017-09-24autotools: Use package flags to configure libpcapJoão Valverde8-72/+84
Change-Id: Icd64014b597a8e60d2aff9d180c441c6ffccff26 Reviewed-on: https://code.wireshark.org/review/23329 Reviewed-by: João Valverde <j@v6e.pt>
2017-09-24CMake: Print build flags just before feature summaryJoão Valverde1-6/+7
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>
2017-09-24CMake: Pretty print PACKAGELISTJoão Valverde1-1/+2
Change-Id: Ib87e0d4111f466e660435acf871036c0f1bb1555 Reviewed-on: https://code.wireshark.org/review/23673 Reviewed-by: João Valverde <j@v6e.pt>
2017-09-24Install libwiretap and libwscodecs headersJoão Valverde5-9/+43
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>
2017-09-24[Automatic update for 2017-09-24]Gerald Combs27-886/+699
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>
2017-09-24megaco: Fix Dead Store (Dead assignement/Dead increment) Warning found by ClangAlexis La Goutte1-2/+0
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>
2017-09-24Don't use proto_tree_add_uint() with FT_BYTES.Guy Harris1-1/+1
Change-Id: Ic647f39824e3d18a1a8d1aaef997ccd41db445c0 Reviewed-on: https://code.wireshark.org/review/23667 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-09-24GPRSCDR: decoding of PDPTypeJoakim Karlsson7-10/+71
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>
2017-09-24Don't look at the comment or process table with pre-2.2 files.Guy Harris1-6/+17
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>
2017-09-23WebSocket: remove useless pointer checks (CID 1418346)Pascal Quantin1-2/+2
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>
2017-09-23PFCP: fix a typo (CID 1418345)Pascal Quantin1-4/+4
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>
2017-09-23Add lcap file extension to nsis and wix installers.Joerg Mayer4-3/+40
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>
2017-09-23plugins: Fixups for g9260461f4fJoão Valverde6-10/+11
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>
2017-09-23ZigBee ZCL SE Metering: Dissect functional notification flags and ↵Martin Boye Petersen1-7/+602
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>