diff options
| -rw-r--r-- | extcap/androiddump.c | 32 | ||||
| -rw-r--r-- | extcap/extcap-base.h | 38 | ||||
| -rw-r--r-- | extcap/randpktdump.c | 37 | ||||
| -rw-r--r-- | extcap/sshdump.c | 36 |
4 files changed, 37 insertions, 106 deletions
diff --git a/extcap/androiddump.c b/extcap/androiddump.c index 1bedc68165..e5b68fbfb7 100644 --- a/extcap/androiddump.c +++ b/extcap/androiddump.c @@ -39,10 +39,6 @@ #include <unistd.h> #endif -#ifdef HAVE_GETOPT_H - #include <getopt.h> -#endif - #ifdef HAVE_SYS_SOCKET_H #include <sys/socket.h> #endif @@ -51,34 +47,6 @@ #include <arpa/inet.h> #endif -#ifndef HAVE_GETOPT_LONG - #include "wsutil/wsgetopt.h" -#endif - -#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 -#else - /* - * UN*X, or Windows pretending to be UN*X with the aid of Cygwin. - */ - #define closesocket(socket) close(socket) - #define socket_handle_t int - #define INVALID_SOCKET (-1) - #define SOCKET_ERROR (-1) -#endif - /* Configuration options */ /* #define ANDROIDDUMP_USE_LIBPCAP */ #define EXTCAP_ENCAP_BLUETOOTH_H4_WITH_PHDR 1 diff --git a/extcap/extcap-base.h b/extcap/extcap-base.h index 0dabd8b2a9..9da001a87b 100644 --- a/extcap/extcap-base.h +++ b/extcap/extcap-base.h @@ -28,6 +28,42 @@ #include <glib/gprintf.h> #include <stdlib.h> +#ifdef HAVE_GETOPT_H + #include <getopt.h> +#endif + +#ifndef HAVE_GETOPT_LONG + #include "wsutil/wsgetopt.h" +#endif + +#ifdef _WIN32 + #include <io.h> +#endif + +#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 +#else + /* + * UN*X, or Windows pretending to be UN*X with the aid of Cygwin. + */ + #define closesocket(socket) close(socket) + #define socket_handle_t int + #define INVALID_SOCKET (-1) + #define SOCKET_ERROR (-1) +#endif + #define EXTCAP_BASE_OPTIONS_ENUM \ OPT_LIST_INTERFACES, \ OPT_LIST_DLTS, \ @@ -60,4 +96,4 @@ * * vi: set shiftwidth=4 tabstop=4 noexpandtab: * :indentSize=4:tabSize=4:noTabs=false: - */
\ No newline at end of file + */ diff --git a/extcap/randpktdump.c b/extcap/randpktdump.c index aa16ebcd0a..c31293e595 100644 --- a/extcap/randpktdump.c +++ b/extcap/randpktdump.c @@ -28,43 +28,6 @@ #include "randpkt_core/randpkt_core.h" - -#ifdef HAVE_GETOPT_H - #include <getopt.h> -#endif - -#ifndef HAVE_GETOPT_LONG - #include "wsutil/wsgetopt.h" -#endif - -#ifdef _WIN32 -#include <io.h> -#endif - -#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 -#else -/* - * UN*X, or Windows pretending to be UN*X with the aid of Cygwin. - */ -#define closesocket(socket) close(socket) -#define socket_handle_t int -#define INVALID_SOCKET (-1) -#define SOCKET_ERROR (-1) -#endif - #define RANDPKT_EXTCAP_INTERFACE "randpkt" #define RANDPKTDUMP_VERSION_MAJOR 0 #define RANDPKTDUMP_VERSION_MINOR 1 diff --git a/extcap/sshdump.c b/extcap/sshdump.c index 8a932bb70a..016d9d27b0 100644 --- a/extcap/sshdump.c +++ b/extcap/sshdump.c @@ -45,42 +45,6 @@ #include "log.h" -#ifdef _WIN32 -#include <io.h> -#endif - -#ifdef HAVE_GETOPT_H -#include <getopt.h> -#endif - -#ifndef HAVE_GETOPT_LONG - #include "wsutil/wsgetopt.h" -#endif - -#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 -#else -/* - * UN*X, or Windows pretending to be UN*X with the aid of Cygwin. - */ -#define closesocket(socket) close(socket) -#define socket_handle_t int -#define INVALID_SOCKET (-1) -#define SOCKET_ERROR (-1) -#endif - #if defined(__FreeBSD__) || defined(BSD) || defined(__APPLE__) || defined(__linux__) #define USE_GETIFADDRS 1 #include <ifaddrs.h> |