From: Alan T. DeKok <aland@freeradius.org>
Date: Mon, 24 Jun 2024 13:05:26 +0000 (-0400)
Subject: always set TCP_NODELAY
X-Git-Tag: release_3_2_5~34
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=435c90b54cb0125cc37bb7629211ccd2328ec7a6;p=thirdparty%2Ffreeradius-server.git

always set TCP_NODELAY
---

diff --git a/src/main/listen.c b/src/main/listen.c
index 0727d86cf29..9157965a5e4 100644
--- a/src/main/listen.c
+++ b/src/main/listen.c
@@ -3504,10 +3504,25 @@ rad_listen_t *proxy_new_listener(TALLOC_CTX *ctx, home_server_t *home, uint16_t
 
 		this->nonblock |= home->nonblock;
 
+#ifdef TCP_NODELAY
+		/*
+		 *	Also set TCP_NODELAY, to force the data to be written quickly.
+		 */
+		if (sock->proto == IPPROTO_TCP) {
+			int on = 1;
+
+			if (setsockopt(this->fd, SOL_TCP, TCP_NODELAY, &on, sizeof(on)) < 0) {
+				ERROR("(TLS) Failed to set TCP_NODELAY: %s", fr_syserror(errno));
+				goto error;
+			}
+		}
+#endif
+
 		/*
 		 *	Set non-blocking if it's configured.
 		 */
 		if (this->nonblock) {
+			fr_assert(0);
 			if (fr_nonblock(this->fd) < 0) {
 				ERROR("(TLS) Failed setting nonblocking for proxy socket '%s' - %s", buffer, fr_strerror());
 				goto error;
@@ -3520,22 +3535,9 @@ rad_listen_t *proxy_new_listener(TALLOC_CTX *ctx, home_server_t *home, uint16_t
 				goto error;
 			}
 
-#ifdef TCP_NODELAY
-			/*
-			 *	Also set TCP_NODELAY, to force the data to be written quickly.
-			 */
-			if (sock->proto == IPPROTO_TCP) {
-				int on = 1;
-
-				if (setsockopt(this->fd, SOL_TCP, TCP_NODELAY, &on, sizeof(on)) < 0) {
-					ERROR("(TLS) Failed to set TCP_NODELAY: %s", fr_syserror(errno));
-					goto error;
-				}
-			}
-#endif
 		} else {
 			/*
-			 *	Only set timeouts when the socket is nonblocking.  This allows blocking
+			 *	Only set timeouts when the socket is blocking.  This allows blocking
 			 *	sockets to still time out when the underlying socket is dead.
 			 */
 #ifdef SO_RCVTIMEO