From: Stephan Bosch <stephan.bosch@dovecot.fi>
Date: Wed, 29 Aug 2018 22:21:59 +0000 (+0200)
Subject: submission: Move generic part of QUIT command to submission-commands.c.
X-Git-Tag: 2.3.9~1329
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cdb809b5df6b8f47bc6a176240e57ca66c7c0c1d;p=thirdparty%2Fdovecot%2Fcore.git

submission: Move generic part of QUIT command to submission-commands.c.
---

diff --git a/src/submission/cmd-quit.c b/src/submission/cmd-quit.c
index 0018614efb..9d06c5d43d 100644
--- a/src/submission/cmd-quit.c
+++ b/src/submission/cmd-quit.c
@@ -106,45 +106,3 @@ int cmd_quit_relay(struct client *client, struct smtp_server_cmd_ctx *cmd)
 		relay_cmd_quit_proxy(quit_cmd);
 	return 0;
 }
-
-struct cmd_quit_context {
-	struct client *client;
-
-	struct smtp_server_cmd_ctx *cmd;
-};
-
-static void cmd_quit_finish(struct cmd_quit_context *quit_cmd)
-{
-	struct client *client = quit_cmd->client;
-	struct smtp_server_cmd_ctx *cmd = quit_cmd->cmd;
-
-	timeout_remove(&client->to_quit);
-	smtp_server_reply_quit(cmd);
-}
-
-static void
-cmd_quit_next(struct smtp_server_cmd_ctx *cmd ATTR_UNUSED,
-	      struct cmd_quit_context *quit_cmd)
-{
-	struct client *client = quit_cmd->client;
-
-	/* give backend a brief interval to generate a quit reply */
-	client->to_quit = timeout_add(SUBMISSION_MAX_WAIT_QUIT_REPLY_MSECS,
-				      cmd_quit_finish, quit_cmd);
-}
-
-int cmd_quit(void *conn_ctx, struct smtp_server_cmd_ctx *cmd)
-{
-	struct client *client = conn_ctx;
-	struct cmd_quit_context *quit_cmd;
-
-	quit_cmd = p_new(cmd->pool, struct cmd_quit_context, 1);
-	quit_cmd->client = client;
-	quit_cmd->cmd = cmd;
-
-	smtp_server_command_add_hook(cmd->cmd, SMTP_SERVER_COMMAND_HOOK_NEXT,
-				     cmd_quit_next, quit_cmd);
-
-	return cmd_quit_relay(client, cmd);
-}
-
diff --git a/src/submission/submission-commands.c b/src/submission/submission-commands.c
index 4dc2e2608b..114bc4c5e9 100644
--- a/src/submission/submission-commands.c
+++ b/src/submission/submission-commands.c
@@ -438,3 +438,49 @@ int cmd_noop(void *conn_ctx, struct smtp_server_cmd_ctx *cmd)
 
 	return cmd_noop_relay(client, cmd);
 }
+
+/*
+ * QUIT command
+ */
+
+struct cmd_quit_context {
+	struct client *client;
+
+	struct smtp_server_cmd_ctx *cmd;
+};
+
+static void cmd_quit_finish(struct cmd_quit_context *quit_cmd)
+{
+	struct client *client = quit_cmd->client;
+	struct smtp_server_cmd_ctx *cmd = quit_cmd->cmd;
+
+	timeout_remove(&client->to_quit);
+	smtp_server_reply_quit(cmd);
+}
+
+static void
+cmd_quit_next(struct smtp_server_cmd_ctx *cmd ATTR_UNUSED,
+	      struct cmd_quit_context *quit_cmd)
+{
+	struct client *client = quit_cmd->client;
+
+	/* give backend a brief interval to generate a quit reply */
+	client->to_quit = timeout_add(SUBMISSION_MAX_WAIT_QUIT_REPLY_MSECS,
+				      cmd_quit_finish, quit_cmd);
+}
+
+int cmd_quit(void *conn_ctx, struct smtp_server_cmd_ctx *cmd)
+{
+	struct client *client = conn_ctx;
+	struct cmd_quit_context *quit_cmd;
+
+	quit_cmd = p_new(cmd->pool, struct cmd_quit_context, 1);
+	quit_cmd->client = client;
+	quit_cmd->cmd = cmd;
+
+	smtp_server_command_add_hook(cmd->cmd, SMTP_SERVER_COMMAND_HOOK_NEXT,
+				     cmd_quit_next, quit_cmd);
+
+	return cmd_quit_relay(client, cmd);
+}
+