# HG changeset patch
# User Timo Sirainen <timo.sirainen@dovecot.fi>
# Date 1511540524 -7200
# Node ID 5f9ff90666492a12567ec214ff46277a268350c7
# Parent  6fdc4e5710c8bdd0845a08f4b9f1fbf10830a394
director: Add director_ping_idle/max_timeout setting.

director_ping_idle_timeout is used when there's otherwise no input coming
from the connection. Changed its default from 10 secs to 30 secs.

director_ping_max_timeout is used when the other director keeps sending
input, but among it is no PONG reply.

diff -r 6fdc4e5710c8 -r 5f9ff9066649 src/director/director-connection.c
--- a/src/director/director-connection.c	Fri Nov 24 18:18:45 2017 +0200
+++ b/src/director/director-connection.c	Fri Nov 24 18:22:04 2017 +0200
@@ -63,10 +63,6 @@
    or we'll disconnect. Use a slightly larger value than for _SEND_USERS_ so
    that we'll get a better error if the sender decides to disconnect. */
 #define DIRECTOR_CONNECTION_DONE_TIMEOUT_MSECS (40*1000)
-/* How long to wait for PONG for an idling connection */
-#define DIRECTOR_CONNECTION_PING_IDLE_TIMEOUT_MSECS (10*1000)
-/* Maximum time to wait for PONG reply */
-#define DIRECTOR_CONNECTION_PONG_TIMEOUT_MSECS (60*1000)
 /* How long to wait to send PING when connection is idle */
 #define DIRECTOR_CONNECTION_PING_INTERVAL_MSECS (15*1000)
 /* How long to wait before sending PING while waiting for SYNC reply */
@@ -92,14 +88,6 @@
    to see if there's other work to be done as well. */
 #define DIRECTOR_HANDSHAKE_MAX_USERS_SENT_PER_FLUSH 10000
 
-#if DIRECTOR_CONNECTION_DONE_TIMEOUT_MSECS <= DIRECTOR_CONNECTION_PING_TIMEOUT_MSECS
-#  error DIRECTOR_CONNECTION_DONE_TIMEOUT_MSECS is too low
-#endif
-
-#if DIRECTOR_CONNECTION_PONG_TIMEOUT_MSECS <= DIRECTOR_CONNECTION_PING_IDLE_TIMEOUT_MSECS
-#  error DIRECTOR_CONNECTION_PONG_TIMEOUT_MSECS is too low
-#endif
-
 #define CMD_IS_USER_HANDSHAKE(minor_version, args) \
 	((minor_version) < DIRECTOR_VERSION_HANDSHAKE_U_CMD && \
 	 str_array_length(args) > 2)
@@ -2509,9 +2497,9 @@
 		return;
 
 	timeout_remove(&conn->to_ping);
-	conn->to_ping = timeout_add(DIRECTOR_CONNECTION_PING_IDLE_TIMEOUT_MSECS,
+	conn->to_ping = timeout_add(conn->dir->set->director_ping_idle_timeout*1000,
 				    director_connection_ping_idle_timeout, conn);
-	conn->to_pong = timeout_add(DIRECTOR_CONNECTION_PONG_TIMEOUT_MSECS,
+	conn->to_pong = timeout_add(conn->dir->set->director_ping_max_timeout*1000,
 				    director_connection_pong_timeout, conn);
 	director_connection_send(conn, "PING\n");
 	conn->ping_waiting = TRUE;
diff -r 6fdc4e5710c8 -r 5f9ff9066649 src/director/director-settings.c
--- a/src/director/director-settings.c	Fri Nov 24 18:18:45 2017 +0200
+++ b/src/director/director-settings.c	Fri Nov 24 18:22:04 2017 +0200
@@ -72,6 +72,8 @@
 	DEF(SET_STR, director_mail_servers),
 	DEF(SET_STR, director_username_hash),
 	DEF(SET_STR, director_flush_socket),
+	DEF(SET_TIME, director_ping_idle_timeout),
+	DEF(SET_TIME, director_ping_max_timeout),
 	DEF(SET_TIME, director_user_expire),
 	DEF(SET_TIME, director_user_kick_delay),
 	DEF(SET_IN_PORT, director_doveadm_port),
@@ -90,6 +92,8 @@
 	.director_mail_servers = "",
 	.director_username_hash = "%Lu",
 	.director_flush_socket = "",
+	.director_ping_idle_timeout = 30,
+	.director_ping_max_timeout = 60,
 	.director_user_expire = 60*15,
 	.director_user_kick_delay = 2,
 	.director_doveadm_port = 0,
diff -r 6fdc4e5710c8 -r 5f9ff9066649 src/director/director-settings.h
--- a/src/director/director-settings.h	Fri Nov 24 18:18:45 2017 +0200
+++ b/src/director/director-settings.h	Fri Nov 24 18:22:04 2017 +0200
@@ -11,6 +11,8 @@
 	const char *director_username_hash;
 	const char *director_flush_socket;
 
+	unsigned int director_ping_idle_timeout;
+	unsigned int director_ping_max_timeout;
 	unsigned int director_user_expire;
 	unsigned int director_user_kick_delay;
 	in_port_t director_doveadm_port;