Use TCP home server listener "nonblock" option when creating client socket

diff --git a/src/main/listen.c b/src/main/listen.c
index 13ee80be6c3ebaf77bd1ed11a81a4d65a2a6abbe..e27243d067dd4fb953bf71b65ce812f7899d0df0 100644 (file)
--- a/src/main/listen.c
+++ b/src/main/listen.c
@@ -850,7 +850,7 @@ static int tls_sni_callback(SSL *ssl, UNUSED int *al, void *arg)
         *      one.
         */
        if (r) (void) SSL_set_SSL_CTX(ssl, r->ctx);
-               
+
        /*
         *      Set an attribute saying which server has been selected.
         */
@@ -3585,6 +3585,8 @@ rad_listen_t *proxy_new_listener(TALLOC_CTX *ctx, home_server_t *home, uint16_t
        if (home->proto == IPPROTO_TCP) {
                this->recv = proxy_socket_tcp_recv;
 
+               this->nonblock |= home->nonblock;
+
                /*
                 *      FIXME: connect() is blocking!
                 *      We do this with the proxy mutex locked, which may
@@ -3593,7 +3595,7 @@ rad_listen_t *proxy_new_listener(TALLOC_CTX *ctx, home_server_t *home, uint16_t
                this->fd = fr_socket_client_tcp(&home->src_ipaddr,
                                                &home->ipaddr, home->port,
 #ifdef WITH_TLS
-                                               !this->nonblock
+                                               this->nonblock
 #else
                                                false
 #endif
@@ -3638,8 +3640,6 @@ rad_listen_t *proxy_new_listener(TALLOC_CTX *ctx, home_server_t *home, uint16_t
                this->radiusv11 = home->tls->radiusv11;
 #endif
 
-               this->nonblock |= home->nonblock;
-
 #ifdef TCP_NODELAY
                /*
                 *      Also set TCP_NODELAY, to force the data to be written quickly.