]> git.ipfire.org Git - thirdparty/dovecot/core.git/commitdiff
lib-smtp: server: Use the new connection_input_halt/resume() functions.
authorStephan Bosch <stephan.bosch@dovecot.fi>
Sat, 10 Feb 2018 09:07:28 +0000 (10:07 +0100)
committerVille Savolainen <ville.savolainen@dovecot.fi>
Mon, 12 Mar 2018 07:24:15 +0000 (09:24 +0200)
src/lib-smtp/smtp-server-connection.c

index bf241d851f9ae11c9b4ed08ad06f7de3b41f0b51..578858671499bc1956957b1f649cb2087eebe44c 100644 (file)
@@ -91,8 +91,7 @@ smtp_server_connection_get_stats(struct smtp_server_connection *conn)
 
 void smtp_server_connection_input_halt(struct smtp_server_connection *conn)
 {
-       if (conn->conn.io != NULL)
-               io_remove(&conn->conn.io);
+       connection_input_halt(&conn->conn);
 }
 
 void smtp_server_connection_input_resume(struct smtp_server_connection *conn)
@@ -122,8 +121,7 @@ void smtp_server_connection_input_resume(struct smtp_server_connection *conn)
                        return;
 
                /* restore input handler */
-               conn->conn.io = io_add_istream(conn->conn.input,
-                   smtp_server_connection_input, &conn->conn);
+               connection_input_resume(&conn->conn);
        }
 
        if (conn->conn.io != NULL &&
@@ -149,8 +147,7 @@ void smtp_server_connection_input_capture(struct smtp_server_connection *conn,
        smtp_server_input_callback_t *callback, void *context)
 {
        i_assert(!conn->input_broken && !conn->disconnected);
-       if (conn->conn.io != NULL)
-               io_remove(&conn->conn.io);
+       connection_input_halt(&conn->conn);
        conn->conn.io = io_add_istream(conn->conn.input, *callback, context);
 }