aboutsummaryrefslogtreecommitdiffstats
path: root/wsutil
AgeCommit message (Collapse)AuthorFilesLines
2018-02-17The CRC8 routines don't modify the buffer; make the pointers to it const.Guy Harris2-7/+7
This lets us get rid of some casts that provoke "drops const qualifier" warnings. Change-Id: Ia7e0863bd97bc20dbbb810e13778ec78d0cf3c91 Reviewed-on: https://code.wireshark.org/review/25837 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-02-17Fix casts.Guy Harris1-1/+1
A gconstpointer is a "pointer to const void", so it should be cast to "pointer to const XXX". A "pointer to const pointer to plugin" is a "plugin *const *". C's declaration syntax is not one of its strong points. There's a reason why the cdecl program, and the Web site that uses it, http://cdecl.org, exists (as the tag line says, "C gibberish <-> English"), and why I used it to make sure I got this working. Change-Id: Ia29bb25d17a1255a06b4ace542643c4b494d4977 Reviewed-on: https://code.wireshark.org/review/25835 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-02-17Qt: Replace the toolbar extension icon.Gerald Combs1-0/+1
The QToolBar extension button icon is ugly, particularly on HiDPI displays. Replace it with a RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK. Change-Id: I8822252ff5c328acd23aad345313e7cfafdffa47 Reviewed-on: https://code.wireshark.org/review/25821 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-17Don't have CLEAN_FILES variables for the "clean" source files.Guy Harris1-5/+1
Except for the one directory that (currently) has "not yet clean" files, epan/dissectors, we don't need a separate variable to keep track of the "clean" source files. In the cases where not all files were in CLEAN_FILES, put them into the variable used to enable -Werror or its equivalent. Change-Id: Ic4119861c1d9e381adfe31e9977e1ac71d623f5b Reviewed-on: https://code.wireshark.org/review/25830 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-02-15Move hkdf_extract to wsgcrypt.hPeter Wu1-0/+12
HKDF-Extract is not used in TLS, but in QUIC. For reuse in OSCORE, move it to wsutil. Adjust comments slightly to emphasize precondition. Change-Id: I5105e7416037697b383ad58f62be285c2b7ab8b7 Reviewed-on: https://code.wireshark.org/review/25802 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Mališa Vučinić <malishav@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2018-02-12Extract HKDF-Expand from TLS 1.3 dissectorPeter Wu2-0/+55
HKDF (RFC 5869) is a standard construct used in TLS 1.3, QUIC and OSCORE, generalize it for use outside the TLS dissector. Since none of the users need the "context" (formerly "hash_value") field, remove the parameter. Change-Id: Id952de8cb3000f6f6eda844d17c78bbd3906a84d Reviewed-on: https://code.wireshark.org/review/25723 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-02-10musl: compile with musl libcDan Robertson1-0/+3
Ensure that wsutil/ws_pipe.c includes <sys/select.h> as as both the timeval struct and the select function are used. Change-Id: Idbd9e9a5b9cbee9977a423c32e55be81bb6425c3 Reviewed-on: https://code.wireshark.org/review/25616 Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-02-08replace SPDX identifier GPL-2.0+ with GPL-2.0-or-later.Dario Lombardo108-108/+108
The first is deprecated, as per https://spdx.org/licenses/. Change-Id: I8e21e1d32d09b8b94b93a2dc9fbdde5ffeba6bed Reviewed-on: https://code.wireshark.org/review/25661 Petri-Dish: Anders Broman <a.broman58@gmail.com> Petri-Dish: Dario Lombardo <lomato@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-02-07Clean up the null pointer check in profile_exists().Guy Harris1-3/+10
Check only in the if (global) case, and note that it's necessary in that case; in the !global case, note why we don't have to check for a null pointer. Change-Id: I80322204ec94eb3901f7bceabccb29351794adc8 Reviewed-on: https://code.wireshark.org/review/25674 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-02-07wsutil: Allow NULL as profile nameStig Bjørlykke1-1/+3
Using NULL as profile name indicates the Default profile and profile_exists() must not return FALSE for the Default profile. This is a regression from ge0d04a75. Change-Id: I2463a7d3e12dda794f3391d999442a303d80621c Reviewed-on: https://code.wireshark.org/review/25659 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2018-02-07wsutil: use SPDX identifiers.Dario Lombardo5-74/+9
Change-Id: I4863416ddc425b9138ffa47621eee823db9e7fda Reviewed-on: https://code.wireshark.org/review/25557 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-02-01base64: Adjust whitespace for readabilityStig Bjørlykke1-10/+10
Change-Id: Ibf72dddceac925521a0fec3ab0bed7ed360e7c06 Reviewed-on: https://code.wireshark.org/review/25547 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2018-02-01buffer: add g_assert to all functions.Dario Lombardo1-0/+11
This pacify clang warnings as well. Change-Id: I5d61a82bfc43b93281f0d0caabcb7109c849788b Reviewed-on: https://code.wireshark.org/review/25518 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2018-01-29Avoid #ifdef'ing out translation unitsJoão Valverde3-7/+11
Change-Id: Ibef0120184ae577f11059fcaf0eaa24a32820273 Reviewed-on: https://code.wireshark.org/review/25502 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2018-01-28wsutil/filesystem.c: fix memory leak in init_progfile_dir()Jakub Zawadzki1-6/+0
If file wasn't found in PATH, there is a leak of path. Don't break the loop after reaching NUL character. Check for NUL character will be done in while() start condition. Found by clang. Change-Id: I0111a71853ffd485ee1096296f92de4472409c66 Reviewed-on: https://code.wireshark.org/review/25445 Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2018-01-28Minor Makefile.am cleanup.João Valverde1-5/+0
Change-Id: I3670c86a695cbea00be39d0c274a5bef0ef31cbf Reviewed-on: https://code.wireshark.org/review/25501 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2018-01-28plugins: Remove nordic_ble.dll exceptionJoão Valverde1-10/+0
This should no longer be necessary with the sub-version directory struture. If the user is installing a DLL for a built-in plugin, an error message is appropriate. Change-Id: I80842f1ea03a08594321a674650a1373aaa48712 Reviewed-on: https://code.wireshark.org/review/25500 Reviewed-by: João Valverde <j@v6e.pt>
2018-01-28Rename plugins_scan_dir()João Valverde1-5/+5
This makes it more obvious that it is a static function. Change-Id: I7348c4326b1e388870cb6657d9c67bd1086357b0 Reviewed-on: https://code.wireshark.org/review/25499 Reviewed-by: João Valverde <j@v6e.pt>
2018-01-28Use g_str_has_suffix()João Valverde1-3/+1
Change-Id: Ida335462efdfeef88a7afb3f27caf274632ca879 Reviewed-on: https://code.wireshark.org/review/25498 Reviewed-by: João Valverde <j@v6e.pt>
2018-01-28plugins: Use per-library data structuresJoão Valverde1-55/+41
This is cleaner and allows the "duplicate plugin name check" to be performed correctly (per module and not globally). Change-Id: I2b2122495dc047af5b7043dcf020a525766b7c30 Reviewed-on: https://code.wireshark.org/review/25496 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2018-01-16plugins: Add source tree subfolder for plugin libraryJoão Valverde1-71/+73
This allows some simplification and makes things more consistent, particularly for loading plugins from the build dir. Also fixes the issue reported here: https://www.wireshark.org/lists/wireshark-dev/201801/msg00061.html Change-Id: I0d8a000ee679172bccad546a3b0c47a79486f44d Reviewed-on: https://code.wireshark.org/review/25329 Petri-Dish: João Valverde <j@v6e.pt> Reviewed-by: João Valverde <j@v6e.pt>
2018-01-11Update a comment to reflect current reality.Guy Harris1-2/+2
All plugin types now have plugin_register() as the registration function, so it's an entry point for the plugin registration function, not the particular plugin type. Clean up white space while we're at it. Change-Id: I166359deac57512cb6e87b2c7388c4b25cc54e10 Reviewed-on: https://code.wireshark.org/review/25254 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-01-11Use an enum for plugin types.Gerald Combs2-17/+70
Make plugins.c the source of truth for plugin names. Where plugins reside and what they do are two different things, so split the plugin directory and description into two separate elements. CMake creates portable[1] builds on Windows and macOS. That is, the build-time directory layout is the same as the installation directory layout. Adjust various plugin paths macOS accordingly. [1] You have to run osx-app.sh on macOS to prepare the application bundle, but the goal is to create a directory/bundle that can be moved or copied to a different system and run in the new location. Change-Id: Icf9d02e61918fdf1404468baf52542910edf2743 Reviewed-on: https://code.wireshark.org/review/25166 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-01-08extcap: remove conditional compilation.Dario Lombardo1-10/+2
Change-Id: Ia54bba388755cf27a343fe6d69d244bf1ab897f9 Reviewed-on: https://code.wireshark.org/review/25186 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Roland Knall <rknall@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-03wsutil: return false if NULL is asked as profile name (CID: 1405202).Dario Lombardo1-0/+2
Better not rely on the fact that the caller won't pass NULL. A NULL profile would be lead to a wrong behaviour. Change-Id: I281f0d2364af9f7b78268580dd73024b07bcba83 Reviewed-on: https://code.wireshark.org/review/25124 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot Reviewed-by: Dario Lombardo <lomato@gmail.com>
2018-01-02ws_pipe: fix format error for size_t buffer_sizeUli Heilmeier1-1/+1
Fix error: format '%ld' expects argument of type 'long int', but argument 4 has type 'size_t' Change-Id: I86ec4076bb7e8c11d5cf82187a46a528bf43c514 Reviewed-on: https://code.wireshark.org/review/25109 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Dario Lombardo <lomato@gmail.com>
2018-01-02wsutil: Add missing includeRoland Knall1-0/+15
Otherwise gboolean is undeclared in files depending on the functionality, like extcap.c for instance Change-Id: I329715b2bb7bfd5d12ce3f1a035ecda6dff16a2d Reviewed-on: https://code.wireshark.org/review/25110 Petri-Dish: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Roland Knall <rknall@gmail.com>
2018-01-02ws_pipe: provide a null terminated string anyway (CID: 1364684).Dario Lombardo1-1/+3
Change-Id: I4143b499986cbd31db524db73dde72ddbe26077d Reviewed-on: https://code.wireshark.org/review/25072 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2018-01-01Happy New Year 2018!Stig Bjørlykke1-1/+1
Change-Id: I61ece8256384786c718fe2c1bc8813560fa372eb Reviewed-on: https://code.wireshark.org/review/25094 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-12-24Fix build and thread runtime compat with older GLibPeter Wu2-3/+10
CentOS 6 ships with glib 2.28.8 which do not support g_ptr_array_new_full (make-taps/make-dissectors) and need to link with wsutil for glib-compat. g_thread_new was only introduced with GLib 2.32 (not 2.31), so adjust the check accordingly. Abort in case thread creation fails (as documented). Properly initialize threads or it will abort on runtime (this also requires linking epan with gthreads in CMake, autotools already includes it with GLIB_LIBS). Change-Id: Ie81d6df7b3b26aaa4eb25e23719a220755e2c13c Reviewed-on: https://code.wireshark.org/review/24978 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Reviewed-by: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-12-23Put special pipe-handling code into libwsutil.Guy Harris4-0/+223
Ask, in a comment, why we're doing PeekNamedPipe() when we're trying to read everyting in the pipe, up to the EOF, into a string. On UN*X, do the same "read up to an EOF and then NUL-terminate the result" stuff that we did on Windows; nothing guarantees that, on all UN*Xes, in all circumstances, until the end of time, world without end, amen, we can do one read and get the entire string. Change-Id: I578802b23fec1051139eaefd9a09fe2a6de06a11 Reviewed-on: https://code.wireshark.org/review/24959 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-12-17Log output updates.Gerald Combs2-0/+58
Add a Qt message handler that calls g_log. Add milliseconds to the g_log_message_handler timestamp. Change-Id: I5b1c1d902b6b05cd8daa01741b19d6c2048dfb9a Reviewed-on: https://code.wireshark.org/review/24865 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-12-14Refactor plugin registration and loadingJoão Valverde2-233/+150
Put different types of plugins (libwiretap, libwireshark) in different subdirectories, give libwiretap and libwireshark init routines that load the plugins, and have them scan the appropriate subdirectories so that we don't even *try* to, for example, load libwireshark plugins in programs that only use libwiretap. Compiled plugins are stored in subfolders of the plugin folders, with the subfolder name being the Wireshark minor version number (X.Y). There is another hierarchical level for each Wireshark library (libwireshark, libwscodecs and libwiretap). The folder names are respectively plugins/X.Y/{epan,codecs,wiretap}. Currently we only distribute "epan" (libwireshark) plugins. Change-Id: I3438787a6f45820d64ba4ca91cbe3c8864708acb Reviewed-on: https://code.wireshark.org/review/23983 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2017-12-10Convert to using use SPDX identifier on wsutil directoryMichael Mann104-1366/+107
Change-Id: Id73e641499e75bc1afc1dea29682418156f461fe Reviewed-on: https://code.wireshark.org/review/24751 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-12-07wsjsmn: use SPDX identifier.Dario Lombardo2-26/+2
Change-Id: Iefdfd06b3b063a0d497587142996f2cd986d413f Reviewed-on: https://code.wireshark.org/review/24724 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-12-01[glib-compat] #include "ws_attributes.h" needed to handle _U_AndersBroman1-0/+2
Change-Id: Ie7aa8ef0a2ec8e65947e214488809d0df0ee015b Reviewed-on: https://code.wireshark.org/review/24670 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-29Threads: Set lifetimes and add a compatibility routine.Gerald Combs2-0/+14
Join the protocol registration threads so that they call g_thread_unref which in turn detaches/terminates the thread. This gets rid of many TSan and DRD errors here. The remaining ones appear to be false positives. Add g_thread_new to glib-compat (untested). Change-Id: I4beb6746ed08656715cf7870ac63ff80cf1ef871 Reviewed-on: https://code.wireshark.org/review/24619 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>
2017-11-23[glib-compat] g_async_queue_timeout_pop() needed for older glibsAndersBroman2-0/+23
(2.31.18) Change-Id: I727c8548c29b3409fab819dce072e86153232911 Reviewed-on: https://code.wireshark.org/review/24550 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-23[glib-compat] Add g_ptr_array_new_full().AndersBroman2-2/+39
Change-Id: Ic0e054cbb28106cc02f229ad4f2476b39e544378 Reviewed-on: https://code.wireshark.org/review/24544 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-19Fix (and chop) static build optionJoão Valverde1-8/+6
This sets the scope of the static build option to Wireshark support libraries only. Before the patch: Static plugins don't work with CMake and autotools. autotools static build is broken, and most likely will always be, as building Wireshark all-static is difficult and time-consuming. After the patch: For CMake Wireshark will be built with static or shared libraries and dynamic plugins. Everything just works. CMake apparently doesn't want you building static and shared libraries at the same time. For autotools Wireshark will be built with shared libraries by default. --disable-shared and --enable-static options work as usual. Dlopened plugins are not built if --disable-shared is given to configure (to disable shared libraries). This is a limitations imposed by libtool. Tested on Linux. This removes broken support for building plugins statically. Change-Id: Ib8e8176976f136eea93a2ce8f9857b6cf9bec64c Reviewed-on: https://code.wireshark.org/review/24241 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2017-11-09Replace inet_addr() with our inet_pton() wrapperJoão Valverde2-1/+8
Error checking omitted like in original code. Change-Id: If8b4181d30ddf5717951aaf7ec61db25c0bc5322 Reviewed-on: https://code.wireshark.org/review/24309 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2017-10-30Avoid asserting with EAFNOSUPPORTJoão Valverde1-9/+34
We require support for AF_INET/AF_INET6 to run and assume this is available on all supported platforms. If and when reality clashes with that assumption just avoid aborting. Errors are to be expected as long as they don't produce a crash. Change-Id: I5c107b1a8fd64441eb96f48381412e180b66feb7 Reviewed-on: https://code.wireshark.org/review/24187 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2017-10-30Add wsutil/inet_ipv4.h.Guy Harris2-0/+45
It defines a ws_in4_addr type, which is intended to hold IPv4 addresses in network byte order, and some macros to test for IPv4 addresses in the local network control block and multicast IPv4 addresses. Use those macros in places where dissectors had their own code for that purpose. Change-Id: I4252b410e37207157be85119a332e2a6913b332f Reviewed-on: https://code.wireshark.org/review/24178 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-10-29Do not assert in ws_inet_ntop()João Valverde2-11/+17
Change-Id: I9d420c5f6bc29ce94855017739169dc8e8ce4d48 Reviewed-on: https://code.wireshark.org/review/24173 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2017-10-29More ws_inet_ntop() tweaks.João Valverde1-2/+20
Change-Id: I8f77f189337f9299e566a4149ae6ea481d3dbed6 Reviewed-on: https://code.wireshark.org/review/24162 Reviewed-by: João Valverde <j@v6e.pt>
2017-10-29Go with the RFC 2133-and-successors values for IPv4 and IPv6 address strings.Guy Harris1-4/+31
Add a comment explaining why Windows has different, larger values for INET_ADDRSTRLEN and INET6_ADDRSTRLEN. Change-Id: I4ad53c6cffae46d108f778460ce653dcc9343c64 Reviewed-on: https://code.wireshark.org/review/24155 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-10-26Improve our inet_ntop() wrapperJoão Valverde3-11/+25
Also fix buffer length define, as it is not guaranteed to be 46 on Windows (it never was guaranteed anyway for the libc implementation, but the likelyhood of being greater was small). Change-Id: I2db705d86f825765ed32ec70b8d22058b5d629e8 Reviewed-on: https://code.wireshark.org/review/24074 Reviewed-by: João Valverde <j@v6e.pt>
2017-10-26Rename some IPv6 address test functions.Guy Harris1-3/+3
They test where the address is XXX, for various values of XXX, so name them accordingly. Change-Id: I437175f02b3f97fecee77e8bb9416bb5b71cd0d0 Reviewed-on: https://code.wireshark.org/review/24075 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-10-26Add a ws_in6_addr typedef for struct e_in6_addr.Guy Harris3-10/+10
That allows a parallel typedef of ws_in4_addr for guint32. Change-Id: I03b230247065e0e3840eb87635315a8e523ef562 Reviewed-on: https://code.wireshark.org/review/24073 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-10-26CMake: Don't check for windows.h or winsock2.h.Gerald Combs2-13/+3
If we're building on Windows we're going to have windows.h and winsock2.h. Don't bother checking for them. Change-Id: I0004c44d7364ab3f41682f34b8c84cd8617c9603 Reviewed-on: https://code.wireshark.org/review/24068 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>