linux support

Author: KirillHit

demo/tcp_server.cpp

@@ -26,19 +26,18 @@ int main()
     sockets::TCPServer server;
     server.set_socket("127.0.0.1", 10000);
     server.set_keepalive(1, 1, 1);
-    server.set_timeout(50);
+    server.set_timeout(500);
     server.socket_bind();
 
     int idx = 0;
     while (true)
     {
-        std::this_thread::sleep_for(500ms);
+        std::this_thread::sleep_for(100ms);
         ++idx;
         std::cout << "try: " << idx << "; " << std::endl;
 
         // Receive message
-        int res =
-            server.receive(reinterpret_cast<char *>(&rx_msg), MSG_SIZE);
+        int res = server.receive(reinterpret_cast<char *>(&rx_msg), MSG_SIZE);
 
         // Processing the result
         switch (res)

demo/udp_server.cpp

@@ -25,19 +25,18 @@ int main()
     // Server initialization
     sockets::UDPServer server;
     server.set_socket("127.0.0.1", 10000);
-    server.set_timeout(1000);
+    server.set_timeout(500);
     server.socket_bind();
 
     int idx = 0;
     while (true)
     {
-        std::this_thread::sleep_for(500ms);
+        //std::this_thread::sleep_for(50ms);
         ++idx;
         std::cout << "try: " << idx << "; " << std::endl;
 
         // Receive message
-        int res =
-            server.receive(reinterpret_cast<char *>(&rx_msg), MSG_SIZE);
+        int res = server.receive(reinterpret_cast<char *>(&rx_msg), MSG_SIZE);
 
         // Processing the result
         switch (res)

include/simple_socket/simple_socket.hpp

@@ -11,6 +11,7 @@
 #include <winsock2.h>
 #else
 #include <arpa/inet.h>
+#include <fcntl.h>
 #include <netinet/tcp.h>
 #include <sys/socket.h>
 #include <unistd.h>
@@ -51,20 +52,20 @@ class Socket
     explicit Socket(SocketType socket_type);
     ~Socket();
     int set_socket(const std::string &ip_address, uint16_t port);
-    void set_timeout(const timeout_ms timeout = 1000);
+    void set_timeout(const timeout_ms timeout = 50);
 
   protected:
     void set_port(uint16_t port);
     int set_address(const std::string &ip_address);
     int socket_init();
     void socket_close();
-    int wait_for_receive(const int sockfd, const timeout_ms timeout = 100);
+    int wait_for_receive(const int sockfd);
 
   protected:
     int sockfd_;
     sockaddr_in address_;
     SocketType socket_type_;
-    timeout_ms timeout_ = 100;
+    timeout_ms timeout_ = 50;
 };
 
 class UDPClient : public Socket

src/simple_socket.cpp

@@ -48,8 +48,8 @@ int Socket::set_socket(const std::string &ip_address, uint16_t port)
 
 /**
  * @brief Sets timeouts for the connect and receive functions
- * 
- * @param timeout timeout in ms. Default 1000 ms. 0 for infinite wait.
+ *
+ * @param timeout timeout in ms. Default 50 ms. 0 for infinite wait.
  */
 void Socket::set_timeout(const timeout_ms timeout)
 {
@@ -84,8 +84,8 @@ int Socket::socket_init()
     }
 
     int optval = 1;
-    if (setsockopt(sockfd_, SOL_SOCKET, SO_REUSEADDR, (char*)&optval, sizeof(optval)) <
-        0)
+    if (setsockopt(sockfd_, SOL_SOCKET, SO_REUSEADDR, (char *)&optval,
+                   sizeof(optval)) < 0)
     {
         return -1;
     }
@@ -103,19 +103,20 @@ void Socket::socket_close()
 #endif
 }
 
-int Socket::wait_for_receive(const int sockfd, const timeout_ms timeout)
+int Socket::wait_for_receive(const int sockfd)
 {
     fd_set set;
     FD_ZERO(&set);
     FD_SET(sockfd, &set);
 
-    if (timeout == 0) {
+    if (timeout_ == 0)
+    {
         return select(0, &set, NULL, NULL, NULL);
     }
 
     timeval tv;
-    tv.tv_sec  = timeout / 1000;
-    tv.tv_usec = (timeout % 1000) * 1000;
+    tv.tv_sec = timeout_ / 1000;
+    tv.tv_usec = (timeout_ % 1000) * 1000;
 
     return select(0, &set, NULL, NULL, &tv);
 }
@@ -143,6 +144,8 @@ UDPServer::UDPServer(const std::string &ip_address, uint16_t port)
 #ifdef _WIN32
     u_long on = 1;
     ioctlsocket(sockfd_, FIONBIO, &on);
+#else
+    fcntl(sockfd_, F_SETFL, O_NONBLOCK);
 #endif
 }
 
@@ -156,10 +159,11 @@ int UDPServer::socket_bind()
 
 int UDPServer::receive(char *recv_buf, const int recv_buf_size)
 {
-    if (wait_for_receive(sockfd_, timeout_) <= 0) {
+    if (wait_for_receive(sockfd_) < 0)
+    {
         return static_cast<int>(SocketErrors::RECEIVE_ERROR);
     }
-    
+
     return recvfrom(sockfd_, recv_buf, recv_buf_size, 0,
                     reinterpret_cast<sockaddr *>(&client_), &client_size_);
 }
@@ -178,7 +182,8 @@ int TCPSocket::receive(char *recv_buf, const int recv_buf_size)
         return static_cast<int>(SocketErrors::CONNECT_ERROR);
     }
 
-    if (wait_for_receive(dest_sock_, timeout_) <= 0) {
+    if (wait_for_receive(dest_sock_) < 0)
+    {
         return static_cast<int>(SocketErrors::RECEIVE_ERROR);
     }
 
@@ -250,6 +255,8 @@ TCPServer::TCPServer(const std::string &ip_address, uint16_t port)
 #ifdef _WIN32
     u_long on = 1;
     ioctlsocket(sockfd_, FIONBIO, &on);
+#else
+    fcntl(sockfd_, F_SETFL, O_NONBLOCK);
 #endif
 }
 
@@ -274,7 +281,8 @@ int TCPServer::make_connection()
 {
     close_connection();
 
-    if (wait_for_receive(sockfd_, timeout_) <= 0) {
+    if (wait_for_receive(sockfd_) < 0)
+    {
         return static_cast<int>(SocketErrors::CONNECT_ERROR);
     }