diff options
| author | Guy Harris <guy@alum.mit.edu> | 2019-05-01 18:46:23 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2019-05-02 09:29:01 +0000 |
| commit | 2ee483a222bc765f8a738dfa15124826d89dc543 (patch) | |
| tree | b1011d49978414331d191c2190318cb1d92d634e /extcap/CMakeLists.txt | |
| parent | 7bc066aa0c74f8c595ba01678832f2ac17e279dc (diff) | |
Move the Winsock initialization and cleanup to wsutil routines.
Those routines exist on both Windows and UN*X, but they don't do
anything on UN*X (they could if it were ever necessary).
That eliminates some #ifdefs, and also means that the gory details of
initializing Winsock, including the Winsock version being requested,
are buried in one routine.
The initialization routine returns NULL on success and a pointer to a
g_malloc()ated error message on failure; report the error to the user,
along with a "report this to the Wireshark developers" suggestion.
That means including wsutil/socket.h, which obviates the need to include
some headers for socket APIs, as it includes them for you.
Change-Id: I9327bbf25effbb441e4217edc5354a4d5ab07186
Reviewed-on: https://code.wireshark.org/review/33045
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'extcap/CMakeLists.txt')
| -rw-r--r-- | extcap/CMakeLists.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/extcap/CMakeLists.txt b/extcap/CMakeLists.txt index 9ed9be36e4..398d712efe 100644 --- a/extcap/CMakeLists.txt +++ b/extcap/CMakeLists.txt @@ -200,6 +200,7 @@ endif() if(BUILD_udpdump) set(udpdump_LIBS + wsutil ${GLIB2_LIBRARIES} ${CMAKE_DL_LIBS} ${WIN_WS2_32_LIBRARY} @@ -224,6 +225,7 @@ if(BUILD_randpktdump) set(randpktdump_LIBS randpkt_core wiretap + wsutil ${GLIB2_LIBRARIES} ${ZLIB_LIBRARIES} ${CMAKE_DL_LIBS} |