Use setSocketOptionAndWarnOnError instead of ur_setsockopt directly

Author: urfeex

src/comm/tcp_server.cpp

@@ -70,11 +70,11 @@ void TCPServer::init()
   {
     throw makeSocketError("Failed to create socket endpoint");
   }
-  int flag = 1;
+  constexpr int flag = 1;
 #ifndef _WIN32
-  ur_setsockopt(listen_fd_, SOL_SOCKET, SO_REUSEADDR, &flag, sizeof(int));
+  setSocketOptionAndWarnOnError(listen_fd_, SOL_SOCKET, SO_REUSEADDR, &flag, sizeof(flag), "SO_REUSEADDR");
 #endif
-  ur_setsockopt(listen_fd_, SOL_SOCKET, SO_KEEPALIVE, &flag, sizeof(int));
+  setSocketOptionAndWarnOnError(listen_fd_, SOL_SOCKET, SO_KEEPALIVE, &flag, sizeof(flag), "SO_KEEPALIVE");
 
   URCL_LOG_DEBUG("Created socket with FD %d", (int)listen_fd_);
 

src/comm/tcp_socket.cpp

@@ -24,6 +24,7 @@
 #include <cstring>
 #include <sstream>
 #include <thread>
+#include "ur_client_library/comm/socket_t.h"
 
 #ifndef _WIN32
 #  include <arpa/inet.h>
@@ -52,22 +53,23 @@ TCPSocket::~TCPSocket()
 
 void TCPSocket::setupOptions()
 {
-  int flag = 1;
-  ur_setsockopt(socket_fd_, IPPROTO_TCP, TCP_NODELAY, &flag, sizeof(int));
+  constexpr int flag = 1;
+  setSocketOptionAndWarnOnError(socket_fd_, IPPROTO_TCP, TCP_NODELAY, &flag, sizeof(flag), "TCP_NODELAY");
 
   // macOS does not have TCP_QUICKACK
 #ifdef TCP_QUICKACK
-  ur_setsockopt(socket_fd_, IPPROTO_TCP, TCP_QUICKACK, &flag, sizeof(int));
+  setSocketOptionAndWarnOnError(socket_fd_, IPPROTO_TCP, TCP_QUICKACK, &flag, sizeof(flag), "TCP_QUICKACK");
 #endif
 
   if (recv_timeout_ != nullptr)
   {
 #ifdef _WIN32
     DWORD value = recv_timeout_->tv_sec * 1000;
     value += recv_timeout_->tv_usec / 1000;
-    ur_setsockopt(socket_fd_, SOL_SOCKET, SO_RCVTIMEO, &value, sizeof(value));
+    setSocketOptionAndWarnOnError(socket_fd_, SOL_SOCKET, SO_RCVTIMEO, &value, sizeof(value), "SO_RCVTIMEO");
 #else
-    ur_setsockopt(socket_fd_, SOL_SOCKET, SO_RCVTIMEO, recv_timeout_.get(), sizeof(timeval));
+    setSocketOptionAndWarnOnError(socket_fd_, SOL_SOCKET, SO_RCVTIMEO, recv_timeout_.get(), sizeof(timeval),
+                                  "SO_RCVTIMEO");
 #endif
   }
 }