Added timeout option

Author: OpenCoreCH

client/tcpunch.cpp

@@ -67,9 +67,12 @@ void* peer_listen(void* p) {
     }
 }
 
-int pair(const std::string& pairing_name, const std::string& server_address, int port) {
+int pair(const std::string& pairing_name, const std::string& server_address, int port, int timeout_ms) {
     connection_established = false;
     accepting_socket = -1;
+    struct timeval timeout;
+    timeout.tv_sec = timeout_ms / 1000;
+    timeout.tv_usec = (timeout_ms % 1000) * 1000;
 
     int socket_rendezvous;
     struct sockaddr_in server_data{};
@@ -85,6 +88,10 @@ int pair(const std::string& pairing_name, const std::string& server_address, int
         setsockopt(socket_rendezvous, SOL_SOCKET, SO_REUSEPORT, &enable_flag, sizeof(int)) < 0) {
         error_exit_errno("Setting REUSE options failed: ");
     }
+    if (setsockopt(socket_rendezvous, SOL_SOCKET, SO_RCVTIMEO, (const char*)&timeout, sizeof timeout) < 0 ||
+        setsockopt(socket_rendezvous, SOL_SOCKET, SO_REUSEPORT, &enable_flag, sizeof(int)) < 0) {
+        error_exit_errno("Setting timeout failed: ");
+    }
 
     server_data.sin_family = AF_INET;
     server_data.sin_addr.s_addr = inet_addr(server_address.c_str());

client/tcpunch.h

@@ -5,11 +5,12 @@
 #include <sys/socket.h>
 #include <cstring>
 #include <arpa/inet.h>
+#include <exception>
 
 #define DEBUG 0
-static const int MAX_RECV_BUFFER = 2048;
 
+struct Timeout : public std::exception {};
 
-int pair(const std::string& pairing_name, const std::string& server_address, int port = 10000);
+int pair(const std::string& pairing_name, const std::string& server_address, int port = 10000, int timeout_ms = 0);
 
 #endif

common/utils.h

@@ -2,20 +2,25 @@
 #define HOLEPUNCHINGSERVERCLIENT_UTILS_H
 
 #include <arpa/inet.h>
+#include <exception>
+#include "../client/tcpunch.h"
 
 typedef struct {
     struct in_addr ip;
     in_port_t      port;
 } PeerConnectionData;
 
 void error_exit(const std::string& error_string) {
-    std::cerr << error_string << std::endl;
-    exit(EXIT_FAILURE);
+    throw error_string;
 }
 
 void error_exit_errno(const std::string& error_string) {
-    std::cerr << error_string << strerror(errno) << std::endl;
-    exit(EXIT_FAILURE);
+    if (errno == EAGAIN) {
+        throw Timeout();
+    } else {
+        std::string err = error_string + strerror(errno);
+        throw err;
+    }
 }
 
 std::string ip_to_string(in_addr_t *ip) {