remove warnings from msvc (#665)

CMakeLists.txt

@@ -92,8 +92,11 @@ if(CMAKE_COMPILER_IS_GNUCC OR "x${CMAKE_C_COMPILER_ID}" STREQUAL "xClang")
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_DARWIN_C_SOURCE=1")
   endif()
 elseif(MSVC)
-    set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /MT")
-    set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /MTd")
+  SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /W3 /WX") # Compiler warnings, error on warning
+  SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /D_CRT_SECURE_NO_WARNINGS") # don't give warnings for scanf and printf
+  SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /D_WINSOCK_DEPRECATED_NO_WARNINGS") # inet_ntoa is deprecated but used for compatibility
+  set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /MT")
+  set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /MTd")
 endif()
 
 ############
@@ -356,6 +359,7 @@ if(UA_BUILD_EXAMPLESERVER)
     add_executable(server examples/server.c)
     target_link_libraries(server ${open62541_LIBRARIES} open62541)
     target_link_libraries(server_static ${open62541_LIBRARIES})
+	target_compile_definitions(server_static PRIVATE -DUA_DYNAMIC_LINKING)
     if(WIN32)
         target_link_libraries(server_static ws2_32)
         target_link_libraries(server ws2_32)
@@ -394,11 +398,11 @@ if(UA_BUILD_SELFSIGNED_CERTIFICATE)
 endif()
 
 if(UA_BUILD_EXAMPLECLIENT)
-    add_definitions(-DBENCHMARK)
     set(client_source $<TARGET_OBJECTS:open62541-object>)
     add_executable(client_static examples/client.c ${client_source})
     add_executable(client examples/client.c)
     target_link_libraries(client_static ${open62541_LIBRARIES})
+	target_compile_definitions(client_static PRIVATE -DUA_DYNAMIC_LINKING)
     target_link_libraries(client open62541 ${open62541_LIBRARIES})
     if(WIN32)
         target_link_libraries(client_static ws2_32)

appveyor.yml

@@ -8,15 +8,18 @@ before_build:
 # Workaround for CMake not wanting sh.exe on PATH for MinGW
 - set PATH=%PATH:C:\Program Files\Git\usr\bin;=%
 - set PATH=C:\MinGW\bin;%PATH%
-build_script:
+# Update Cygwin
+- ps: $exePath = "C:\cygwin\setup-x86.exe"; (New-Object Net.WebClient).DownloadFile('https://cygwin.com/setup-x86.exe', $exePath)
+build_script: 
 - cd c:\projects\open62541
-- md build
-- cd build
-- echo "Testing cygwin"
-- C:\cygwin\setup-x86.exe -q -P cmake
-- cmd: '%CYG_ROOT%/bin/bash --login -lc "cd /cygdrive/c/projects/open62541/build; cmake -DUA_BUILD_EXAMPLESERVER:BOOL=ON -DUA_BUILD_EXAMPLECLIENT:BOOL=ON -DUA_BUILD_EXAMPLES:BOOL=ON -G\"Unix Makefiles\" ..; make"'
-- cd ..
-- rd /s /q build
+# cygwin cmake stopped working on 05.07.2016 -- commented out until a fix appears
+#- md build
+#- cd build
+#- echo "Testing cygwin"
+#- C:\cygwin\setup-x86.exe -q -P cmake,gcc-core,make,python
+#- cmd: '%CYG_ROOT%/bin/bash --login -lc "cd /cygdrive/c/projects/open62541/build; cmake -DUA_BUILD_EXAMPLESERVER:BOOL=ON -DUA_BUILD_EXAMPLECLIENT:BOOL=ON -DUA_BUILD_EXAMPLES:BOOL=ON -G\"Unix Makefiles\" ..; make"'
+#- cd ..
+#- rd /s /q build
 - md build
 - cd build
 - echo "Testing MinGW32"

deps/pcg_basic.c

@@ -36,5 +36,5 @@ uint32_t pcg32_random_r(pcg32_random_t* rng) {
     rng->state = oldstate * 6364136223846793005ULL + rng->inc;
     uint32_t xorshifted = (uint32_t)(((oldstate >> 18u) ^ oldstate) >> 27u);
     uint32_t rot = (uint32_t)(oldstate >> 59u);
-    return (xorshifted >> rot) | (xorshifted << ((-rot) & 31));
+    return (xorshifted >> rot) | (xorshifted << ((~rot + 1u) & 31)); /* was (xorshifted >> rot) | (xorshifted << ((-rot) & 31)) */
 }

plugins/ua_clock.c

@@ -38,7 +38,7 @@ UA_DateTime UA_DateTime_nowMonotonic(void) {
     LARGE_INTEGER freq, ticks;
     QueryPerformanceFrequency(&freq);
     QueryPerformanceCounter(&ticks);
-    UA_Double ticks2dt = UA_SEC_TO_DATETIME / freq.QuadPart;
+    UA_Double ticks2dt = UA_SEC_TO_DATETIME / (UA_Double)freq.QuadPart;
     return (UA_DateTime)(ticks.QuadPart * ticks2dt);
 #elif defined(__APPLE__) || defined(__MACH__)
     /* OS X does not have clock_gettime, use clock_get_time */

plugins/ua_network_tcp.c

@@ -1,58 +1,60 @@
 /* This work is licensed under a Creative Commons CCZero 1.0 Universal License.
  * See http://creativecommons.org/publicdomain/zero/1.0/ for more information. */
 
+#if defined(__MINGW32__) && (!defined(WINVER) || WINVER < 0x501)
+/* Assume the target is newer than Windows XP */
+# undef WINVER
+# undef _WIN32_WINDOWS
+# undef _WIN32_WINNT
+# define WINVER 0x0501
+# define _WIN32_WINDOWS 0x0501
+# define _WIN32_WINNT 0x0501
+#endif
+
 #include "ua_network_tcp.h"
 
 #include <stdlib.h> // malloc, free
 #include <stdio.h> // snprintf
 #include <string.h> // memset
 #include <errno.h>
-
 #ifdef _WIN32
 # include <malloc.h>
-# include <winsock2.h>
 # include <ws2tcpip.h>
-# define CLOSESOCKET(S) closesocket(S)
-# define ssize_t long
+# define CLOSESOCKET(S) closesocket((SOCKET)S)
+# define ssize_t int
+# define WIN32_INT (int)
 #else
-# include <fcntl.h>
-# include <sys/select.h>
+# define CLOSESOCKET(S) close(S)
+# define SOCKET int
+# define WIN32_INT
+# include <arpa/inet.h>
 # include <netinet/in.h>
-# ifndef __CYGWIN__
-#  include <netinet/tcp.h>
-# endif
+# include <sys/select.h>
 # include <sys/ioctl.h>
-# include <netdb.h> //gethostbyname for the client
+# include <fcntl.h>
 # include <unistd.h> // read, write, close
-# include <arpa/inet.h>
+# include <netdb.h>
 # ifdef __QNX__
 #  include <sys/socket.h>
 # endif
-# define CLOSESOCKET(S) close(S)
+# ifndef __CYGWIN__
+#  include <netinet/tcp.h>
+# endif
 #endif
 
-/* workaround a glibc bug where an integer conversion is required */
-#if !defined(_WIN32)
-# if defined(__GNU_LIBRARY__) && (__GNU_LIBRARY__ >= 6) && (__GLIBC__ >= 2) && (__GLIBC_MINOR__ >= 16)
-#  define UA_fd_set(fd, fds) FD_SET(fd, fds)
-#  define UA_fd_isset(fd, fds) FD_ISSET(fd, fds)
-# else
-#  define UA_fd_set(fd, fds) FD_SET((unsigned int)fd, fds)
-#  define UA_fd_isset(fd, fds) FD_ISSET((unsigned int)fd, fds)
-# endif
-#else
+/* unsigned int for windows and workaround to a glibc bug */
+#if defined(_WIN32) || (defined(__GNU_LIBRARY__) && (__GNU_LIBRARY__ <= 6) && (__GLIBC__ <= 2) && (__GLIBC_MINOR__ < 16))
 # define UA_fd_set(fd, fds) FD_SET((unsigned int)fd, fds)
 # define UA_fd_isset(fd, fds) FD_ISSET((unsigned int)fd, fds)
+#else
+# define UA_fd_set(fd, fds) FD_SET(fd, fds)
+# define UA_fd_isset(fd, fds) FD_ISSET(fd, fds)
 #endif
 
 #ifdef UA_ENABLE_MULTITHREADING
 # include <urcu/uatomic.h>
 #endif
 
-#ifndef MSG_NOSIGNAL
-#define MSG_NOSIGNAL 0
-#endif
-
 /****************************/
 /* Generic Socket Functions */
 /****************************/
@@ -60,7 +62,7 @@
 static void
 socket_close(UA_Connection *connection) {
     connection->state = UA_CONNECTION_CLOSED;
-    shutdown(connection->sockfd,2);
+    shutdown((SOCKET)connection->sockfd,2);
     CLOSESOCKET(connection->sockfd);
 }
 
@@ -70,29 +72,21 @@ socket_write(UA_Connection *connection, UA_ByteString *buf) {
     do {
         ssize_t n = 0;
         do {
-        /*
-         * If the OS throws EMSGSIZE, force a smaller packet size:
-         *  size_t bytes_to_send = buf->length - nWritten >  1024 ? 1024 : buf->length - nWritten;
-         */
+        /* If the OS throws EMSGSIZE, force a smaller packet size:
+         * size_t bytes_to_send = buf->length - nWritten >  1024 ? 1024 : buf->length - nWritten; */
             size_t bytes_to_send = buf->length - nWritten;
+            n = send((SOCKET)connection->sockfd, (const char*)buf->data + nWritten, WIN32_INT bytes_to_send, 0);
 #ifdef _WIN32
-            n = send((SOCKET)connection->sockfd, (const char*)buf->data + nWritten, bytes_to_send, 0);
-            const int last_error = WSAGetLastError();
-            if(n < 0 && last_error != WSAEINTR && last_error != WSAEWOULDBLOCK) {
-                connection->close(connection);
-                socket_close(connection);
-                UA_ByteString_deleteMembers(buf);
-                return UA_STATUSCODE_BADCONNECTIONCLOSED;
-            }
+            if(n < 0 && WSAGetLastError() != WSAEINTR && WSAGetLastError() != WSAEWOULDBLOCK)
 #else
-            n = send(connection->sockfd, (const char*)buf->data + nWritten, bytes_to_send, MSG_NOSIGNAL);
-            if(n == -1L && errno != EINTR && errno != EAGAIN) {
+            if(n == -1L && errno != EINTR && errno != EAGAIN)
+#endif
+            {
                 connection->close(connection);
                 socket_close(connection);
                 UA_ByteString_deleteMembers(buf);
                 return UA_STATUSCODE_BADCONNECTIONCLOSED;
             }
-#endif
         } while(n == -1L);
         nWritten += (size_t)n;
     } while(nWritten < buf->length);
@@ -112,11 +106,11 @@ socket_recv(UA_Connection *connection, UA_ByteString *response, UA_UInt32 timeou
         /* currently, only the client uses timeouts */
 #ifndef _WIN32
         UA_UInt32 timeout_usec = timeout * 1000;
-    #ifdef __APPLE__
+# ifdef __APPLE__
         struct timeval tmptv = {(long int)(timeout_usec / 1000000), timeout_usec % 1000000};
-    #else
+# else
         struct timeval tmptv = {(long int)(timeout_usec / 1000000), (long int)(timeout_usec % 1000000)};
-    #endif
+# endif
         int ret = setsockopt(connection->sockfd, SOL_SOCKET, SO_RCVTIMEO, (const char *)&tmptv, sizeof(struct timeval));
 #else
         DWORD timeout_dw = timeout;
@@ -182,7 +176,7 @@ socket_recv(UA_Connection *connection, UA_ByteString *response, UA_UInt32 timeou
     return UA_STATUSCODE_GOOD;
 }
 
-static UA_StatusCode socket_set_nonblocking(UA_Int32 sockfd) {
+static UA_StatusCode socket_set_nonblocking(SOCKET sockfd) {
 #ifdef _WIN32
     u_long iMode = 1;
     if(ioctlsocket(sockfd, FIONBIO, &iMode) != NO_ERROR)
@@ -315,7 +309,7 @@ ServerNetworkLayerTCP_add(ServerNetworkLayerTCP *layer, UA_Int32 newsockfd) {
     int res = getpeername(newsockfd, (struct sockaddr*)&addr, &addrlen);
     if(res == 0) {
         UA_LOG_INFO(layer->logger, UA_LOGCATEGORY_NETWORK, "Connection %i | New connection over TCP from %s:%d",
-                    newsockfd, inet_ntoa(addr.sin_addr), ntohs(addr.sin_port));
+            newsockfd, inet_ntoa(addr.sin_addr), ntohs(addr.sin_port));
     } else {
         UA_LOG_WARNING(layer->logger, UA_LOGCATEGORY_NETWORK, "Connection %i | New connection over TCP, getpeername failed with errno %i",
                        newsockfd, errno);
@@ -363,38 +357,44 @@ ServerNetworkLayerTCP_start(UA_ServerNetworkLayer *nl, UA_Logger logger) {
     }
     UA_String_copy(&du, &nl->discoveryUrl);
 
-    /* open the server socket */
+    /* Create the server socket */
+    SOCKET newsock = socket(PF_INET, SOCK_STREAM, 0);
 #ifdef _WIN32
-    if((layer->serversockfd = socket(PF_INET, SOCK_STREAM,0)) == (UA_Int32)INVALID_SOCKET) {
-        UA_LOG_WARNING(layer->logger, UA_LOGCATEGORY_NETWORK, "Error opening socket, code: %d",
-                       WSAGetLastError());
-        return UA_STATUSCODE_BADINTERNALERROR;
-    }
+    if(newsock == INVALID_SOCKET)
 #else
-    if((layer->serversockfd = socket(PF_INET, SOCK_STREAM, 0)) < 0) {
-        UA_LOG_WARNING(layer->logger, UA_LOGCATEGORY_NETWORK, "Error opening socket");
+    if(newsock < 0)
+#endif
+    {
+        UA_LOG_WARNING(layer->logger, UA_LOGCATEGORY_NETWORK, "Error opening the server socket");
         return UA_STATUSCODE_BADINTERNALERROR;
     }
-#endif
-    const struct sockaddr_in serv_addr =
-        {.sin_family = AF_INET, .sin_addr.s_addr = INADDR_ANY,
-         .sin_port = htons(layer->port), .sin_zero = {0}};
+
+    /* Set socket options */
     int optval = 1;
-    if(setsockopt(layer->serversockfd, SOL_SOCKET,
-                  SO_REUSEADDR, (const char *)&optval, sizeof(optval)) == -1) {
-        UA_LOG_WARNING(layer->logger, UA_LOGCATEGORY_NETWORK,
-                       "Error during setting of socket options");
-        CLOSESOCKET(layer->serversockfd);
+    if(setsockopt(newsock, SOL_SOCKET, SO_REUSEADDR, (const char *)&optval, sizeof(optval)) == -1 ||
+       socket_set_nonblocking(newsock) != UA_STATUSCODE_GOOD) {
+        UA_LOG_WARNING(layer->logger, UA_LOGCATEGORY_NETWORK, "Error during setting of server socket options");
+        CLOSESOCKET(newsock);
         return UA_STATUSCODE_BADINTERNALERROR;
     }
-    if(bind(layer->serversockfd, (const struct sockaddr *)&serv_addr,
-            sizeof(serv_addr)) < 0) {
-        UA_LOG_WARNING(layer->logger, UA_LOGCATEGORY_NETWORK, "Error during socket binding");
-        CLOSESOCKET(layer->serversockfd);
+
+    /* Bind socket to address */
+    const struct sockaddr_in serv_addr = {.sin_family = AF_INET, .sin_addr.s_addr = INADDR_ANY,
+                                          .sin_port = htons(layer->port), .sin_zero = {0}};
+    if(bind(newsock, (const struct sockaddr *)&serv_addr, sizeof(serv_addr)) < 0) {
+        UA_LOG_WARNING(layer->logger, UA_LOGCATEGORY_NETWORK, "Error during binding of the server socket");
+        CLOSESOCKET(newsock);
         return UA_STATUSCODE_BADINTERNALERROR;
     }
-    socket_set_nonblocking(layer->serversockfd);
-    listen(layer->serversockfd, MAXBACKLOG);
+
+    /* Start listening */
+    if(listen(newsock, MAXBACKLOG) < 0) {
+        UA_LOG_WARNING(layer->logger, UA_LOGCATEGORY_NETWORK, "Error listening on server socket");
+        CLOSESOCKET(newsock);
+        return UA_STATUSCODE_BADINTERNALERROR;
+    }
+
+    layer->serversockfd = (UA_Int32)newsock; /* cast on win32 */
     UA_LOG_INFO(layer->logger, UA_LOGCATEGORY_NETWORK, "TCP network layer listening on %.*s",
                 nl->discoveryUrl.length, nl->discoveryUrl.data);
     return UA_STATUSCODE_GOOD;
@@ -416,16 +416,18 @@ ServerNetworkLayerTCP_getJobs(UA_ServerNetworkLayer *nl, UA_Job **jobs, UA_UInt1
     /* accept new connections (can only be a single one) */
     if(UA_fd_isset(layer->serversockfd, &fdset)) {
         resultsize--;
-        struct sockaddr_in cli_addr;
-        socklen_t cli_len = sizeof(cli_addr);
-        int newsockfd = accept(layer->serversockfd, (struct sockaddr *) &cli_addr, &cli_len);
-        int i = 1;
-        if(newsockfd >= 0) {
+        SOCKET newsockfd = accept((SOCKET)layer->serversockfd, NULL, NULL);
+#ifdef _WIN32
+        if(newsockfd != INVALID_SOCKET)
+#else
+        if(newsockfd >= 0)
+#endif
+        {
+            socket_set_nonblocking(newsockfd);
             /* Send messages directly and do wait to merge packets (disable Nagle's algorithm) */
+            int i = 1;
             setsockopt(newsockfd, IPPROTO_TCP, TCP_NODELAY, (void *)&i, sizeof(i));
-
-            socket_set_nonblocking(newsockfd);
-            ServerNetworkLayerTCP_add(layer, newsockfd);
+            ServerNetworkLayerTCP_add(layer, (UA_Int32)newsockfd);
         }
     }
 
@@ -481,7 +483,7 @@ ServerNetworkLayerTCP_stop(UA_ServerNetworkLayer *nl, UA_Job **jobs) {
     ServerNetworkLayerTCP *layer = nl->handle;
     UA_LOG_INFO(layer->logger, UA_LOGCATEGORY_NETWORK,
                 "Shutting down the TCP network layer with %d open connection(s)", layer->mappingsSize);
-    shutdown(layer->serversockfd,2);
+    shutdown((SOCKET)layer->serversockfd,2);
     CLOSESOCKET(layer->serversockfd);
     UA_Job *items = malloc(sizeof(UA_Job) * layer->mappingsSize * 2);
     if(!items)
@@ -569,11 +571,17 @@ ClientNetworkLayerClose(UA_Connection *connection) {
 /* we have no networklayer. instead, attach the reusable buffer to the handle */
 UA_Connection
 UA_ClientConnectionTCP(UA_ConnectionConfig localConf, const char *endpointUrl, UA_Logger logger) {
+#ifdef _WIN32
+    WORD wVersionRequested;
+    WSADATA wsaData;
+    wVersionRequested = MAKEWORD(2, 2);
+    WSAStartup(wVersionRequested, &wsaData);
+#endif
+
     UA_Connection connection;
     UA_Connection_init(&connection);
     connection.localConf = localConf;
 
-    //socket_set_nonblocking(connection.sockfd);
     connection.send = socket_write;
     connection.recv = socket_recv;
     connection.close = ClientNetworkLayerClose;
@@ -583,67 +591,68 @@ UA_ClientConnectionTCP(UA_ConnectionConfig localConf, const char *endpointUrl, U
 
     size_t urlLength = strlen(endpointUrl);
     if(urlLength < 11 || urlLength >= 512) {
-        UA_LOG_WARNING((*logger), UA_LOGCATEGORY_NETWORK, "Server url size invalid");
+        UA_LOG_WARNING(logger, UA_LOGCATEGORY_NETWORK, "Server url size invalid");
         return connection;
     }
     if(strncmp(endpointUrl, "opc.tcp://", 10) != 0) {
-        UA_LOG_WARNING((*logger), UA_LOGCATEGORY_NETWORK, "Server url does not begin with opc.tcp://");
+        UA_LOG_WARNING(logger, UA_LOGCATEGORY_NETWORK, "Server url does not begin with opc.tcp://");
         return connection;
     }
 
-    UA_UInt16 portpos = 9;
-    UA_UInt16 port;
-    for(port = 0; portpos < urlLength-1; portpos++) {
-        if(endpointUrl[portpos] == ':') {
-            char *endPtr = NULL;
-            unsigned long int tempulong = strtoul(&endpointUrl[portpos+1], &endPtr, 10);
-            if (ERANGE != errno && tempulong < UINT16_MAX && endPtr != &endpointUrl[portpos+1])
-                port = (UA_UInt16)tempulong;
+    /* where does the port begin? */
+    size_t portpos = 9;
+    for(; portpos < urlLength-1; portpos++) {
+        if(endpointUrl[portpos] == ':')
             break;
-        }
-    }
-    if(port == 0) {
-        UA_LOG_WARNING((*logger), UA_LOGCATEGORY_NETWORK, "Port invalid");
-        return connection;
     }
 
     char hostname[512];
-    for(int i=10; i < portpos; i++)
-        hostname[i-10] = endpointUrl[i];
+    memcpy(hostname, &endpointUrl[10], portpos - 10);
     hostname[portpos-10] = 0;
+
+    const char *port = "4842";
+    if(portpos < urlLength - 1)
+        port = &endpointUrl[portpos + 1];
+    else
+        UA_LOG_INFO(logger, UA_LOGCATEGORY_NETWORK, "No port defined, using standard port %s", port);
+
+    struct addrinfo hints, *server;
+    memset(&hints, 0, sizeof(hints));
+    hints.ai_socktype = SOCK_STREAM;
+    hints.ai_family = AF_INET;
+    int error = getaddrinfo(hostname, port, &hints, &server);
+    if(error != 0 || !server) {
+        UA_LOG_WARNING(logger, UA_LOGCATEGORY_NETWORK, "DNS lookup of %s failed with error %s", hostname, gai_strerror(error));
+        return connection;
+    }
+
+    /* Get a socket */
+    SOCKET clientsockfd = socket(server->ai_family, server->ai_socktype, server->ai_protocol);
 #ifdef _WIN32
-    WORD wVersionRequested;
-    WSADATA wsaData;
-    wVersionRequested = MAKEWORD(2, 2);
-    WSAStartup(wVersionRequested, &wsaData);
-    if((connection.sockfd = socket(PF_INET, SOCK_STREAM,0)) == (UA_Int32)INVALID_SOCKET) {
+    if(clientsockfd == INVALID_SOCKET) {
 #else
-    if((connection.sockfd = socket(AF_INET, SOCK_STREAM, 0)) == -1) {
+    if(clientsockfd < 0) {
 #endif
-        UA_LOG_WARNING((*logger), UA_LOGCATEGORY_NETWORK, "Could not create socket");
-        return connection;
-    }
-    struct hostent *server = gethostbyname(hostname);
-    if(!server) {
-        UA_LOG_WARNING((*logger), UA_LOGCATEGORY_NETWORK, "DNS lookup of %s failed", hostname);
+        UA_LOG_WARNING(logger, UA_LOGCATEGORY_NETWORK, "Could not create client socket");
+        freeaddrinfo(server);
         return connection;
     }
-    struct sockaddr_in server_addr;
-    memset(&server_addr, 0, sizeof(server_addr));
-    memcpy((char *)&server_addr.sin_addr.s_addr, (char *)server->h_addr_list[0], (size_t)server->h_length);
-    server_addr.sin_family = AF_INET;
-    server_addr.sin_port = htons(port);
+
+    /* Connect to the server */
     connection.state = UA_CONNECTION_OPENING;
-    if(connect(connection.sockfd, (struct sockaddr *) &server_addr, sizeof(server_addr)) < 0) {
+    connection.sockfd = (UA_Int32)clientsockfd; /* cast for win32 */
+    error = connect(clientsockfd, server->ai_addr, WIN32_INT server->ai_addrlen);
+    freeaddrinfo(server);
+    if(error < 0) {
         ClientNetworkLayerClose(&connection);
-        UA_LOG_WARNING((*logger), UA_LOGCATEGORY_NETWORK, "Connection failed");
+        UA_LOG_WARNING(logger, UA_LOGCATEGORY_NETWORK, "Connection failed");
         return connection;
     }
 
 #ifdef SO_NOSIGPIPE
     int val = 1;
     if(setsockopt(connection.sockfd, SOL_SOCKET, SO_NOSIGPIPE, (void*)&val, sizeof(val)) < 0) {
-        UA_LOG_WARNING((*logger), UA_LOGCATEGORY_NETWORK, "Couldn't set SO_NOSIGPIPE");
+        UA_LOG_WARNING(logger, UA_LOGCATEGORY_NETWORK, "Couldn't set SO_NOSIGPIPE");
         return connection;
     }
 #endif

tests/CMakeLists.txt

@@ -20,7 +20,9 @@ if(UA_ENABLE_MULTITHREADING)
     list(APPEND LIBS urcu-cds urcu urcu-common)
 endif()
 
-add_definitions(-Wno-sign-conversion)
+if(CMAKE_COMPILER_IS_GNUCC OR "x${CMAKE_C_COMPILER_ID}" STREQUAL "xClang")
+    add_definitions(-Wno-sign-conversion)
+endif()
 
 # the unit test are built directly on the open62541 object files. so they can
 # access symbols that are hidden/not exported to the shared library