Cast arguments to socklen_t.

That should squelch some warnings on Windows.

Change-Id: I55b394be12203e14af023fdcc5d46564d0fcfa34
Reviewed-on: https://code.wireshark.org/review/19797
Reviewed-by: Guy Harris <guy@alum.mit.edu>

2 files changed, 7 insertions, 7 deletions

diff --git a/extcap/androiddump.c b/extcap/androiddump.c
index 09386a4169..060c569eba 100644
--- a/extcap/androiddump.c
+++ b/extcap/androiddump.c
@@ -259,14 +259,14 @@ static void useSndTimeout(socket_handle_t  sock) {
 #ifdef _WIN32
     const DWORD socket_timeout = SOCKET_SEND_TIMEOUT_MS;
 
-    res = setsockopt(sock, SOL_SOCKET, SO_SNDTIMEO, (const char *) &socket_timeout, sizeof(socket_timeout));
+    res = setsockopt(sock, SOL_SOCKET, SO_SNDTIMEO, (const char *) &socket_timeout, (socklen_t)sizeof(socket_timeout));
 #else
     const struct timeval socket_timeout = {
         .tv_sec = SOCKET_SEND_TIMEOUT_MS / 1000,
         .tv_usec = (SOCKET_SEND_TIMEOUT_MS % 1000) * 1000
     };
 
-    res = setsockopt(sock, SOL_SOCKET, SO_SNDTIMEO, &socket_timeout, sizeof(socket_timeout));
+    res = setsockopt(sock, SOL_SOCKET, SO_SNDTIMEO, &socket_timeout, (socklen_t)sizeof(socket_timeout));
 #endif
     if (res != 0)
         g_debug("Can't set socket timeout, using default");
@@ -412,7 +412,7 @@ static socket_handle_t adb_connect(const char *server_ip, unsigned short *server
 
     useSndTimeout(sock);
 
-    if (connect(sock, (struct sockaddr *) &server, sizeof(server)) == SOCKET_ERROR) {
+    if (connect(sock, (struct sockaddr *) &server, (socklen_t)sizeof(server)) == SOCKET_ERROR) {
 #if 0
 /* NOTE: This does not work well - make significant delay while initializing Wireshark.
          Do fork() then call "adb" also does not make sense, because there is need to
@@ -431,7 +431,7 @@ static socket_handle_t adb_connect(const char *server_ip, unsigned short *server
             return INVALID_SOCKET;
         };
 
-        if (connect(sock, (struct sockaddr *) &server, sizeof(server)) == SOCKET_ERROR) {
+        if (connect(sock, (struct sockaddr *) &server, (socklen_t)sizeof(server)) == SOCKET_ERROR) {
             g_warning("Cannot connect to ADB: <%s> Please check that adb daemon is running.", strerror(errno));
             closesocket(sock);
             return INVALID_SOCKET;
diff --git a/extcap/udpdump.c b/extcap/udpdump.c
index 415fc3d986..1eb98984bb 100644
--- a/extcap/udpdump.c
+++ b/extcap/udpdump.c
@@ -133,12 +133,12 @@ static int setup_listener(const guint16 port, socket_handle_t* sock)
 	}
 
 	optval = 1;
-	if (setsockopt(*sock, SOL_SOCKET, SO_REUSEADDR, (char*)&optval, sizeof(int)) < 0) {
+	if (setsockopt(*sock, SOL_SOCKET, SO_REUSEADDR, (char*)&optval, (socklen_t)sizeof(int)) < 0) {
 		g_warning("Can't set socket option SO_REUSEADDR: %s", strerror(errno));
 		goto cleanup_setup_listener;
 	}
 
-	if (setsockopt (*sock, SOL_SOCKET, SO_RCVTIMEO, (char*)&timeout, sizeof(timeout)) < 0) {
+	if (setsockopt (*sock, SOL_SOCKET, SO_RCVTIMEO, (char*)&timeout, (socklen_t)sizeof(timeout)) < 0) {
 		g_warning("Can't set socket option SO_RCVTIMEO: %s", strerror(errno));
 		goto cleanup_setup_listener;
 	}
@@ -148,7 +148,7 @@ static int setup_listener(const guint16 port, socket_handle_t* sock)
 	serveraddr.sin_addr.s_addr = htonl(INADDR_ANY);
 	serveraddr.sin_port = htons(port);
 
-	if (bind(*sock, (struct sockaddr *)&serveraddr, sizeof(serveraddr)) < 0) {
+	if (bind(*sock, (struct sockaddr *)&serveraddr, (socklen_t)sizeof(serveraddr)) < 0) {
 		g_warning("Error on binding: %s", strerror(errno));
 		goto cleanup_setup_listener;
 	}