aboutsummaryrefslogtreecommitdiffstats
path: root/CMakeLists.txt
AgeCommit message (Collapse)AuthorFilesLines
2017-08-16CMake: Switch back to shipping README.txt on Windows.Gerald Combs1-3/+17
Instead of trying to ship README.md, convert its line endings and make sure the result is named README.txt. Change-Id: I4e081587c73342b01633b3a31ea03068e3fc1733 Reviewed-on: https://code.wireshark.org/review/23098 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-08-15Convert README to README.md.Gerald Combs1-1/+2
Convert the contents of the top-level README to Markdown and give it a .md extension. Most of our documentation is plain text or AsciiDoc, but the top-level README file in a Git repository is special in that many online browsers will show the README contents along with the directory listing and those browsers tend to favor Markdown. This is true of GitHub (which we're currently mirroring to), Gerrit via its Gitiles plugin (which we're not yet using but likely will), and other places. Add "foreign" to AM_INIT_AUTOMAKE. There is probably a joke to be made here about the FSF and border walls. Change-Id: I87c306d74864e1f0a432225b160a1b4483ee946c Reviewed-on: https://code.wireshark.org/review/23049 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: Anders Broman <a.broman58@gmail.com>
2017-08-13CMake: allow CMAKE_INSTALL_RPATH to be overriddenPeter Wu1-1/+1
By default CMake sets the RPATH for built binaries to the build directory. To enable relocatable build directories, I override this RPATH as follows during development: -DCMAKE_BUILD_WITH_INSTALL_RPATH=1 -DCMAKE_INSTALL_RPATH='$ORIGIN:$ORIGIN/../extcap/..' To make work (again), do not overwrite CMAKE_INSTALL_RPATH in CMakeLists.txt. Change-Id: I7f238af07926ea706a3f999c5b1e13286ca53a66 Fixes: v2.5.0rc0-664-g55dd9b16d5 ("CMake: Update RPATH during installation.") Reviewed-on: https://code.wireshark.org/review/23062 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-08-12Sync some CMake and Autotools install behaviors.Gerald Combs1-8/+36
Adjust the following CMake and Autotools behaviors in order to synchronize their respective install behaviors: - Disable tfshark by default in CMakeOptions.txt - Add profiles/Bluetooth/preferences to Makefile.am - Add missing captype and ciscodump entries to doc/Makefile.am - Install help/faq.txt on all platforms in CMakeLists.txt - Add BUILD_corbaidl2wrs, BUILD_dcerpcidl2wrs, and BUILD_xxx2deb options to CMake and use them to adjust the corresponding parts of the build. - Pull the DCERPC idl2wrs build steps into the top-level CMakeLists.txt. This change doesn't sync everything. Some installed content still diverges, including the following: - CMake installs a bunch of modules into lib/wireshark: FindGLIB2.cmake FindWireshark.cmake FindWSWinLibs.cmake LocatePythonModule.cmake UseAsn2Wrs.cmake UseMakeDissectorReg.cmake WiresharkConfig.cmake WiresharkConfigVersion.cmake Do we need any or all of these? If so, should the Autotools behavior be synced accordingly? - Autotools installs libtool .la files. It also installs wireshark-gtk.desktop unconditionally. Change-Id: I7846efe08f7139c31b6ceca6f08a1fa5168b3e22 Reviewed-on: https://code.wireshark.org/review/23041 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>
2017-08-11CMake: Make PLUGIN_INSTALL_DIR absolute.Gerald Combs1-1/+1
CMAKE_INSTALL_LIBDIR is a relative path. Prefix it with CMAKE_INSTALL_PREFIX so that PLUGIN_INSTALL_DIR is absolute. This matches our Autotools behavior. Change-Id: Ib42cea8745615686e0c7e8473bdb1975a3b9eccd Reviewed-on: https://code.wireshark.org/review/23043 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-08-10CMake: Update RPATH during installation.Gerald Combs1-1/+11
If we're installing into a non-system prefix on UNIX or Linux, make sure CMake updates our RPATHs accordingly. Change-Id: Ia6eaa6533c996a8228cff25e9d2032b223781681 Reviewed-on: https://code.wireshark.org/review/23040 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-08-07-Wcast-align will warn about legitimate code.Guy Harris1-1/+4
Maybe there's some way to say "yes, I know that the pointer being cast is appropriately aligned", or maybe some platforms say "yes, I know, this is a struct sockaddr *, but those are aligned well enough for any other socket address types", in which case we might be able to turn that on by default in some cases. Change-Id: I6b8cff7ebfe27785b20adbbc2f855e859b090236 Reviewed-on: https://code.wireshark.org/review/22983 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-08-07Minor comment style tweak.Guy Harris1-0/+2
Change-Id: I58359c5a7c38e61cc7c024f1c74951679522101f Reviewed-on: https://code.wireshark.org/review/22982 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-08-07Sync up a bit with configure.ac.Guy Harris1-6/+27
Move -Wunused-const-variable after -Wc++-compat. Move -Wduplicated-branches after -Wdocumentation. Add some comments for the warning flags for which the configure script does a test to make sure the compiler doesn't mishandle them. Add some other comments. Change-Id: I7f648ff78eb932feef34aeccfff179bd0a2e5d49 Reviewed-on: https://code.wireshark.org/review/22980 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-08-07Add a comment explaining why ASan and UBSan are involved.Guy Harris1-1/+7
Change-Id: I31a429c247ed9f8efb97560d517423b0bf2d82f1 Reviewed-on: https://code.wireshark.org/review/22979 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-08-06Fix setting COMMON_WARN_FLAGS.Guy Harris1-8/+9
If we want to add -Wframe-larger-than=16384, *append* it, don't *overwrite* it. Indent that code properly while we're at it. Change-Id: Iae8894e6663500620a07589fd6ba3d00f9eac7ba Reviewed-on: https://code.wireshark.org/review/22977 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-07-31CMake: do not check stack size when compiling with ASan or UBSanPascal Quantin1-3/+7
Instrumentation code increases the stack usage. Let's deactivate the check when compiling with ASan or UBSan as the objective here is not to check the stack consumption and its usage is out of our control. Change-Id: I9d6e269a0d404dc1833183a070fdbbb7fb0446e0 Reviewed-on: https://code.wireshark.org/review/22888 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>
2017-07-30Add G.729 decoding based on bcg729 libraryPascal Quantin1-0/+19
Bug: 13635 Change-Id: Ic22a0719a59da13e51425aeb747e88caca0d6512 Reviewed-on: https://code.wireshark.org/review/22808 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-07-27cmake: add a group target for all extcaps.Dario Lombardo1-0/+2
Change-Id: Ic97a96261056fd639c968eb29026d67636bad741 Reviewed-on: https://code.wireshark.org/review/22777 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Dario Lombardo <lomato@gmail.com>
2017-07-25CMake: Don't pass /WX to rc.exeGerald Combs1-2/+11
Rc.exe doesn't have a /WX flag. Passing it /WX apparently results in setting the /W flag, which warns about invalid code pages, and the /X flag, which ignores %INCLUDE%. The latter is necessary in our case for locating winver.h. Change-Id: I6d757a547fedfa49d078a7bb5f15518c69760f72 Reviewed-on: https://code.wireshark.org/review/22794 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-07-25cmake: remove duplicate libraries from sshdump and ciscodump.Dario Lombardo1-6/+0
Change-Id: I35ce9e10921a5cbf97f2cd00036b1b6b3c87c03f Reviewed-on: https://code.wireshark.org/review/22788 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2017-07-23Put the well-known addresses into a separate file from OUIsJoão Valverde1-0/+1
Having two distinct logical concepts (OUI and Well Known Address) concatenated to a single "manuf" file is needlessly obfuscating the WKA feature. Have a distinct "wka" file instead and just skip the cat. Change-Id: I46f53b0015a37331d65f8cfac7cbbd499dd0c5b8 Reviewed-on: https://code.wireshark.org/review/22742 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-07-22c-ares isn't required.Guy Harris1-1/+1
Don't fail if it's not present. Change-Id: I7183ce6e1f2af822ebeed219be0f2ca7dd0bab0f Reviewed-on: https://code.wireshark.org/review/22759 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-07-21Require at least c-ares 1.5.0 when configuring.Guy Harris1-0/+2
That way, if you have an older version, we fail at configure time, with what should be a message indicating that your c-ares is too old, rather than at compile time, with what might provoke users to ask "what am I doing wrong?" or "what do I need to fix?" or "why is my compile failing?" or.... Change-Id: I911574c4d90174b6bd074c5ef537557d47b199dc Reviewed-on: https://code.wireshark.org/review/22752 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-07-15Rename enterprises to enterprises.tsv and ship it.Gerald Combs1-1/+1
Rename "enterprises" to "enterprises.tsv" so that its format is a bit more obvious and so that double-clicking the file might do something useful. Add it to the Windows packages. Change-Id: I5ef54a04ce1b4926aa4535e756e04b3e2a56d463 Reviewed-on: https://code.wireshark.org/review/22616 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>
2017-07-04CMake: Fix eclipse indexerRoland Knall1-0/+38
The indexer for eclipse gets confused, because CMake automatically adds __cplusplus=199711L which will lead to C-only files being parsed wrong, if a __cplusplus guard is being used. This has not interference with the code generation, just the __cplusplus definition is omitted Change-Id: I82aa770837668fbfbb5ac8227da1943e20b409fe Reviewed-on: https://code.wireshark.org/review/22506 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Roland Knall <rknall@gmail.com>
2017-06-28Windows: update c-ares to v1.13.0 and zlib to v1.2.11Pascal Quantin1-1/+1
Change-Id: I17f92dd76dc53732d5d764c2a129acb7b69bbe08 Reviewed-on: https://code.wireshark.org/review/22440 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>
2017-06-26Parse enterprise-numbers at run timeJoão Valverde1-0/+1
"enterprise-numbers" is converted to tab-separated values and renamed "enterprises". Unused fields are stripped. PENs are stored in a hash table loaded at run-time. User "enterprises" file is loaded from the personal config dir. Misc make-sminmpec.pl improvements and fixes. Note: names of type "Entity (formerly ...)" have the formerly part commented out for a cleaner output. Change-Id: I60c533afbe3e399077fbf432088064471ad3e1e2 Reviewed-on: https://code.wireshark.org/review/22246 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: João Valverde <j@v6e.pt>
2017-06-26cmake: fix SET_FEATURE_INFO deprecation warningPeter Wu1-10/+42
Fix deprecation warnings that occur with cmake 3.8, replacing it by some other function that is supported since at least cmake 2.8.8. This also updates URLs and splits the description in a package description and the purpose for the package (shown on the next line). Change-Id: Ic0f37898593f48b8f37f6a228dae49288f20538f Reviewed-on: https://code.wireshark.org/review/22393 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-06-21cmake: allow building from a UNC source directoryMartin Kaiser1-2/+2
Make two minor adjustments to allow building on Windows when the source directory is specified in UNC notation (\\server\volume\directory) instead of mapping such a directory to a drive letter. Cmake's add_custom_command() calls "cd <work_dir>" if a working directory is define as part of the rule. However, cd \\server\volume\directory is not allowed. Modify the two occassions where the working directory is derived from CMAKE_SOURCE_DIR. For copying some install files, we can get away with using the absolute path for each source file to be copied. The perl script that creates the tap listing for lua does not depend on a working directory at all. We can simply remove the WORKING_DIRECTORY parameter. Change-Id: Iac8e0addc44650692c1263fdca11f68315f50c63 Reviewed-on: https://code.wireshark.org/review/22236 Petri-Dish: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2017-06-16Change some names to reflect Apple's new UNIX-for-Macs name.Guy Harris1-1/+1
{OS_X,os_x} -> {MACOS,macos}. Change-Id: Icebea6ab566c65996ee97bacb88fac7e84ec32de Reviewed-on: https://code.wireshark.org/review/22161 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-06-10Windows: increase minimum CMake version to 3.7Pascal Quantin1-4/+2
g9f0d22b introduced the use of GREATER_EQUAL operator. Let's update the minimum CMake version accordingly. Change-Id: Ibf619a24f5ee296b547fbc6ba46e13b8a1f3302c Reviewed-on: https://code.wireshark.org/review/22066 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2017-06-022.3.0 → 2.5.0.Gerald Combs1-1/+1
Change-Id: I83ecbff82b23702f40ce1bae45be23e3336ff2c4 Reviewed-on: https://code.wireshark.org/review/21905 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-06-01cmake: Add -Wshorten-64-to-32 for C++ when using Qt >= 5.9Stig Bjørlykke1-2/+9
The warnings has been fixed in Qt 5.9. Change-Id: I7cc71612e601517b7d7117c3cf2711ec983593a6 Reviewed-on: https://code.wireshark.org/review/21861 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>
2017-05-16Add --enable-ubsan/ENABLE_UBSAN for UndefinedBehaviorSanitizerPeter Wu1-0/+12
UndefinedBehaviorSanitizer (UBSan) can catch a lot of issues (out-of-bounds memory access, integer overflows, undefined shifts, etc.) and is recommended during development using GCC or Clang. Add an option for it (similar to ASAN support). Change-Id: Ib0db50cee9eb5af0f5c4f06e07f3899a3a34702d Reviewed-on: https://code.wireshark.org/review/21673 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: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2017-04-27cmake: cleanup package variablePeter Wu1-6/+10
Do not print a message for a variable if the package does not provide it (e.g. "Git includes: "). Change-Id: Ife5e58055c4eb24218b543f52fb7d7882dc1e04e Reviewed-on: https://code.wireshark.org/review/21359 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2017-04-27CMake: prevent confusing "Git NOT FOUND" in CMake 3.1.3Peter Wu1-1/+4
Change-Id: Ia7c03220f49ff862bf05a34727bf5c99297deeab Reviewed-on: https://code.wireshark.org/review/21358 Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2017-04-26cmake: remove dependency on sedPeter Wu1-1/+1
runlex.sh does not need sed anymore since v2.3.0rc0-2386-g64f83641ad. Since building docs already depends on Perl, let's use Perl instead. Change-Id: Id7e923e47001cfd32c8cef89960377026464f2ee Reviewed-on: https://code.wireshark.org/review/21314 Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2017-04-25cmake: fix build without libxml2Martin Kaiser1-0/+4
When LibXml2 is not found, the LIBXML2_LIBRARIES is set to "LIBXML2_LIBRARIES-NOTFOUND" rather than an empty string (as other FindXxx modules do). This results in an error because the variable is used in target_link_libraries (via epan_LIBS). As workaround, explicitly clear the variable to ignore the cache entry. Change-Id: I9e164f9c175b23559ac6bc37f9aca5f41df79d1f Reviewed-on: https://code.wireshark.org/review/21321 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2017-04-21Use the cfile_ failure_message routines in androiddump.Guy Harris1-0/+2
Change-Id: Ic310eaafac054db7736c503252062c3dd3e00a99 Reviewed-on: https://code.wireshark.org/review/21265 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-04-20Use cfile_write_failure_message() in the randpkt code.Guy Harris1-0/+2
Change-Id: I32ef7ff85f854782e5dd02c3e7f12436a120bc13 Reviewed-on: https://code.wireshark.org/review/21259 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-04-20Take the error message generation out of the merge_files routines.Guy Harris1-0/+1
Have them just return the information needed for the caller to produce an error message, and have the callers use the new cfile_ routines for reporting errors. This requires that the "write failure alert box" routine take the *input* file name as an argument, so that, on a merge, if the problem is that a record from a given input file can't be written out to the type of output file we're generating, the input file name can be given, along with the record number in that file. Change-Id: If5a5e00539e7e652008a523dec92c0b359a48e71 Reviewed-on: https://code.wireshark.org/review/21257 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-04-20Use the new cfile_XXX_failure_message() routines more broadly.Guy Harris1-0/+3
Change-Id: I7814b3fd0353f4836ae61cbdbd4e13f659cbcb59 Reviewed-on: https://code.wireshark.org/review/21239 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-04-20editcap now uses stuff from libui.Guy Harris1-0/+1
Change-Id: Ifa5cda67305682909559963ea5ce90cecc0c8e6e Reviewed-on: https://code.wireshark.org/review/21238 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-04-19Add libxml2 as optional dependencyAhmad Fatoum1-0/+17
This can be used by dissectors that need to parse out-of-band configuration. Change-Id: I13c0a2f408fb5c21bad7ab3d7971e0fa8ed7d783 Reviewed-on: https://code.wireshark.org/review/20912 Reviewed-by: Roland Knall <rknall@gmail.com>
2017-04-17sharkd: support for "downloading" decoded RTP stream in wave-like format.Jakub Zawadzki1-0/+1
Change-Id: Ic6b241f9b7ed302e7b11644e63230474d5933a85 Reviewed-on: https://code.wireshark.org/review/20963 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-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>