lib-auth-client: auth-master - Move timeout callbacks

diff --git a/src/lib-auth-client/auth-master.c b/src/lib-auth-client/auth-master.c
index 2736fdc388141856128953e2c0db679da8ccb22a..a70e84bea750c12fa9f6dca518ce65df06bfa253 100644 (file)
--- a/src/lib-auth-client/auth-master.c
+++ b/src/lib-auth-client/auth-master.c
@@ -164,6 +164,20 @@ static void auth_master_destroy(struct connection *_conn)
        auth_request_lookup_abort(conn);
 }
 
+static void auth_request_timeout(struct auth_master_connection *conn)
+{
+       if (!connection_handshake_received(&conn->conn))
+               e_error(conn->event, "Connecting timed out");
+       else
+               e_error(conn->event, "Request timed out");
+       auth_request_lookup_abort(conn);
+}
+
+static void auth_idle_timeout(struct auth_master_connection *conn)
+{
+       auth_connection_close(conn);
+}
+
 static int
 auth_master_handshake_line(struct connection *_conn, const char *line)
 {
@@ -278,20 +292,6 @@ static int auth_master_connect(struct auth_master_connection *conn)
        return 0;
 }
 
-static void auth_request_timeout(struct auth_master_connection *conn)
-{
-       if (!connection_handshake_received(&conn->conn))
-               e_error(conn->event, "Connecting timed out");
-       else
-               e_error(conn->event, "Request timed out");
-       auth_request_lookup_abort(conn);
-}
-
-static void auth_idle_timeout(struct auth_master_connection *conn)
-{
-       auth_connection_close(conn);
-}
-
 static void auth_master_set_io(struct auth_master_connection *conn)
 {
        if (conn->ioloop != NULL)