Merge branch 'master' of https://github.com/water111/jak-project into w/ir

common/cross_sockets/CMakeLists.txt

@@ -0,0 +1,12 @@
+add_library(cross_sockets
+        SHARED
+        "xsocket.h"
+         "xsocket.cpp")
+
+IF (WIN32)
+  # set stuff for windows
+  target_link_libraries(cross_sockets wsock32 ws2_32)
+ELSE()
+  # set stuff for other systems
+  target_link_libraries(cross_sockets)
+ENDIF()

common/cross_sockets/xsocket.cpp

@@ -0,0 +1,88 @@
+#ifdef __linux
+#include <sys/socket.h>
+#include <netinet/tcp.h>
+#include <unistd.h>
+#elif _WIN32
+#define WIN32_LEAN_AND_MEAN
+#include <WinSock2.h>
+#include <WS2tcpip.h>
+#endif
+#include <errno.h>
+#include <stdio.h>
+#include <string.h>
+
+int open_socket(int af, int type, int protocol) {
+#ifdef __linux
+  return socket(af, type, protocol);
+#elif _WIN32
+  WSADATA wsaData = {0};
+  int iResult = 0;
+  // Initialize Winsock
+  iResult = WSAStartup(MAKEWORD(2, 2), &wsaData);
+  if (iResult != 0) {
+    printf("WSAStartup failed: %d\n", iResult);
+    return 1;
+  }
+  return socket(af, type, protocol);
+#endif
+}
+
+void close_socket(int sock) {
+  if (sock < 0) {
+    return;
+  }
+#ifdef __linux
+  close(sock);
+#elif _WIN32
+  closesocket(sock);
+  WSACleanup();
+#endif
+}
+
+int set_socket_option(int socket, int level, int optname, const void* optval, int optlen) {
+  int ret = setsockopt(socket, level, optname, (char*)&optval, optlen);
+  if (ret < 0) {
+    printf("Failed to setsockopt(%d, %d, %d, _, _) - Error: %s\n", socket, level, optname,
+           strerror(errno));
+  }
+#ifdef _WIN32
+  if (ret < 0) {
+    int err = WSAGetLastError();
+    printf("WSAGetLastError: %d\n", err);
+  }
+#endif
+  return ret;
+}
+
+int set_socket_timeout(int socket, long microSeconds) {
+#ifdef __linux
+  struct timeval timeout = {};
+  timeout.tv_sec = 0;
+  timeout.tv_usec = microSeconds;
+  int ret = setsockopt(socket, SOL_SOCKET, SO_RCVTIMEO, (struct timeval*)&timeout, sizeof(timeout));
+  if (ret < 0) {
+    printf("Failed to setsockopt(%d, %d, %d, _, _) - Error: %s\n", socket, SOL_SOCKET, SO_RCVTIMEO,
+           strerror(errno));
+  }
+  return ret;
+#elif _WIN32
+  unsigned long timeout = microSeconds / 1000;  // milliseconds
+  return set_socket_option(socket, SOL_SOCKET, SO_RCVTIMEO, &timeout, sizeof(timeout));
+#endif
+}
+
+int write_to_socket(int socket, const char* buf, int len) {
+#ifdef __linux
+  return write(socket, buf, len);
+#elif _WIN32
+  return send(socket, buf, len, 0);
+#endif
+}
+
+int read_from_socket(int socket, char* buf, int len) {
+#ifdef __linux
+  return read(socket, buf, len);
+#elif _WIN32
+  return recv(socket, buf, len, 0);
+#endif
+}

common/cross_sockets/xsocket.h

@@ -0,0 +1,20 @@
+#ifdef __linux
+#include <sys/socket.h>
+#include <netinet/tcp.h>
+#include <unistd.h>
+#elif _WIN32
+#include <WinSock2.h>
+#endif
+
+#ifdef __linux
+const int TCP_SOCKET_LEVEL = SOL_TCP;
+#elif _WIN32
+const int TCP_SOCKET_LEVEL = IPPROTO_TCP;
+#endif
+
+int open_socket(int af, int type, int protocol);
+void close_socket(int sock);
+int set_socket_option(int socket, int level, int optname, const void* optval, int optlen);
+int set_socket_timeout(int socket, long microSeconds);
+int write_to_socket(int socket, const char* buf, int len);
+int read_from_socket(int socket, char* buf, int len);