From: Stephan Bosch <stephan.bosch@dovecot.fi>
Date: Sat, 15 Sep 2018 12:44:41 +0000 (+0200)
Subject: submission: relay backend: Turn client_proxy_input_pre/post() into relay backend... 
X-Git-Tag: 2.3.9~1297
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a3607047c6d51f5465ae4cf11efe78b28940c5e6;p=thirdparty%2Fdovecot%2Fcore.git

submission: relay backend: Turn client_proxy_input_pre/post() into relay backend vfuncs.
---

diff --git a/src/submission/submission-backend-relay.c b/src/submission/submission-backend-relay.c
index 32cd8f545e..39aac812f9 100644
--- a/src/submission/submission-backend-relay.c
+++ b/src/submission/submission-backend-relay.c
@@ -846,16 +846,20 @@ static void backend_relay_start(struct submission_backend *_backend)
 }
 
 /* try to proxy pipelined commands in a similarly pipelined fashion */
-void client_proxy_input_pre(struct client *client)
+static void
+backend_relay_client_input_pre(struct submission_backend *_backend)
 {
-	struct submission_backend_relay *backend = &client->backend;
+	struct submission_backend_relay *backend =
+		(struct submission_backend_relay *)_backend;
 
 	if (backend->conn != NULL)
 		smtp_client_connection_cork(backend->conn);
 }
-void client_proxy_input_post(struct client *client)
+static void
+backend_relay_client_input_post(struct submission_backend *_backend)
 {
-	struct submission_backend_relay *backend = &client->backend;
+	struct submission_backend_relay *backend =
+		(struct submission_backend_relay *)_backend;
 
 	if (backend->conn != NULL)
 		smtp_client_connection_uncork(backend->conn);
@@ -873,6 +877,9 @@ static struct submission_backend_vfuncs backend_relay_vfuncs = {
 
 	.start = backend_relay_start,
 
+	.client_input_pre = backend_relay_client_input_pre,
+	.client_input_post = backend_relay_client_input_post,
+
 	.cmd_helo = backend_relay_cmd_helo,
 
 	.cmd_mail = backend_relay_cmd_mail,
diff --git a/src/submission/submission-backend-relay.h b/src/submission/submission-backend-relay.h
index db08c147ac..ee55dd36d3 100644
--- a/src/submission/submission-backend-relay.h
+++ b/src/submission/submission-backend-relay.h
@@ -18,9 +18,6 @@ struct submission_backend_relay {
 void client_proxy_create(struct client *client,
 			 const struct submission_settings *set);
 
-void client_proxy_input_pre(struct client *client);
-void client_proxy_input_post(struct client *client);
-
 uoff_t client_proxy_get_max_mail_size(struct client *client);
 
 #endif
diff --git a/src/submission/submission-client.c b/src/submission/submission-client.c
index 807c27d901..df9cec1353 100644
--- a/src/submission/submission-client.c
+++ b/src/submission/submission-client.c
@@ -49,14 +49,12 @@ static void client_input_pre(void *context)
 {
 	struct client *client = context;
 
-	client_proxy_input_pre(client);
 	submission_backends_client_input_pre(client);
 }
 static void client_input_post(void *context)
 {
 	struct client *client = context;
 
-	client_proxy_input_post(client);
 	submission_backends_client_input_post(client);
 }