keep-alive on by default for -t

jvde-github · Jan 27, 2025 · 983f3de · 983f3de
1 parent b72f824
commit 983f3de
Show file tree

Hide file tree

Showing 3 changed files with 109 additions and 12 deletions.
diff --git a/Device/RTLTCP.cpp b/Device/RTLTCP.cpp
@@ -149,7 +149,11 @@ namespace Device
 			else
 			{
 				if (isStreaming() && format != Format::TXT)
-					Error() << "RTLTCP: timeout.";
+
+					if(tcp.getState() == Protocol::TCP::State::READY)
+					{
+						Error() << "RTLTCP [" << tcp.getHost() <<  ":" << tcp.getPort() << "]: timeout.";
+					}
 			}
 		}
 	}

diff --git a/Protocol/Protocol.cpp b/Protocol/Protocol.cpp
@@ -17,6 +17,43 @@
 
 #include "Protocol.h"
 
+#include <sys/types.h>
+
+#ifdef _WIN32
+#include <winsock2.h>
+#include <ws2tcpip.h>
+#include <mstcpip.h>
+
+#elif defined(__APPLE__)
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <netinet/tcp.h>
+#include <fcntl.h>
+#include <netdb.h>
+#include <unistd.h>
+
+#elif defined(__ANDROID__)
+
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <netinet/tcp.h>
+#include <fcntl.h>
+#include <netdb.h>
+#include <unistd.h>
+#include <android/log.h>
+#else
+
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <netinet/tcp.h>
+#include <fcntl.h>
+#include <netdb.h>
+#include <unistd.h>
+
+#endif
+
+#include <errno.h>
+
 namespace Protocol
 {
 
@@ -62,20 +99,72 @@ namespace Protocol
 		}
 
 		sock = socket(ai.get()->ai_family, ai.get()->ai_socktype, ai.get()->ai_protocol);
+
 		if (sock == -1)
 			return false;
 
-#ifndef _WIN32
+		int yes = 1;
+#ifdef _WIN32
+		if (setsockopt(sock, IPPROTO_TCP, TCP_NODELAY, (const char *)&yes, sizeof(yes)) == -1)
+#else
+		if (setsockopt(sock, IPPROTO_TCP, TCP_NODELAY, (void *)&yes, sizeof(yes)) == -1)
+#endif
+		{
+			disconnect();
+			return false;
+		}
+
 		if (keep_alive)
 		{
-			int optval = 1;
-			if (setsockopt(sock, SOL_SOCKET, SO_KEEPALIVE, &optval, sizeof(optval)) == -1)
+			int idle = 20;
+			int interval = 5;
+			int count = 2;
+#ifdef _WIN32
+			if (setsockopt(sock, SOL_SOCKET, SO_KEEPALIVE, (const char *)&yes, sizeof(yes)))
+#else
+			if (setsockopt(sock, SOL_SOCKET, SO_KEEPALIVE, (void *)&yes, sizeof(yes)))
+#endif
+			{
+				disconnect();
+				return false;
+			}
+#if defined(__APPLE__)
+			if (setsockopt(sock, IPPROTO_TCP, TCP_KEEPALIVE, &idle, sizeof(idle)))
+			{
+				disconnect();
+				return false;
+			}
+#elif defined(_WIN32)
+			// Windows specific keepalive
+			struct tcp_keepalive keepalive;
+			keepalive.onoff = 1;
+			keepalive.keepalivetime = idle * 1000;
+			keepalive.keepaliveinterval = interval * 1000;
+			DWORD br;
+			if (WSAIoctl(sock, SIO_KEEPALIVE_VALS, &keepalive, sizeof(keepalive), NULL, 0, &br, NULL, NULL) == SOCKET_ERROR)
+			{
+				disconnect();
+				return false;
+			}
+#elif defined(__ANDROID__)
+			// Android uses same config as Linux
+			if (setsockopt(sock, IPPROTO_TCP, TCP_KEEPIDLE, &idle, sizeof(idle)) ||
+				setsockopt(sock, IPPROTO_TCP, TCP_KEEPINTVL, &interval, sizeof(interval)) ||
+				setsockopt(sock, IPPROTO_TCP, TCP_KEEPCNT, &count, sizeof(count)))
+			{
+				disconnect();
+				return false;
+			}
+#else
+			if (setsockopt(sock, SOL_TCP, TCP_KEEPIDLE, &idle, sizeof(idle)) ||
+				setsockopt(sock, SOL_TCP, TCP_KEEPINTVL, &interval, sizeof(interval)) ||
+				setsockopt(sock, SOL_TCP, TCP_KEEPCNT, &count, sizeof(count)))
 			{
 				disconnect();
 				return false;
 			}
-		}
 #endif
+		}
 
 		if (persistent)
 		{

diff --git a/Protocol/Protocol.h b/Protocol/Protocol.h
@@ -214,6 +214,14 @@ namespace Protocol
 		const int RECONNECT_TIME = 10;
 
 	public:
+
+			enum State
+		{
+			DISCONNECTED,
+			CONNECTING,
+			READY
+		};
+
 		TCP() : ProtocolBase("TCP") {};
 		void disconnect() override;
 		bool connect() override;
@@ -270,21 +278,17 @@ namespace Protocol
 			return sock;
 		}
 
+		enum State getState() { return state; }
+
 	private:
-		enum State
-		{
-			DISCONNECTED,
-			CONNECTING,
-			READY
-		};
 
 		std::string host;
 		std::string port;
 
 		bool persistent = true;
 		int reset_time = -1;
 		int timeout = 0;
-		bool keep_alive = false;
+		bool keep_alive = true;
 
 		int sock = -1;
 		State state = DISCONNECTED;