dovecot-2.1: director: Fixes to director-test.

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.1/rev/15537f882a0b
changeset: 14986:15537f882a0b
user:      Timo Sirainen <tss at iki.fi>
date:      Mon Jul 29 22:18:34 2013 +0300
description:
director: Fixes to director-test.

diffstat:

 src/director/director-test.c  |  18 +++++++++++-------
 src/director/director-test.sh |   3 ++-
 2 files changed, 13 insertions(+), 8 deletions(-)

diffs (92 lines):

diff -r 966a9ee85d58 -r 15537f882a0b src/director/director-test.c
--- a/src/director/director-test.c	Mon Jul 29 22:10:49 2013 +0300
+++ b/src/director/director-test.c	Mon Jul 29 22:18:34 2013 +0300
@@ -33,7 +33,7 @@
 #define IMAP_PORT 14300
 #define DIRECTOR_IN_PORT 9091
 #define DIRECTOR_OUT_PORT 9090
-#define USER_TIMEOUT_MSECS (1000*60)
+#define USER_TIMEOUT_MSECS (1000*10) /* FIXME: this should be based on director_user_expire */
 #define ADMIN_RANDOM_TIMEOUT_MSECS 500
 #define DIRECTOR_CONN_MAX_DELAY_MSECS 100
 #define DIRECTOR_DISCONNECT_TIMEOUT_SECS 10
@@ -126,7 +126,7 @@
 		i_error("User logging into unknown host %s",
 			net_ip2addr(&local_ip));
 		host = i_new(struct host, 1);
-		host->refcount++;
+		host->refcount = 1;
 		host->ip = local_ip;
 		host->vhost_count = 100;
 		hash_table_insert(hosts, &host->ip, host);
@@ -330,12 +330,13 @@
 }
 
 static void
-director_connection_create(int in_fd, const struct ip_addr *local_ip)
+director_connection_create(int in_fd, const struct ip_addr *local_ip,
+			   const struct ip_addr *remote_ip)
 {
 	struct director_connection *conn;
 	int out_fd;
 
-	out_fd = net_connect_ip(local_ip, DIRECTOR_OUT_PORT, NULL);
+	out_fd = net_connect_ip(local_ip, DIRECTOR_OUT_PORT, remote_ip);
 	if (out_fd == -1) {
 		(void)close(in_fd);
 		return;
@@ -383,16 +384,18 @@
 
 static void client_connected(struct master_service_connection *conn)
 {
-	struct ip_addr local_ip;
+	struct ip_addr local_ip, remote_ip;
 	unsigned int local_port;
 
 	if (net_getsockname(conn->fd, &local_ip, &local_port) < 0)
 		i_fatal("net_getsockname() failed: %m");
+	if (net_getpeername(conn->fd, &remote_ip, NULL) < 0)
+		i_fatal("net_getsockname() failed: %m");
 
 	if (local_port == IMAP_PORT)
 		imap_client_create(conn->fd);
 	else if (local_port == DIRECTOR_IN_PORT)
-		director_connection_create(conn->fd, &local_ip);
+		director_connection_create(conn->fd, &local_ip, &remote_ip);
 	else {
 		i_error("Connection to unknown port %u", local_port);
 		return;
@@ -496,6 +499,7 @@
 			struct host *host;
 
 			host = i_new(struct host, 1);
+			host->refcount = 1;
 			if (net_addr2ip(args[0], &host->ip) < 0 ||
 			    str_to_uint(args[1], &host->vhost_count) < 0)
 				i_fatal("host list broken");
@@ -541,7 +545,7 @@
 	admin_read_hosts(admin);
 
 	to_disconnect =
-		timeout_add(1000*(1 + rand()%DIRECTOR_DISCONNECT_TIMEOUT_SECS),
+		timeout_add(1000*(5 + rand()%DIRECTOR_DISCONNECT_TIMEOUT_SECS),
 			    director_connection_disconnect_timeout, NULL);
 }
 
diff -r 966a9ee85d58 -r 15537f882a0b src/director/director-test.sh
--- a/src/director/director-test.sh	Mon Jul 29 22:10:49 2013 +0300
+++ b/src/director/director-test.sh	Mon Jul 29 22:18:34 2013 +0300
@@ -26,6 +26,7 @@
 info_log_path = /var/log/dovecot-access.log
 director_servers =$dirs
 director_mail_servers = 127.0.0.1-127.0.0.255
+director_user_expire = 15s
 disable_plaintext_auth = no
 
 ssl = no
@@ -90,4 +91,4 @@
 echo
 echo "Start testing:"
 echo
-echo "imaptest host=director user=test%d.%d - select=0 no_tracking"
+echo "imaptest host=director user=test%d.%d - select=0 no_tracking clients=1000"