Added UNIX-domain sockets to Windows and made them a CMake option for all platforms.

Author: fpagliughi

CMakeLists.txt

@@ -53,7 +53,15 @@ option(SOCKPP_BUILD_TESTS "Build unit tests" OFF)
 option(SOCKPP_BUILD_DOCUMENTATION "Create Doxygen reference documentation" OFF)
 option(SOCKPP_WITH_OPENSSL "TLS Secure Sockets with OpenSSL" OFF)
 option(SOCKPP_WITH_MBEDTLS "TLS Secure Sockets with Mbed TLS" OFF)
-option(SOCKPP_WITH_CAN "Include support for Linux SocketCAN components" OFF)
+
+if(NOT WIN32)
+    if(CMAKE_SYSTEM_NAME MATCHES "Linux")
+        option(SOCKPP_WITH_CAN "Include support for Linux SocketCAN components" OFF)
+    endif()
+    option(SOCKPP_WITH_UNIX_SOCKETS "Include support for UNIX-domain sockets" ON)
+else()
+    option(SOCKPP_WITH_UNIX_SOCKETS "Include support for UNIX-domain sockets" OFF)
+endif()
 
 # ----- Find any dependencies -----
 

examples/CMakeLists.txt

@@ -36,16 +36,25 @@
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 # ---------------------------------------------------------------------------
 
+# --- General TCP/IP examples ---
+
 add_subdirectory(tcp)
 add_subdirectory(udp)
 
-if(UNIX)
+# --- Optional UNIX-domain sockets (even on Windows!) ---
+
+if(SOCKPP_WITH_UNIX_SOCKETS)
 	add_subdirectory(unix)
-	if(SOCKPP_BUILD_CAN)
-		add_subdirectory(linux)
-	endif()
 endif()
 
+# --- Anything that is Linux-specific ---
+
+if(CMAKE_SYSTEM_NAME MATCHES "Linux")
+    add_subdirectory(linux)
+endif()
+
+# --- Optional secure sockets ---
+ 
 if(SOCKPP_WITH_TLS)
   add_subdirectory(tls)
 endif()

examples/linux/CMakeLists.txt

@@ -37,19 +37,22 @@
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 # ---------------------------------------------------------------------------
 
-# --- Executables ---
+# --- Optional Linux SocketCAN support ---
 
-set(EXECUTABLES 
-	cantime
-	canrecv
-)
+if(SOCKPP_WITH_CAN)
+    # --- Executables ---
 
-foreach(EXECUTABLE ${EXECUTABLES})
-    add_executable(${EXECUTABLE} ${EXECUTABLE}.cpp)
-    target_link_libraries(${EXECUTABLE} Sockpp::sockpp)
-endforeach()
+    set(EXECUTABLES 
+    	cantime
+    	canrecv
+    )
 
-# --- Install examples ---
+    foreach(EXECUTABLE ${EXECUTABLES})
+        add_executable(${EXECUTABLE} ${EXECUTABLE}.cpp)
+        target_link_libraries(${EXECUTABLE} Sockpp::sockpp)
+    endforeach()
 
-install(TARGETS ${EXECUTABLES} RUNTIME DESTINATION bin)
+    # --- Install examples ---
 
+    install(TARGETS ${EXECUTABLES} RUNTIME DESTINATION bin)
+endif()

examples/unix/CMakeLists.txt

@@ -37,6 +37,8 @@
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 # ---------------------------------------------------------------------------
 
+# Remember that Windows doesn't support datagram over UNIX sockets
+
 # --- For apps that use threads ---
 
 set(THREADS_PREFER_PTHREAD_FLAG ON)
@@ -46,16 +48,22 @@ find_package(Threads REQUIRED)
 
 set(THREADED_EXECUTABLES
     unechosvr
-    undgramechosvr
 )
 
+if(NOT WIN32)
+    list(APPEND THREADED_EXECUTABLES undgramechosvr)
+endif()
+
 set(EXECUTABLES
     unecho
     unechotest
-    undgramecho
     ${THREADED_EXECUTABLES}
 )
 
+if(NOT WIN32)
+    list(APPEND EXECUTABLES undgramecho)
+endif()
+
 # --- Executables ---
 
 foreach(EXECUTABLE ${EXECUTABLES})

examples/unix/unecho.cpp

