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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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 ed1ecfb39c.
Change-Id: I3cc88fa70bb04db5ae254bc9b878ce379e47527d
Reviewed-on: https://code.wireshark.org/review/23658
Reviewed-by: Gerald Combs <gerald@wireshark.org>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
Create and stash version.conf before archiving our repository. This
makes git-export-release behave more like the current Autotools dist
target.
Make sure the `git describe` command in git-export-release and
make-version.pl use the same match pattern and abbreviation length.
Abbreviate to 8 characters. That's our current unique minimum according
to the git-unique-abbrev script at
https://blog.cuviper.com/2013/11/10/how-short-can-git-abbreviate/ :
516409 objects
4: 516194 / 65293
5: 200900 / 92205
6: 15979 / 7957
7: 1038 / 519
8: 74 / 37
9: 0 / 0
Change-Id: Id2279a59a2e24a9ecd816458f399bcd2b4c94185
Reviewed-on: https://code.wireshark.org/review/23344
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Michael Mann <mmann78@netscape.net>
