diff options
| author | Guy Harris <guy@alum.mit.edu> | 2017-01-25 22:20:07 -0800 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2017-01-26 07:00:06 +0000 |
| commit | 5fbcfd632a7446da946a8b1e27004a401b8d74f3 (patch) | |
| tree | 49742c1657f00bda14b72d7f9e9bec12d263d931 /wsutil | |
| parent | 1165dfc8f6b2feead7c989508f38c83f788b5afb (diff) | |
| download | wireshark-5fbcfd632a7446da946a8b1e27004a401b8d74f3.tar.gz | |
Clean up some UN*X-vs-Windows socket issues.
Have a wsutil/socket.h file, for inclusion by everything that uses
sockets, that contains the UN*X-vs-Windows #includes and #defines to
hide some UN*X-sockets vs. Winsock API differences. That stuff mostly
comes from from extcap/extcap-base.h; have that file just include
wsutil/socket.h rather than defining that stuff itself.
Include it in sharkd_daemon.c. Use socklen_t for the size of things to
pass to bind() as the last argument; wsutil/socket.h defines it as int
on Windows.
Ignore sharkd in Git.
Change-Id: I3f2171b7aa613717f52305f62bfd7d43e0172dc6
Reviewed-on: https://code.wireshark.org/review/19796
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>
Diffstat (limited to 'wsutil')
| -rw-r--r-- | wsutil/Makefile.am | 1 | ||||
| -rw-r--r-- | wsutil/socket.h | 81 |
2 files changed, 82 insertions, 0 deletions
diff --git a/wsutil/Makefile.am b/wsutil/Makefile.am index a8642d4e10..76b968b66b 100644 --- a/wsutil/Makefile.am +++ b/wsutil/Makefile.am @@ -83,6 +83,7 @@ libwsutil_nonrepl_INCLUDES = \ sha2.h \ sign_ext.h \ sober128.h \ + socket.h \ str_util.h \ strnatcmp.h \ strtoi.h \ diff --git a/wsutil/socket.h b/wsutil/socket.h new file mode 100644 index 0000000000..a26eb35363 --- /dev/null +++ b/wsutil/socket.h @@ -0,0 +1,81 @@ +/* socket.h + * Socket wrappers + * + * Copyright 2016, Dario Lombardo + * + * Wireshark - Network traffic analyzer + * By Gerald Combs <gerald@wireshark.org> + * Copyright 1998 Gerald Combs + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ +#ifndef __SOCKET_H__ +#define __SOCKET_H__ + +#include "config.h" + +#if defined(_WIN32) && !defined(__CYGWIN__) + #ifdef HAVE_WINDOWS_H + #include <windows.h> + #endif + + #include <ws2tcpip.h> + + #ifdef HAVE_WINSOCK2_H + #include <winsock2.h> + #endif + + #include <process.h> + + #define socket_handle_t SOCKET + #define socklen_t int +#else + /* + * UN*X, or Windows pretending to be UN*X with the aid of Cygwin. + */ + #ifdef HAVE_UNISTD_H + /* + * For close(). + */ + #include <unistd.h> + #endif + #ifdef HAVE_SYS_SOCKET_H + #include <sys/socket.h> + #endif + + #define closesocket(socket) close(socket) + #define socket_handle_t int + #define INVALID_SOCKET (-1) + #define SOCKET_ERROR (-1) +#endif + +#ifdef HAVE_ARPA_INET_H + #include <arpa/inet.h> +#endif + +#endif /* __SOCKET_H__ */ + +/* + * Editor modelines - https://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 8 + * tab-width: 8 + * indent-tabs-mode: t + * End: + * + * vi: set shiftwidth=8 tabstop=8 noexpandtab: + * :indentSize=8:tabSize=8:noTabs=false: + */ |