Mercurial > dovecot > core-2.2

changeset 21940:63b1d742208e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
lib-imap-client: Fix reconnection There was already code for reconnection. We just shouldn't have gone very far in imapc_connection_connect() if we were still waiting for reconnection delay to pass.
author Timo Sirainen <timo.sirainen@dovecot.fi>
date Mon, 10 Apr 2017 17:07:28 +0300
parents db452e6278f5
children bb81856fe3c1
files src/lib-imap-client/imapc-connection.c
diffstat 1 files changed, 9 insertions(+), 16 deletions(-) [+]
line wrap: on
line diff
--- a/src/lib-imap-client/imapc-connection.c	Mon Apr 10 18:12:47 2017 +0300
+++ b/src/lib-imap-client/imapc-connection.c	Mon Apr 10 17:07:28 2017 +0300
@@ -130,6 +130,7 @@
 	struct timeout *to_throttle, *to_throttle_shrink;
 
 	unsigned int reconnecting:1;
+	unsigned int reconnect_waiting:1;
 	unsigned int reconnect_ok:1;
 	unsigned int idling:1;
 	unsigned int idle_stopping:1;
@@ -504,6 +505,7 @@
 static void imapc_connection_reconnect(struct imapc_connection *conn)
 {
 	conn->reconnect_ok = FALSE;
+	conn->reconnect_waiting = FALSE;
 
 	if (conn->selected_box != NULL)
 		imapc_client_mailbox_reconnect(conn->selected_box);
@@ -536,6 +538,7 @@
 			imapc_connection_disconnect_full(conn, TRUE);
 			conn->to = timeout_add(delay_msecs, imapc_connection_reconnect, conn);
 			conn->reconnect_count++;
+			conn->reconnect_waiting = TRUE;
 		}
 	}
 }
@@ -1785,6 +1788,12 @@
 
 	if (conn->fd != -1 || conn->dns_lookup != NULL)
 		return;
+	if (conn->reconnect_waiting) {
+		/* wait for the reconnection delay to finish before
+		   doing anything. */
+		return;
+	}
+
 	conn->reconnecting = FALSE;
 	/* if we get disconnected before we've finished all the pending
 	   commands, don't reconnect */
@@ -1792,22 +1801,6 @@
 		array_count(&conn->cmd_send_queue);
 
 	imapc_connection_input_reset(conn);
-
-	int msecs_since_last_connect =
-		timeval_diff_msecs(&ioloop_timeval, &conn->last_connect);
-	if (!conn->reconnect_ok &&
-	    msecs_since_last_connect < (int)conn->client->set.connect_retry_interval_msecs) {
-		if (conn->to != NULL)
-			timeout_remove(&conn->to);
-		conn->reconnecting = TRUE;
-		imapc_connection_set_disconnected(conn);
-		/* don't wait longer than necessary */
-		unsigned int delay_msecs =
-			conn->client->set.connect_retry_interval_msecs -
-			msecs_since_last_connect;
-		conn->to = timeout_add(delay_msecs, imapc_connection_reconnect, conn);
-		return;
-	}
 	conn->last_connect = ioloop_timeval;
 
 	if (conn->client->set.debug) {