dovecot-2.0: lib-auth: Added auth_client_disconnect().

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.0/rev/7a7b2cbc6f91
changeset: 10759:7a7b2cbc6f91
user:      Timo Sirainen <tss at iki.fi>
date:      Fri Feb 19 05:10:06 2010 +0200
description:
lib-auth: Added auth_client_disconnect().

diffstat:

 src/lib-auth/auth-client.c            |   5 +++++
 src/lib-auth/auth-client.h            |   1 +
 src/lib-auth/auth-server-connection.c |  15 +++++++--------
 src/lib-auth/auth-server-connection.h |   1 +
 4 files changed, 14 insertions(+), 8 deletions(-)

diffs (100 lines):

diff -r fa8a0f453774 -r 7a7b2cbc6f91 src/lib-auth/auth-client.c
--- a/src/lib-auth/auth-client.c	Fri Feb 19 04:28:07 2010 +0200
+++ b/src/lib-auth/auth-client.c	Fri Feb 19 05:10:06 2010 +0200
@@ -31,6 +31,11 @@
 	i_free(client);
 }
 
+void auth_client_disconnect(struct auth_client *client)
+{
+	auth_server_connection_disconnect(client->conn);
+}
+
 bool auth_client_is_connected(struct auth_client *client)
 {
 	return client->conn->handshake_received;
diff -r fa8a0f453774 -r 7a7b2cbc6f91 src/lib-auth/auth-client.h
--- a/src/lib-auth/auth-client.h	Fri Feb 19 04:28:07 2010 +0200
+++ b/src/lib-auth/auth-client.h	Fri Feb 19 05:10:06 2010 +0200
@@ -54,6 +54,7 @@
 		 bool debug);
 void auth_client_deinit(struct auth_client **client);
 
+void auth_client_disconnect(struct auth_client *client);
 bool auth_client_is_connected(struct auth_client *client);
 void auth_client_set_connect_notify(struct auth_client *client,
 				    auth_connect_notify_callback_t *callback,
diff -r fa8a0f453774 -r 7a7b2cbc6f91 src/lib-auth/auth-server-connection.c
--- a/src/lib-auth/auth-server-connection.c	Fri Feb 19 04:28:07 2010 +0200
+++ b/src/lib-auth/auth-server-connection.c	Fri Feb 19 05:10:06 2010 +0200
@@ -20,7 +20,7 @@
 #define AUTH_SERVER_RECONNECT_TIMEOUT_SECS 5
 
 static void
-auth_server_connection_disconnect(struct auth_server_connection *conn);
+auth_server_connection_reconnect(struct auth_server_connection *conn);
 
 static int
 auth_server_input_mech(struct auth_server_connection *conn,
@@ -238,7 +238,7 @@
 		return;
 	case -1:
 		/* disconnected */
-		auth_server_connection_disconnect(conn);
+		auth_server_connection_reconnect(conn);
 		return;
 	case -2:
 		/* buffer full - can't happen unless auth is buggy */
@@ -316,7 +316,7 @@
 	hash_table_clear(conn->requests, FALSE);
 }
 
-static void auth_server_connection_close(struct auth_server_connection *conn)
+void auth_server_connection_disconnect(struct auth_server_connection *conn)
 {
 	conn->handshake_received = FALSE;
 	conn->version_received = FALSE;
@@ -354,11 +354,11 @@
 }
 
 static void
-auth_server_connection_disconnect(struct auth_server_connection *conn)
+auth_server_connection_reconnect(struct auth_server_connection *conn)
 {
 	time_t next_connect;
 
-	auth_server_connection_close(conn);
+	auth_server_connection_disconnect(conn);
 
 	next_connect = conn->last_connect + AUTH_SERVER_RECONNECT_TIMEOUT_SECS;
 	conn->to = timeout_add(ioloop_time >= next_connect ? 0 :
@@ -372,8 +372,7 @@
 
 	*_conn = NULL;
 
-	auth_server_connection_close(conn);
-
+	auth_server_connection_disconnect(conn);
 	hash_table_destroy(&conn->requests);
 	array_free(&conn->available_auth_mechs);
 	pool_unref(&conn->pool);
@@ -384,7 +383,7 @@
 	i_error("Timeout waiting for handshake from auth server. "
 		"my pid=%u, input bytes=%"PRIuUOFF_T,
 		conn->client->client_pid, conn->input->v_offset);
-	auth_server_connection_disconnect(conn);
+	auth_server_connection_reconnect(conn);
 }
 
 int auth_server_connection_connect(struct auth_server_connection *conn)
diff -r fa8a0f453774 -r 7a7b2cbc6f91 src/lib-auth/auth-server-connection.h
--- a/src/lib-auth/auth-server-connection.h	Fri Feb 19 04:28:07 2010 +0200
+++ b/src/lib-auth/auth-server-connection.h	Fri Feb 19 05:10:06 2010 +0200
@@ -31,6 +31,7 @@
 void auth_server_connection_deinit(struct auth_server_connection **conn);
 
 int auth_server_connection_connect(struct auth_server_connection *conn);
+void auth_server_connection_disconnect(struct auth_server_connection *conn);
 
 unsigned int
 auth_server_connection_add_request(struct auth_server_connection *conn,