aboutsummaryrefslogtreecommitdiffstats
path: root/sharkd_daemon.c
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2017-01-25 22:20:07 -0800
committerGuy Harris <guy@alum.mit.edu>2017-01-26 07:00:06 +0000
commit5fbcfd632a7446da946a8b1e27004a401b8d74f3 (patch)
tree49742c1657f00bda14b72d7f9e9bec12d263d931 /sharkd_daemon.c
parent1165dfc8f6b2feead7c989508f38c83f788b5afb (diff)
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 'sharkd_daemon.c')
-rw-r--r--sharkd_daemon.c25
1 files changed, 3 insertions, 22 deletions
diff --git a/sharkd_daemon.c b/sharkd_daemon.c
index 408c6db..ca176ca 100644
--- a/sharkd_daemon.c
+++ b/sharkd_daemon.c
@@ -35,9 +35,7 @@
#include <unistd.h>
#endif
-#ifdef HAVE_SYS_SOCKET_H
-#include <sys/socket.h>
-#endif
+#include <wsutil/socket.h>
#ifdef HAVE_NETINET_IN_H
#include <netinet/in.h>
@@ -48,23 +46,6 @@
#include <netinet/tcp.h>
#endif
-/*
-#if defined(_WIN32)
- #ifdef HAVE_WINDOWS_H
- #include <windows.h>
- #endif
-
- #include <ws2tcpip.h>
-
- #ifdef HAVE_WINSOCK2_H
- #include <winsock2.h>
- #endif
-#endif
-*/
-#ifdef HAVE_ARPA_INET_H
-#include <arpa/inet.h>
-#endif
-
#include <wsutil/strtoi.h>
#include "sharkd.h"
@@ -80,7 +61,7 @@ socket_init(char *path)
if (!strncmp(path, "unix:", 5))
{
struct sockaddr_un s_un;
- size_t s_un_len;
+ socklen_t s_un_len;
path += 5;
@@ -95,7 +76,7 @@ socket_init(char *path)
s_un.sun_family = AF_UNIX;
g_strlcpy(s_un.sun_path, path, sizeof(s_un.sun_path));
- s_un_len = offsetof(struct sockaddr_un, sun_path) + strlen(s_un.sun_path);
+ s_un_len = (socklen_t)(offsetof(struct sockaddr_un, sun_path) + strlen(s_un.sun_path));
if (s_un.sun_path[0] == '@')
s_un.sun_path[0] = '\0';