@@ -50,7 +50,13 @@ int main(int argc, char* argv[]) {
     cout << "Sample Unix-domain echo client for 'sockpp' " << sockpp::SOCKPP_VERSION << '\n'
          << endl;
 
-    string path = (argc > 1) ? argv[1] : "/tmp/unechosvr.sock";
+    #if defined(_WIN32)
+        const string DFLT_PATH = "C:\\TEMP\\unechosvr.sock"s;
+    #else
+        string DFLT_PATH = "/tmp/unechosvr.sock"s;
+    #endif
+
+    const string path = (argc > 1) ? argv[1] : DFLT_PATH;
 
     sockpp::initialize();
     sockpp::unix_connector conn;

examples/unix/unechosvr.cpp

@@ -40,12 +40,12 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 // --------------------------------------------------------------------------
 
-#include <iostream>
-#include <thread>
-
 #include "sockpp/unix_acceptor.h"
 #include "sockpp/version.h"
 
+#include <iostream>
+#include <thread>
+
 using namespace std;
 
 // --------------------------------------------------------------------------
@@ -72,11 +72,14 @@ int main(int argc, char* argv[]) {
     cout << "Sample Unix-domain echo server for 'sockpp' " << sockpp::SOCKPP_VERSION << '\n'
          << endl;
 
-    string path = "/tmp/unechosvr.sock";
 
-    if (argc > 1) {
-        path = argv[1];
-    }
+    #if defined(_WIN32)
+        const string DFLT_PATH = "C:\\TEMP\\unechosvr.sock"s;
+    #else
+        string DFLT_PATH = "/tmp/unechosvr.sock"s;
+    #endif
+
+    const string path = (argc > 1) ? argv[1] : DFLT_PATH;
 
     sockpp::initialize();
     sockpp::unix_acceptor acc;

examples/unix/unechotest.cpp

@@ -59,7 +59,13 @@ int main(int argc, char* argv[]) {
          << '\n'
          << endl;
 
-    string path = (argc > 1) ? argv[1] : "/tmp/unechosvr.sock";
+    #if defined(_WIN32)
+        const string DFLT_PATH = "C:\\TEMP\\unechosvr.sock"s;
+    #else
+        string DFLT_PATH = "/tmp/unechosvr.sock"s;
+    #endif
+
+    const string path = (argc > 1) ? argv[1] : DFLT_PATH;
     size_t n = (argc > 2) ? size_t(atoll(argv[2])) : DFLT_N;
     size_t sz = (argc > 3) ? size_t(atoll(argv[3])) : DFLT_SZ;
 

include/sockpp/platform.h

@@ -61,9 +61,14 @@
         #define _CRT_SECURE_NO_DEPRECATE
     #endif
 
+    #undef UNICODE
+
     #include <winsock2.h>
     #include <ws2tcpip.h>
 
+    #undef max
+    #undef min
+
     #define SOCKPP_SOCKET_T_DEFINED
 using socket_t = SOCKET;
 

include/sockpp/unix_address.h

@@ -46,16 +46,20 @@
 #ifndef __sockpp_unix_addr_h
 #define __sockpp_unix_addr_h
 
-#include <sys/un.h>
+#include "sockpp/platform.h"
+#include "sockpp/result.h"
+#include "sockpp/sock_address.h"
+#include "sockpp/types.h"
 
 #include <cstring>
 #include <iostream>
 #include <string>
 
-#include "sockpp/platform.h"
-#include "sockpp/result.h"
-#include "sockpp/sock_address.h"
-#include "sockpp/types.h"
+#if defined(_WIN32)
+    #include <afunix.h>
+#else
+    #include <sys/un.h>
+#endif
 
 namespace sockpp {
 

include/sockpp/unix_dgram_socket.h

@@ -47,6 +47,10 @@
 #ifndef __sockpp_unix_dgram_socket_h
 #define __sockpp_unix_dgram_socket_h
 
+#if defined(_WIN32)
+    #error "UNIX datagram sockets not supported on Windows"
+#endif
+
 #include "sockpp/datagram_socket.h"
 #include "sockpp/unix_address.h"
 

src/CMakeLists.txt

@@ -53,16 +53,17 @@ set(SOURCES
 
 # Additional sources (platform & config)
 
-if(UNIX)
+if(SOCKPP_WITH_UNIX_SOCKETS)
     list(APPEND SOURCES
         ${CMAKE_CURRENT_SOURCE_DIR}/unix/unix_address.cpp
     )
-    if(SOCKPP_WITH_CAN)
-        list(APPEND SOURCES
-            ${CMAKE_CURRENT_SOURCE_DIR}/linux/can_address.cpp
-            ${CMAKE_CURRENT_SOURCE_DIR}/linux/can_socket.cpp
-        )
-    endif()
+endif()
+
+if(SOCKPP_WITH_CAN)
+    list(APPEND SOURCES
+        ${CMAKE_CURRENT_SOURCE_DIR}/linux/can_address.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/linux/can_socket.cpp
+    )
 endif()
 
 if(SOCKPP_WITH_OPENSSL)

src/unix/unix_address.cpp

@@ -36,6 +36,7 @@
 
 #include "sockpp/unix_address.h"
 
+#include <algorithm>
 #include <cstring>
 #include <stdexcept>
 
@@ -56,7 +57,8 @@ unix_address::unix_address(const string& path) {
 
     addr_.sun_family = ADDRESS_FAMILY;
     // Remember, if len==MAX, there's no NUL terminator
-    ::strncpy(addr_.sun_path, path.c_str(), MAX_PATH_NAME);
+    const size_t n = std::min(path.length()+1, MAX_PATH_NAME);
+    std::memcpy(addr_.sun_path, path.c_str(), n);
 }
 
 unix_address::unix_address(const string& path, error_code& ec) noexcept {
@@ -67,7 +69,8 @@ unix_address::unix_address(const string& path, error_code& ec) noexcept {
         ec = error_code{};
         addr_.sun_family = ADDRESS_FAMILY;
         // Remember, if len==MAX, there's no NUL terminator
-        ::strncpy(addr_.sun_path, path.c_str(), MAX_PATH_NAME);
+        const size_t n = std::min(path.length()+1, MAX_PATH_NAME);
+        std::memcpy(addr_.sun_path, path.c_str(), n);
     }
 }