aboutsummaryrefslogtreecommitdiffstats
path: root/CMakeLists.txt
AgeCommit message (Collapse)AuthorFilesLines
2018-05-15CMake: require at least CMake 3.5Peter Wu1-86/+39
CMake 3.11 with the Ninja generator started complaining about CMP0058 related to ui/qt/CMakeFiles/qtui_autogen.dir/RCCstock_iconsInfo.cmake amd other files (AUTORCC). While the policy could be set explicitly, let's try to modernize the CMake configuration: - Drop CMP0042, if this gives issues with macOS, then it must be solved in a different way using non-deprecated methods. - Drop CMP0054 and ensure that all if("${foo}") and if(${foo}) are converted to if(foo). - Remove string comparison against "-NOTFOUND", it already evaluates to false in an if condition. - Use CXX_STANDARD/CXX_STANDARD_REQUIRED for Qt 5.7 and newer. - Assume that copy_if_different can accept multiple sources (CMake 3.5). - Consistency: Out of the 60 CMake 3.11 FindXxx.cmake files that use find_library, 34 contain "XXX_LIBRAR" while 16 contain "Xxx_LIBRAR". Let's assume uppercase variables (now custom MaxMindDB include dirs are correctly used). CMake 3.5 was chosen as the next version because of its wide support. Ubuntu 14.04 ships with cmake3 3.5.1, Debian jessie-backports has 3.6.2, EPEL for CentOS/RHEL6 includes cmake3 3.6.1 and SLES12 SP2 has 3.5. Change-Id: I2fa7b94bf8cc78411f414987d17bab3a33dfb360 Reviewed-on: https://code.wireshark.org/review/27444 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-05-15CMake: fix Git binary parameterJoakim Karlsson1-2/+2
if (${GIT_EXECUTABLE}) never worked, hence the variable GIT_BIN_PARAM never had any value, and by so never added the Optional git-bin parameter to make-version.pl Make-version.pl now handle optional git-bin argument with value. Change-Id: I089539a3d33455b8de09928b54e0ea39d1aecbb8 Reviewed-on: https://code.wireshark.org/review/27485 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2018-05-14extcap: Support for DisplayPort AUX channel monitorsDirk Eibach1-0/+23
Support for the generic netlink DisplayPort AUX channel monitor kernel driver. Change-Id: Iab445229ecef082968355f604993292f5f2d8d69 Reviewed-on: https://code.wireshark.org/review/27313 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Dario Lombardo <lomato@gmail.com> Reviewed-by: Roland Knall <rknall@gmail.com>
2018-05-11List some removed features in the release notes.Gerald Combs1-20/+4
Require Qt 5.2 in CMakeLists.txt. Remove some old Qt 4 checks. Change-Id: I06814b3776b488d55a0ce1a26aaada43fb5e096c Reviewed-on: https://code.wireshark.org/review/27446 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-05-11CMake: Remove FindFreetype.Gerald Combs1-3/+3
Remove the FindFreetype module. It was required by the FindGTK2 module, but it's no longer used. Change-Id: Id7575d024b5c13b5800989434a994e3a0dcb2b26 Reviewed-on: https://code.wireshark.org/review/27450 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-05-06Test: Make sure we run our display filter tests.Gerald Combs1-10/+21
Change the test suite list in CMakeLists.txt to a static list. Add a CTest coverage unit test. Change-Id: I8459f320a2d0707618d6d56abdfce80274fddd2d Reviewed-on: https://code.wireshark.org/review/27377 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-05-04Get rid of more autotoolsisms.Guy Harris1-2/+0
Change-Id: I124732adf3c3da511c206932544b4d533404cfc5 Reviewed-on: https://code.wireshark.org/review/27332 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-05-02CMake: check for /Qspectre before using itPeter Wu1-1/+3
The linked blog entry for /Qspectre suggests intention to include /Qspectre support for VS 2015 Update 3, but this has not happened yet (at least, not with VS Community 2015 14.0.23107.178). Change-Id: I001c8fa512457f1edc753b460634f13d2ff0ed7a Fixes: v2.5.1rc0-611-g0ebcd27377 ("Trust CMake's Visual C++ version detection.") Reviewed-on: https://code.wireshark.org/review/27225 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-05-02rpm-package: Use version.h to generate version string in RPMAndersBroman1-14/+25
Packaging. Change-Id: I463be4523f789406ff0cb3a1a325d6937db63b3d Reviewed-on: https://code.wireshark.org/review/27179 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-05-02Test: Remove the Bash test scripts.Gerald Combs1-22/+1
They've been replaced by the Python scripts. Change-Id: I8add9c9ea0a6bdd68b2fa3841977863c0ea9a761 Reviewed-on: https://code.wireshark.org/review/27243 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-27test: Miscellaneous fixups.Gerald Combs1-0/+1
In util_slow_dhcp.py, open stdout as O_BINARY on Windows. Have ctest pass --verbose to test.py. Call config.canCapture at test time so that we don't inadvertently skip some tests. Stringify our dumpcap config check. Fix our Gcrypt variable. Change-Id: I884ec23ddfc7c28b79d4a860c6c43c308598e6db Reviewed-on: https://code.wireshark.org/review/27182 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-04-26Start porting our test scripts to Python. Add ctest support.Gerald Combs1-1/+33
Create Python versions of our various test shell scripts. Add CMake tests for each suite. Tests can now be run directly via test.py, via the "test" target, or via ctest, e.g. ctest --verbose --jobs 3 Add a testing chapter to the Developer's Guide. Add a way to disable ctest in dpkg-buildpackage. Suites completed: - capture - clopts - decryption - dissection Remaining suites: - fileformats - io - mergecap - nameres - text2pcap - unittests - wslua Change-Id: I8936e05edefc76a86b6a7a5da302e7461bbdda0f Reviewed-on: https://code.wireshark.org/review/27134 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-04-25Put references to autotools in the past tense.Guy Harris1-6/+6
In CMake files, we don't do some checks that our autotools scripts did; speak of those in the past tense, as the autotools scripts are gone. (Leave the comments there, to note that we *might* have to reinstate those tests, although they're for old versions of macOS and GCC.) In CMake files, we use some #defines because that's what autotools did; speak of those in the past tense as well. Change-Id: I594fe8225cf94b5087093febc11f6b0a7e42e7cd Reviewed-on: https://code.wireshark.org/review/27149 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-04-24oss-fuzzshark: use install directory for headers. Install missing one.Jakub Zawadzki1-0/+1
From compilation log: epan/ipv4.h:19:10: fatal error: 'wsutil/inet_ipv4.h' file not found tools/oss-fuzzshark/fuzzshark.c:27:10: fatal error: 'version_info.h' file not found Change-Id: I3e147e014ae398ae07e64aec5a6535a8f9e357a3 Reviewed-on: https://code.wireshark.org/review/27076 Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-24CMake: Doxygen and API reference target updates.Gerald Combs1-0/+4
The DOXYGEN_* variables which we use to create doxygen.cfg are native paths and are not compatible with Cygwin. We could try to make them compatible, but given that we're trying to migrate away from Cygwin set "DOXYGEN_EXECUTABLE" to "DOXYGEN_EXECUTABLE-NOTFOUND" if "cyg" is anywhere in its path. Add the wsar_html* targets to "Docs" and exclude them from Visual Studio's default build. Change-Id: Id23a3c43a9f4f1edb2d827bbf36a3a7eb64f0212 Reviewed-on: https://code.wireshark.org/review/27100 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-22Fix up handling of the Kerberos package.Guy Harris1-0/+8
On Ubuntu 16.04, and possibly other versions of Ubuntu, and on Debian and other Debian derivatives, packages for MIT and Heimdal Kerberos can both be installed at the same time - including developer packages. Collisions between headers and libraries are handled by putting them in subdirectories of the system include and library directory and having their .pc files add -isystem flags to point to the appropriate include directory and -L flags to point to the appropriate library directory. CMake's pkg-config support, however, only looks for -I flags, not -isystem flags, in pkg-config output (using --cflags-only-I), so it doesn't get the directory in which to look for the headers, and just uses the results of --libs-only-l to get a list of library names and does nothing with the results of --libs-only-L, causing it not to look for libraries in the directory in which to look for the libraries. We fix this by: If FindKERBEROS.cmake found Kerberos with pkg-config, have it set KERBEROS_DEFINITIONS to the "other" compiler flags, which includes the -isystem flag. For all packages, adding the <PACKAGE>_DEFINITIONS values to CMAKE_C_FLAGS and CMAKE_CXX_FLAGS so that they're used when compiling. If FindKERBEROS.cmake found Kerberos with pkg-config, having it search for each of the libraries in KERBEROS_LIBRARIES using find_library() with KERBEROS_LIBDIR and KERBEROS_LIBRARY_DIRS as hints, and re-assembling the resulting full paths into KERBEROS_LIBRARIES. Change-Id: Ie18b56b76934f542bd12dc737631c0190026d18a Reviewed-on: https://code.wireshark.org/review/27071 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-04-21Remove a few obsolete references to gtk from checkapi and faq.pyJoerg Mayer1-1/+2
Change-Id: Ice9aec64fddbed94c7be96575c6e1bc800e8ac9e Reviewed-on: https://code.wireshark.org/review/27067 Petri-Dish: Jörg Mayer <jmayer@loplof.de> Tested-by: Petri Dish Buildbot Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2018-04-20Get rid of unused variable.Guy Harris1-1/+0
Change-Id: I1b51872e5330722c514a553e571b2eeb56fbade7 Reviewed-on: https://code.wireshark.org/review/27063 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-04-19CMake: fix build with json-glib with gold linkerPeter Wu1-5/+0
JSON-GLIB depends on GObject. To avoid "undefined reference to 'g_object_unref'" with the gold linker, include gobject directly. As the files are included with the GLib package, adjust FindGLIB2.cmake. Change-Id: I007d30b89cc07d8746cee6b619832a722f086105 Fixes: v2.9.0rc0-201-g511c2e166a ("tshark: add -G elastic-mapping report.") Reviewed-on: https://code.wireshark.org/review/27007 Reviewed-by: Dario Lombardo <lomato@gmail.com> Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2018-04-18tshark: add -G elastic-mapping report.Dario Lombardo1-0/+14
This option generates an ElasticSearch mapping file as described here: https://www.elastic.co/blog/analyzing-network-packets-with-wireshark-elasticsearch-and-kibana It leverages the Glib-json library. Change-Id: Iff25f991e87d3da07bf06654e353fb785799dde9 Reviewed-on: https://code.wireshark.org/review/26848 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Dario Lombardo <lomato@gmail.com>
2018-04-17CMake: API reference fixes.Gerald Combs1-1/+4
Fixup a dependency and make sure we create the API reference from scratch. Change-Id: I832d1772eb8b4f07cab6f04d164cac10c70ab3bb Reviewed-on: https://code.wireshark.org/review/26990 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-04-17Switch the Doxygen API reference build to CMake.Gerald Combs1-8/+18
Switch to a single Doyxgen configuration which was generated using a recent version of Doxygen and customized to suit our needs. Add wsar_html and wsar_html_zip targets to CMake. Update some Doxygen markup and documentation as needed. Change-Id: Ic8a424b292c35a26f74ae0b53322265683e56e69 Reviewed-on: https://code.wireshark.org/review/26976 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-17Add a destination directory flag to git-export-release.Gerald Combs1-12/+9
Add a destination directory flag to git-export-release.sh. Use it to replace the current "dist" target. Use it in the RPM section to avoid a symlink. Change-Id: I30ae76b3ab1a995d232e748b79aa37440f90f854 Reviewed-on: https://code.wireshark.org/review/26974 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-16RPM: enable rpm target even if git is not availablePeter Wu1-8/+12
Change-Id: Ic6a7d656aeb0ae30c5e1cc1d8f12ed5ad43f73d7 Reviewed-on: https://code.wireshark.org/review/26968 Reviewed-by: Dario Lombardo <lomato@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-16RPM: support building from out-of-tree directories.Dario Lombardo1-0/+5
When building the RPM from a directory at the same level as the source (like in mdkir build;cmake ../wireshark;make rpm-package) we can't rely on the retrieval of the git version. However the wireshark export dir still have it and we can get it from there. Change-Id: Id6bcb453ec3a65977fc092c610e99e8dd01f613a Reviewed-on: https://code.wireshark.org/review/26957 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-15Gtk: Remove source codeRoland Knall1-1/+0
Removing all gtk source code, except for main.? which will remain for the official removal during SFUS18 Change-Id: I4273baf207df1eaaa4b94623cfd10bf74b1fc4a4 Reviewed-on: https://code.wireshark.org/review/26937 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Roland Knall <rknall@gmail.com>
2018-04-09Qt: Fix MacOSX menu entriesRoland Knall1-0/+6
Remove various menu items added automatically on Mac OS X. The following menu items have been removed: - Edit / Start Dictation - Edit / Emoji & Symbols - View / Enter Fullscreen Mode - View / Show Tab Bar - Hide Tab Bar Bug: 13366 Change-Id: I44deae7ee8ea7a43926820e4f5d0517ece246939 Reviewed-on: https://code.wireshark.org/review/26823 Petri-Dish: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Roland Knall <rknall@gmail.com>
2018-04-09CMake: More Qt4 removal.Gerald Combs1-42/+27
Remove some Qt major version checks. Remove the ENABLE_QT5 option. Change-Id: I891bc90956a2ea2cd5a7c50c56d9fcbfc963d6c2 Reviewed-on: https://code.wireshark.org/review/26785 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-04-05glib: Require 2.32 or newer.AndersBroman1-1/+1
Change-Id: Idaf90865d04532912a968fc2e05523aec14c4991 Reviewed-on: https://code.wireshark.org/review/26745 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-05GTK Cmake: Remove the option to build the GTK UI.AndersBroman1-136/+2
Change-Id: If702717b559a727388d83ce82c0fc2967c662ff0 Reviewed-on: https://code.wireshark.org/review/26747 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-04CMake RPM build: Try to get rid of %globals in favor of %bcond.Anders1-6/+6
Change-Id: I051fb722b0c4161b373f04a79288faa41a61c3cc Reviewed-on: https://code.wireshark.org/review/26735 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-04CMake: Add a note about passing /external to Visual C++.Gerald Combs1-0/+2
According to https://blogs.msdn.microsoft.com/vcblog/2017/12/13/broken-warnings-theory/ /external: will let is ignore warnings in external headers. Change-Id: Ib3000d7654ffab99a001b225ce6162aab88fc8fa Reviewed-on: https://code.wireshark.org/review/26734 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-04-02Pick up some compiler-specific flags from autotools.Guy Harris1-2/+17
Bug: 14554 Change-Id: Idf4585671ad2698bd51f65abadb1b1000ad56445 Reviewed-on: https://code.wireshark.org/review/26716 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-04-022.5 → 2.9.Gerald Combs1-2/+2
Change-Id: I9a6cd7a510f8ba5310a9cf8a2818903d4c03253f Reviewed-on: https://code.wireshark.org/review/26712 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-03-29Don't bother with CMAKE_C_STANDARD.Guy Harris1-31/+54
It was introduced in CMake 3.1, so, unless we require CMake 3.1 or later, we'd have to manually try to enable C99 support on pre-3.1 releases, so we might as well just do it manually all the time - it's not clear that CMAKE_C_STANDARD does it much better, especially give that, for example, it wasn't until CMake 3.9 that support for enabling C99 support in IBM XL C was added. Change-Id: I51038b90fd3d8ab5050c5da4441765b19db9091b Reviewed-on: https://code.wireshark.org/review/26648 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Roland Knall <rknall@gmail.com>
2018-03-26CMake: Add an rpm-package target.Gerald Combs1-0/+76
Copy the current wireshark.spec.in and update it for use with CMake. Remove the Qt4, GTK+2, and GTK+3 options. Add Ninja and mmdbresolve options. The rpm-package target builds a tarball using git-export-release.sh and therefore must be run from a git checkout. The RPM _prefix macro is set to CMAKE_INSTALL_PREFIX, so you'll probably want to run cmake -DCMAKE_INSTALL_PREFIX=/usr ... Change-Id: Ib014494d8858a0059126404cd91528ded5d8a9f6 Reviewed-on: https://code.wireshark.org/review/26579 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-03-16Bump micro version to 2Pascal Quantin1-1/+1
Change-Id: I384db83e3c471cbb371e7af4d488dd03d7761125 Reviewed-on: https://code.wireshark.org/review/26497 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-03-14Trust CMake's Visual C++ version detection.Gerald Combs1-10/+12
We can be reasonably certain that CMake sets CMAKE_C_COMPILER_ID, MSVC12 and MSVC14 correctly. If we add a compiler flag based on those variables don't bother passing it through check_c_compiler_flag or check_cxx_compiler_flag. This speeds up CMake here quite a bit. Change-Id: I3a681a8a9287b33353030fd37303aa32f04b79a9 Reviewed-on: https://code.wireshark.org/review/26475 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-03-13Get rid of TestBigEndian and AC_C_BIGENDIAN.Gerald Combs1-4/+0
Get rid of CMake's TestBigEndian and Autotools' AC_C_BIGENDIAN checks in favor of G_BYTE_ORDER. We use G_BYTE_ORDER elsewhere and TestBigEndian is noticeably slow on Windows. Change-Id: Idc1326294db9cbee8f6b6b11c2028fc4d19acbf0 Reviewed-on: https://code.wireshark.org/review/26462 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-03-09Add MaxMindDB 1.3.2 library to WindowsPascal Quantin1-3/+4
Change-Id: I328b6a05cc356be59ac63e80eae55a832bf76a47 Reviewed-on: https://code.wireshark.org/review/26347 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-03-08CMake: Don't bother compiling zlibstatic.Gerald Combs1-1/+5
We don't use zlibstatic so exclude it from ALL_BUILD and Wireshrk.sln. Change-Id: I9656b6f1c35e43cce89c8879f4521f6dc4a5cbdf Reviewed-on: https://code.wireshark.org/review/26349 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-03-07CMake: Exclude test targets from the default build.Gerald Combs1-12/+18
For the Visual Studio generator, setting the EXCLUDE_FROM_ALL property on a target excludes it from ALL_BUILD.vcxproj, but we additionally need to set EXCLUDE_FROM_DEFAULT_BUILD to exclude it from Wireshark.sln. Do so for the test targets. Change-Id: Icd328f75d4927e5b7bb65b1833da4724f63476b6 Reviewed-on: https://code.wireshark.org/review/26345 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-03-07spdx: more licenses converted.Dario Lombardo1-13/+1
Change-Id: I3861061ec261e63b23621799e020e811ed78a343 Reviewed-on: https://code.wireshark.org/review/26333 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-03-06CMake: Remove SH from the packate list.Gerald Combs1-1/+1
Change-Id: Idafd85df598e0c58fc8252574ce0478b3e1464a9 Reviewed-on: https://code.wireshark.org/review/26278 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-03-06Transition from GeoIP Legacy to MaxMindDB.Gerald Combs1-8/+26
MaxMind is discontinuing its legacy databases in April in favor of GeoIP2, which use a newer database format (MaxMind DB). The reference C library (libmaxminddb) is available under the Apache 2.0 license which isn't quite compatible with ours. Add mmdbresolve, a utility that reads IPv4 and IPv6 addresses on stdin and prints resolved information on stdout. Place it under a liberal license (MIT) so that we can keep libmaxminddb at arm's length. Add epan/maxmind_db.[ch], which spawns mmdbresolve and communicates with it via stdio. Migrate the preferences and documentation to MaxMindDB. Change the IPv4 and IPv6 asnum fields to FT_UINT32s. Change the geographic coordinate fields to FT_DOUBLEs. Bug: 10658 Change-Id: I24aeed637bea1b41d173270bda413af230f4425f Reviewed-on: https://code.wireshark.org/review/26214 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-03-04Windows: Remove support for MSVC older than VS2015Graham Bloice1-10/+1
Cleanup the support for older versions of Visual Studio Change-Id: Ieb97d56e9bff6a5902433e8d99b27276bc7034f7 Reviewed-on: https://code.wireshark.org/review/26247 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-03-02Remove the endpoint "Map" feature.Gerald Combs1-10/+0
Remove the endpoint map and its button from the Qt and GTK+ UIs. It depends on GeoIP Legacy for coordinate information and those databases are being deprecated in favor of MaxMind DB. We *could* upgrade the code to use mmdbresolve, but according to https://dev.maxmind.com/geoip/geoip2/geolite2/ they're also going to remove coordinate information from GeoLite2: "In addition, in 2019, latitude and longitude coordinates in the GeoLite2 databases will be removed.* Latitude and longitude coordinates will continue to be provided in GeoIP2 databases. Please check back for updates." Change-Id: I43e1593d282a0f1aae897b1f4724117d1496b21e Reviewed-on: https://code.wireshark.org/review/26229 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-03-02Generalize our process spawning code.Gerald Combs1-1/+0
Move the contents of extcap_spawn to ws_pipe. Rename various extcap_* prefixes to ws_pipe_*. Open stdin when we spawn processes. Change-Id: I9286295443ee955bb6328b0ed6f945ee0bb2a798 Reviewed-on: https://code.wireshark.org/review/26216 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-02-28L16_mono: Add L16 monaural codec plugin as functional exampleJaap Keuter1-0/+1
This codec plugin serves a dual purpose. First it is to add L16 codec suppport to Wireshark. Second it is an illustration of a basic codec plugin module. Change-Id: I64394dab3257ae49dece0257b16cd969503918e2 Reviewed-on: https://code.wireshark.org/review/26131 Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl> Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-02-27CMake: Add more .PDBs to pdb_zip_package.Gerald Combs1-1/+5
Add .PDBs under the extcap and plugin directories to the Wireshark-pdb-xxx.zip package. Change-Id: Icc003a212f21c02bcf8ccf326b43cfebbf32a9a3 Reviewed-on: https://code.wireshark.org/review/26146 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-28 15:22:11 +0000