]> git.ipfire.org Git - thirdparty/dovecot/core.git/commitdiff
login-proxy: Split off proxy_connect_failed()
authorTimo Sirainen <timo.sirainen@open-xchange.com>
Wed, 29 Apr 2020 09:14:57 +0000 (12:14 +0300)
committeraki.tuomi <aki.tuomi@open-xchange.com>
Mon, 25 May 2020 08:38:55 +0000 (08:38 +0000)
The bool return value will be used in a later commit.

src/login-common/login-proxy.c

index f03bb9e70e9f489c383ca6e241946e10af0200f6..9f8dd6792205ae49d3d331e384546c05078c9c4a 100644 (file)
@@ -241,17 +241,23 @@ static bool proxy_try_reconnect(struct login_proxy *proxy)
        return TRUE;
 }
 
-static void proxy_wait_connect(struct login_proxy *proxy)
+static bool proxy_connect_failed(struct login_proxy *proxy)
 {
        bool reconnect;
 
+       proxy_fail_connect(proxy);
+       reconnect = proxy_try_reconnect(proxy);
+       proxy_log_connect_error(proxy, reconnect);
+       if (!reconnect)
+               login_proxy_free(&proxy);
+       return reconnect;
+}
+
+static void proxy_wait_connect(struct login_proxy *proxy)
+{
        errno = net_geterror(proxy->server_fd);
        if (errno != 0) {
-               proxy_fail_connect(proxy);
-               reconnect = proxy_try_reconnect(proxy);
-               proxy_log_connect_error(proxy, reconnect);
-               if (!reconnect)
-                       login_proxy_free(&proxy);
+               (void)proxy_connect_failed(proxy);
                return;
        }
        proxy->connected = TRUE;