aboutsummaryrefslogtreecommitdiffstats
path: root/CMakeLists.txt
AgeCommit message (Collapse)AuthorFilesLines
2017-04-15CMake: include PKG_INCLUDE_DIR if PKG_INCLUDE_DIRS is undefinedAhmad Fatoum1-0/+3
FindLibXml2.cmake populates LIBXML2_INCLUDE_DIR and leaves LIBXML2_INCLUDE_DIRS undefined. Libxml2 inclusion as optional dependency is suggested in Change-Id I13c0a2f408fb5c21bad7ab3d7971e0fa8ed7d783. Change-Id: If49c778230e99af4b2ebb97dcb2f8acb4b55aa88 Reviewed-on: https://code.wireshark.org/review/21109 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2017-04-14Functions that put large amounts of static data onto the stack may beJoerg Mayer1-0/+4
worth looking at every now and then. The value of 16384 is the same as the default in VS. Change-Id: I68fd51e373437088f59c1e197d1a889f856caded Reviewed-on: https://code.wireshark.org/review/21030 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>
2017-04-12Add -Wduplicated-branches to extra warningsAlexis La Goutte1-0/+4
Change-Id: I11d60b4405f4fde039affcdeebb13a3ceb2aded6 Reviewed-on: https://code.wireshark.org/review/20428 Petri-Dish: Peter Wu <peter@lekensteyn.nl> 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>
2017-04-09Move the filter file reading code to libui.Guy Harris1-4/+1
It doesn't belong in libwireshark, as it doesn't affect dissection, but it *does* belong in libui, as it's helper code for the UIs. Change-Id: I8a5e0640a299a08e9ec1917dd253197438ebfdbc Reviewed-on: https://code.wireshark.org/review/20974 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-04-08Link dftest with libui.Guy Harris1-1/+1
No need to select one source file from libui and build it independently; just go ahead and link. Change-Id: I7ae5d8f9b83832518a4fb3430cb348e8c4d6b7ab Reviewed-on: https://code.wireshark.org/review/20968 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-04-08Link rawshark with libui.Guy Harris1-1/+1
No need to select one source file from libui and build it independently; just go ahead and link. Change-Id: Ie451b736411bcdac52ccde56f329c933a0065ead Reviewed-on: https://code.wireshark.org/review/20967 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-04-05A bunch of "{Mac} OS X" -> "macOS" changes.Guy Harris1-14/+16
Avoid anachronisms, however; there was no "macOS 10.0" or even "OS X 10.0", for example. It was "Mac OS X" until 10.8 (although 10.7 was sometimes called "OS X" and sometimes called "Mac OS X"), and it was "OS X" from 10.8 to 10.11. Change-Id: Ie4a848997dcc6c45c2245c1fb84ec526032375c3 Reviewed-on: https://code.wireshark.org/review/20933 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-04-04cmake: add feature info for yappMartin Kaiser1-0/+1
Explain what it is and where to get it from. Change-Id: I0a02f1c3c25b76772dddda95d8e6c410b595c036 Reviewed-on: https://code.wireshark.org/review/20886 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-03-19Remove echld/.Joerg Mayer1-4/+0
It has been unsupported for some years and when talking about removing it in the past I received some positive and no negative feedback. There is one instance of echld left: capchild/capture_sync.c: * echld might have already reaped the child. Can that case be removed or should be comment be updated to something more accurate? (left for a separate patch) Change-Id: Idac397158dd86fd0728eb95379449ee4a463fc28 Reviewed-on: https://code.wireshark.org/review/20619 Petri-Dish: Jörg Mayer <jmayer@loplof.de> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-03-02Rewrite dissectors to use Libgcrypt functions.Erik de Jong1-0/+1
As discussed on the mailinglist, rewriting dissectors to use Libgcrypt functions as Libgcrypt will be mandatory after change 20030. Removal of following functions: - crypt_md4 - crypt_rc4* - aes_cmac_encrypt_* - md5_* - sha1_* - sha256_* Further candidates: - aes_* - rijndael_* - ... Added functions: - ws_hmac_buffer Added const macros: - HASH_MD5_LENGTH - HASH_SHA1_LENGTH Changes on epan/crypt/* verified with captures from https://wiki.wireshark.org/HowToDecrypt802.11 Changes on packet-snmp.c and packet-radius.c verified with captures from https://wiki.wireshark.org/SampleCapture Changes on packet-tacacs.c verified with capture from http://ccie-in-3-months.blogspot.nl/2009/04/decoding-login-credentials-regardless.html Change-Id: Iea6ba2bf207cf0f1bf2117068fb1abcfeaafaa46 Link: https://www.wireshark.org/lists/wireshark-dev/201702/msg00011.html Reviewed-on: https://code.wireshark.org/review/20095 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2017-02-24PluginIF: AdditionalToolbarRoland Knall1-0/+9
Creates an interface for plugins and other parts of the code, to add a new toolbar to the system and have various widget types interact with this toolbar. All toolbars added via this interface, will be added to an additional submenu called "Additional Toolbars" within Wireshark. Also a demo plugin is being provided, demonstrating various features of the toolbar, including updating the gui elements. It also demonstrates how to update toolbar items. Change-Id: I8d0351224b3d7f4b90220d58970b51695551d7e3 Reviewed-on: https://code.wireshark.org/review/19803 Petri-Dish: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Roland Knall <rknall@gmail.com>
2017-02-21cmake: Add some missing SET_FEATURE_INFOAlexis La Goutte1-1/+3
for nghttp2, lz4, snappy Change-Id: I0788c2105b69ba2ae781709fb5e16e13b5ca1533 Reviewed-on: https://code.wireshark.org/review/20200 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-02-21cmake: SET_FEATURE_INFO don't need to add www: for URLAlexis La Goutte1-2/+2
Change-Id: If01c008690dc1956b42d63d67942414063f3e76c Reviewed-on: https://code.wireshark.org/review/20199 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-02-16Qt: Warn the user about DBAR 1.8 on Windows.Gerald Combs1-0/+1
At startup, dig through the registry looking for shell extensions. If any of them match known Dell Backup and Recovery DLL names and the DLL version matches 1.8.*.*, show the user a warning dialog. This is a bit extreme but I'm not sure what else to do. Dell is a popular computer manufacturer and bug reports keep trickling in. Change-Id: I6d1bd6c56850279356570154d231b07facb30cff Bug: 12036 Ping-bug: 12701 Ping-bug: 13414 Reviewed-on: https://code.wireshark.org/review/16861 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-02-13Make Libgcrypt a mandatory dependencyPeter Wu1-14/+10
Removed all guards for HAVE_LIBGCRYPT, change autotools and CMake to error out if it is not available. Update release notes, developer documentation and README with the new status. Clarify relation with GnuTLS in macosx-setup.sh. Install Libgcrypt via brew script. Motivation for this change is that many dissectors depend on Libgcrypt and having it optional increases the maintenance burden (there have been several compile issues in the past due to the optional status). Furthermore, wsutil has crypto code that can be replaced by Libgcrypt. Change-Id: Idf0021b8c4cd5db70b8766f7dcc2a8b3acbf042f Link: https://www.wireshark.org/lists/wireshark-dev/201702/msg00011.html Reviewed-on: https://code.wireshark.org/review/20030 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2017-01-25CMake,autotools: remove unneeded files, fixes buildPeter Wu1-1/+0
sharkd does not perform any capturing, so do not include related libraries and files. This fixes the CMake build too. Change-Id: Ie002b09dbf60070e34dacc8ae7dadee6690d4db8 Reviewed-on: https://code.wireshark.org/review/19786 Reviewed-by: Dario Lombardo <lomato@gmail.com> Tested-by: Dario Lombardo <lomato@gmail.com> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2017-01-25Add sharkd - daemon variantJakub Zawadzki1-1/+23
sharkd listens on UNIX socket and allows external clients to run commands like: loading file, analysing frames or running TAP(s). Change-Id: I443b2865e4adfd1c11f4f57d09ff7fce6b1e8766 Reviewed-on: https://code.wireshark.org/review/18208 Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Jakub Zawadzki <darkjames-ws@darkjames.pl>
2017-01-10cmake: fix empty data (Global Configuration) directoryPeter Wu1-13/+16
Color filters were somehow not loaded. It turns out that the BUILD_TIME_DATAFILE_DIR macro (for filesystem.c) was empty because DATAFILE_DIR was defined after adding the wsutil directory. Fix it by defining the variable before wsutil (but after epan). Change-Id: I0d002b79499c80a90d8fcc14b06ced26c30b0453 Fixes: v2.3.0rc0-1830-gd5fdbef7f4 ("cmake,wslua,wsutil: load files from run/ instead of source tree") Reviewed-on: https://code.wireshark.org/review/19600 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-12-28CMake,autotools: enable -Werror=implicit by defaultPeter Wu1-0/+7
The -Wimplicit error covers two warnings, trying to catch these cases: Setting a global variable without declaring its type (-Wimplicit-int): undeclared_type = 1; More importantly, -Wimplicit-function-declaration catches the case where a function is not declared (missing header, programming error, etc.). Turn these warnings into errors, most likely it will be a programming error that results in a link failure anyway. See also https://fedoraproject.org/wiki/Changes/Fedora26CFlags Also fix autotools checks not to trigger -Wimplicit-int and -Wimplicit-function-declaration (in krb5 check due to missing include). Tested on Ubuntu 16.04 (autotools & cmake) and Arch Linux (cmake), configure/cmake output and config.h are identical. Change-Id: I137284263f3b1223df6e6a893111c3640802631f Reviewed-on: https://code.wireshark.org/review/19331 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-12-25udpdump: remove libwireshark dependancy.Dario Lombardo1-1/+1
Export pdu routines have been rewritten here on purpose. Change-Id: If4879de4c98b6f20a75df158cae0cf9a80ffae57 Reviewed-on: https://code.wireshark.org/review/19384 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>
2016-12-13Build TRANSUM pluginPascal Quantin1-0/+1
Add plugin to autofoo and CMake build systems and fix errors found Add plugin to Windows installer (optional component activated by default) Change-Id: Id1b777bdee04e53076b3291f6fb68d5abad6985d Reviewed-on: https://code.wireshark.org/review/19228 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>
2016-12-06codecs: Add support for G.722 and G.726Peter Wu1-0/+15
Integrate the Spandsp library for G.722 and G.726 support. Adds support for G.722 and all eight variants of G.726. Note: this also fixes a crash in Qt (buffer overrun, reading too much data) caused by confusion of the larger output buffer (resample_buff) with the smaller input buffer (decode_buff). It was not triggered before because the sample rate was always 8k, but with the addition of the new codecs, a different sample rate became possible (16k). Fix also a crash which occurs when the RTP_STREAM_DEBUG macro is enabled and the VOIP Calls dialog is opened (the begin frame, start_fd, is not yet known and therfore a NULL dereference could occur). Passes testing (plays normally without bad RTP timing errors) with SampleCaptures files: sip-rtp-g722.pcap and sip-rtp-g726.pcap. Tested with cmake (Qt), autotools (Qt and GTK+) with ASAN enabled. Bug: 5619 Change-Id: I5661908d193927bba50901079119eeff0c04991f Reviewed-on: https://code.wireshark.org/review/18939 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-12-05cmake: Fix building with plugins disabledPeter Wu1-6/+8
When Lua is enabled, scripts can still be loaded from the plugin dir (filesystem.c uses PLUGIN_INSTALL_DIR), so be sure to set it or the cmake build fails. Change-Id: I87d2d705434052220f9619438c90905c24b2a3a6 Reviewed-on: https://code.wireshark.org/review/18976 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-12-02Enable exporting objects with tsharkMoshe Kaplan1-0/+1
A new "--export-object <protocol>,<destdir>" option is added to tshark. This required refactoring Export Object behavior in all GUIs to give the export object handling to the dissector, rather than the ui layer. Included in the refactoring was fixing some serious memory leaks in Qt Export Object dialog, crash due to memory scope issues in GTK Export Object dialog, and addition sorting column feature in Qt dialog (set up by creating a widget to manage the items that were previously leaking memory) Bug: 9319 Ping-Bug: 13174 Change-Id: I515d7662fa1f150f672b1476716f347ec27deb9b Reviewed-on: https://code.wireshark.org/review/18927 Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Tested-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-11-30Fix the build when a different version of Qt is in PATHРоман Донченко1-1/+1
When we add our Qt to PATH, prepend it so that it will be found first. Change-Id: I405496d6a08d676b5a2e0d9bd792de7ba9abe7f9 Reviewed-on: https://code.wireshark.org/review/18988 Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2016-11-18cmake: install icons and .desktop filesPeter Wu1-0/+30
Based on the install-data-local target from Makefile.am. Change-Id: Ia2ff6b90475a30ed219019fd80afd1a498e3133c Reviewed-on: https://code.wireshark.org/review/18708 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Balint Reczey <balint@balintreczey.hu> Tested-by: Balint Reczey <balint@balintreczey.hu>
2016-11-09CMake: Enable ccache for gcc and clang.Gerald Combs1-0/+10
Add an option to check for and use ccache. Disable it by default. Change-Id: Ifc928d22715b7e06e53115455b31dbeaf2ee8332 Reviewed-on: https://code.wireshark.org/review/18715 Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-11-08cmake: install missing profiles directoryPeter Wu1-0/+1
Spotted when comparing an autotools "make install" tree with the cmake one. Change-Id: I68eed5f518a72a6476c3e464a6997f0b3855144e Reviewed-on: https://code.wireshark.org/review/18713 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-10-29Revert "Instead of supressing the warning of policy 42, set MACOSX_RPATH.":Jörg Mayer1-2/+4
--------- CMake Warning (dev): Policy CMP0042 is not set: MACOSX_RPATH is enabled by default. Run "cmake --help-policy CMP0042" for policy details. Use the cmake_policy command to set the policy and suppress this warning. MACOSX_RPATH is not specified for the following targets: epan wiretap wscodecs wsutil This warning is for project developers. Use -Wno-dev to suppress it. ----------- This reverts commit 4728bc201bddc34a7834aedf65704c7aa1c9daf1. Change-Id: I7ea056d56c0352b54be5bebadc35de6173ef593f Reviewed-on: https://code.wireshark.org/review/18562 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2016-10-29Instead of supressing the warning of policy 42, set MACOSX_RPATH.Joerg Mayer1-4/+2
Fixes picking up the system libpcap instead of the one in /usr/local/lib/ Change-Id: I488c8512fc2cde145107062a6e8b7815ad764a3b Reviewed-on: https://code.wireshark.org/review/18545 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2016-10-28CMAkelists: fix typo on commentAlexis La Goutte1-1/+1
Change-Id: I572ebbbae9ac91e2d566a39d0dae462bc40bcac8 Reviewed-on: https://code.wireshark.org/review/18522 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-10-22Add SBC decoding support to WindowsPascal Quantin1-0/+7
Change-Id: Ibef872dff26c22e2834e958c496c33a5695bb131 Reviewed-on: https://code.wireshark.org/review/18394 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: Anders Broman <a.broman58@gmail.com>
2016-10-22cmake, qt4: check if QT4_FOUNDMartin Kaiser1-1/+1
AFAICS, FindQt4.cmake sets QT4_FOUND, not Qt4_FOUND This fixes compilation on Debian Wheezy (cmake 2.8.9, Qt 4.8.2). Change-Id: I08b3ac6ae4292b8c8d3f9e8752780459e5329e29 Reviewed-on: https://code.wireshark.org/review/18395 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-10-22CMake: Disable Qt4 && (Windows || macOS).Gerald Combs1-1/+4
We haven't built the Windows and macOS installers with Qt4 for quite some time. In the case of macOS+Qt4 it looks like there's a problem with the main screen size (bug 13009) and it's a safe bet that there are other problems. There's not much we can do exept say "don't do that." Do so at build time rather than after the user has installed Wireshark and is trying to use it. Change-Id: I22f47b9705ea044238046676b6336aa5feab3f60 Reviewed-on: https://code.wireshark.org/review/18364 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-10-20cmake: add dependency to build manual pagesPeter Wu1-0/+1
"add_custom_command" outputs are only available as dependency in the same directory, so create a new target such it can be used from the main directory. This fixes the OS X build with no parallelism (-j1). Change-Id: I66aa5ae307be38ee715456a05fd55f55e4fa76e9 Reviewed-on: https://code.wireshark.org/review/18299 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Roland Knall <rknall@gmail.com>
2016-10-20Officially require Qt 4.8 or newerPeter Wu1-1/+1
Since v2.3.0rc0-1002-g1cd2255, Qt 4.8 became mandatory, reflect this in the version requirements. This will not affect a lot of distributions (RHEL and SLES only had Qt 4.6). For a more complete list of supported platforms, see https://wiki.wireshark.org/Development/Support_library_version_tracking While at it, correct some other minimum versions in documentation. Change-Id: I11f2dfba72c75429f6838404a81ed3b3dc302d5f Reviewed-on: https://code.wireshark.org/review/18314 Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com> Petri-Dish: Anders Broman <a.broman58@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-10-18CQL: add LZ4/Snappy decompression support on WindowsPascal Quantin1-0/+14
Change-Id: I34374cf29357e2ed5062da1a5245b9adbabf732d Reviewed-on: https://code.wireshark.org/review/18249 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-10-17cql: add lz4 and snappy decompressionBenoît Canet1-0/+18
We do not use the STARTUP negotiation since a stream can be captured in its middle but try to decompress if the flag is present and fallback if it fails. Change-Id: Iecbf49a45220b04be7808869c9884548eb1e7694 Signed-off-by: Benoît Canet <benoit@scylladb.com> Reviewed-on: https://code.wireshark.org/review/17952 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-10-14CMakeLists: Add man filesUli Heilmeier1-2/+2
Current Wireshark.app bundle on OS X doesn't include man pages. This is the second try after commit 7da23ca1a5bba4af5e1104f4d3d3d44e918552b0 has been reverted. Now cmake gets the information that the man files are generated. Bug: 12746 Change-Id: I34dfec65bd57587ee048d7e1e2557fc9ab2b32eb Reviewed-on: https://code.wireshark.org/review/18170 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-10-13Remove nghttp2 code and use system' nghttp2Balint Reczey1-1/+11
Update debian, macos (setup / homebrew) download script Update testsuite (don't try HPACK when build without nghttp2) Change-Id: I365e5e17bc4fab4acd81b4c39ea7189a5d1ee112 Reviewed-on: https://code.wireshark.org/review/17347 Reviewed-by: Gerald Combs <gerald@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-08Revert "CMakeLists: Add man files"Uli Heilmeier1-0/+2
This reverts commit 55148a2ea470d19290d236428f3c8e725775c96a. Change-Id: If93b97933cae4d8ffd1e4cc9a635def031ab0cc6 Reviewed-on: https://code.wireshark.org/review/18123 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-10-07Disable ASAN when building lemon.Gerald Combs1-0/+6
If ASAN is enabled, use "-fno-sanitize=all" when building lemon. This keeps us from having to set ASAN_OPTIONS=detect_leaks=0 in the environment in order to build Wireshark. Change-Id: I36f6d1a4f913ecabaf188f4c2b59216c8430d81a Reviewed-on: https://code.wireshark.org/review/18098 Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-10-05CMakeLists: Add man filesUli Heilmeier1-2/+0
Current Wireshark.app bundle on OS X doesn't include man pages. Change-Id: I4123105ae805c3f127dbfd74768b88d4da546c56 Ping-Bug: 12746 Reviewed-on: https://code.wireshark.org/review/17902 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-09-30cmake: make WERROR_COMMON_FLAGS a normal stringPeter Wu1-10/+7
Instead of checking for the boolean "FALSE", just set an empty string. This avoids the need to check for WERROR_COMMON_FLAGS before using it. The transformation is the same for all files, remove "if (WERROR_COMMON_FLAGS)" and "endif()", reindent and add quotes (since we have a string here and not a list). Modelines have been added where missing. Change-Id: I0ab05ae507c51fa77336d49a99a226399cc81b92 Reviewed-on: https://code.wireshark.org/review/17997 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt> Reviewed-by: Dario Lombardo <lomato@gmail.com> Tested-by: Dario Lombardo <lomato@gmail.com>
2016-09-26Add an initial "shellcheck" target.Gerald Combs1-0/+19
Look for shellcheck in Autotools and CMake, and if found add a target that checks some of our shell scripts. Add a "source=" directive to targets that include test-common.sh so that shellcheck will correctly process the scripts. Note that this requires shellcheck 0.4.0 or later. To do: Fix the issues that shellcheck found and check more scripts. Change-Id: I441f9f59d8a3f8eec6718119c2370f2560b98f3c Reviewed-on: https://code.wireshark.org/review/17943 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-09-17Remove -Wdeclaration-after-statementPeter Wu1-1/+0
This is a C99 feature which we can use now. Change-Id: I84a63d6bf282b79c9f0da0543b3b4f5a0cf0c81a Reviewed-on: https://code.wireshark.org/review/17733 Reviewed-by: João Valverde <j@v6e.pt> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-09-16extcap: add udpdump.Dario Lombardo1-0/+21
Udpdump is a generic UDP receiver that exports datagram in PCAP format. Change-Id: I52620a92b12530b6f9b5449c43e692663acdfc14 Reviewed-on: https://code.wireshark.org/review/17195 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: Roland Knall <rknall@gmail.com>
2016-09-07Add some notes about XLC, HP C, and Sun/Oracle C.Guy Harris1-0/+26
Change-Id: I2f65face2aa7354ec350aed308402bb719bd619f Reviewed-on: https://code.wireshark.org/review/17546 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-09-06Allow a lot more C99 featuresPeter Wu1-3/+14
Flexible array members are supported by gcc, clang and even MSVC2013. Note, so far it was only used in the Windows-specific airpcap.h. Trailing commas in enum declaration are already in use since for these dissectors (commit ID is the first occurrence): epan/dissectors/packet-gluster.h v2.1.0rc0-1070-g3b706ba epan/dissectors/packet-ipv6.c v2.1.2rc0-81-ge07b4aa epan/dissectors/packet-netlink.h v2.3.0rc0-389-gc0ab12b epan/dissectors/packet-netlink-netfilter.c v2.3.0rc0-239-g1767e08 epan/dissectors/packet-netlink-route.c v2.3.0rc0-233-g2a80b40 epan/dissectors/packet-quic.c v2.3.0rc0-457-gfa320f8 Inline functions using the "inline" keyword are supported via all glib versions we support (if it is missing, glib will define a suitable inline macro). Other c99 functions listed in the README.developer document were found to be compatible with GCC 4.4.7, Clang 3.4.2 and MSVC 2013. Change-Id: If5bab03bfd8577b15a24bedf08c03bdfbf34317a Reviewed-on: https://code.wireshark.org/review/17421 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-09-02CMake: Move version declarations to the top of CMakeLists.txt.Gerald Combs1-14/+14
This lets me be more lazy during releases. Change-Id: Ie59e200f1f46282e9271f459c0bbf31dc74a59a7 Reviewed-on: https://code.wireshark.org/review/17450 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-30 19:35:37 +0000