From: Stephan Bosch <stephan.bosch@dovecot.fi>
Date: Sat, 10 Feb 2018 09:07:28 +0000 (+0100)
Subject: lib-smtp: server: Use the new connection_input_halt/resume() functions.
X-Git-Tag: 2.3.1~152
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c786a720ca40375b5fbe0c1842425cd803a19ff0;p=thirdparty%2Fdovecot%2Fcore.git

lib-smtp: server: Use the new connection_input_halt/resume() functions.
---

diff --git a/src/lib-smtp/smtp-server-connection.c b/src/lib-smtp/smtp-server-connection.c
index bf241d851f..5788586714 100644
--- a/src/lib-smtp/smtp-server-connection.c
+++ b/src/lib-smtp/smtp-server-connection.c
@@ -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);
 }