submission-login: use container_of instead of casts

diff --git a/src/submission-login/client-authenticate.c b/src/submission-login/client-authenticate.c
index 27ddf007420850b80bec967843542326d5f15205..d4ca4926420c52c202b48838fe9a13877179eb2f 100644 (file)
--- a/src/submission-login/client-authenticate.c
+++ b/src/submission-login/client-authenticate.c
@@ -86,7 +86,7 @@ void submission_client_auth_result(struct client *client,
        const char *text)
 {
        struct submission_client *subm_client =
-               (struct submission_client *)client;
+               container_of(client, struct submission_client, common);
        struct smtp_server_cmd_ctx *cmd = subm_client->pending_auth;
 
        subm_client->pending_auth = NULL;
@@ -229,7 +229,7 @@ void submission_client_auth_send_challenge(struct client *client,
                                           const char *data)
 {
        struct submission_client *subm_client =
-               (struct submission_client *)client;
+               container_of(client, struct submission_client, common);
        struct smtp_server_cmd_ctx *cmd = subm_client->pending_auth;
 
        i_assert(cmd != NULL);

diff --git a/src/submission-login/client.c b/src/submission-login/client.c
index 60d329dd1cc8da6cf628db98b8626b8def3f4d51..629352020d393d860e94c579ad0f77301db791b9 100644 (file)
--- a/src/submission-login/client.c
+++ b/src/submission-login/client.c
@@ -61,7 +61,7 @@ static void submission_client_create(struct client *client,
        static const char *const xclient_extensions[] =
                { "SESSION", "FORWARD", NULL };
        struct submission_client *subm_client =
-               (struct submission_client *)client;
+               container_of(client, struct submission_client, common);
        struct smtp_server_settings smtp_set;
 
        subm_client->set = other_sets[0];
@@ -86,7 +86,7 @@ static void submission_client_create(struct client *client,
 static void submission_client_destroy(struct client *client)
 {
        struct submission_client *subm_client =
-               (struct submission_client *)client;
+               container_of(client, struct submission_client, common);
 
        if (subm_client->conn != NULL)
                smtp_server_connection_close(&subm_client->conn, NULL);
@@ -96,7 +96,7 @@ static void submission_client_destroy(struct client *client)
 static void submission_client_notify_auth_ready(struct client *client)
 {
        struct submission_client *subm_client =
-               (struct submission_client *)client;
+               container_of(client, struct submission_client, common);
 
        smtp_server_connection_start(subm_client->conn, FALSE);
 }
@@ -106,7 +106,8 @@ submission_client_notify_disconnect(struct client *_client,
                                    enum client_disconnect_reason reason,
                                    const char *text)
 {
-       struct submission_client *client = (struct submission_client *)_client;
+       struct submission_client *client =
+               container_of(_client, struct submission_client, common);
        struct smtp_server_connection *conn;
 
        conn = client->conn;

diff --git a/src/submission-login/submission-proxy.c b/src/submission-login/submission-proxy.c
index 4ded03b74215dcd1f768113eca0d199ac8da7e02..bf06f04aa276054f6b6c929894ce8432eeb22774 100644 (file)
--- a/src/submission-login/submission-proxy.c
+++ b/src/submission-login/submission-proxy.c
@@ -216,7 +216,7 @@ submission_proxy_success_reply_sent(struct smtp_server_cmd_ctx *cmd)
 int submission_proxy_parse_line(struct client *client, const char *line)
 {
        struct submission_client *subm_client =
-               (struct submission_client *)client;
+               container_of(client, struct submission_client, common);
        struct smtp_server_cmd_ctx *cmd = subm_client->pending_auth;
        struct smtp_server_command *command = cmd->cmd;
        struct ostream *output;
@@ -434,7 +434,7 @@ int submission_proxy_parse_line(struct client *client, const char *line)
 void submission_proxy_reset(struct client *client)
 {
        struct submission_client *subm_client =
-               (struct submission_client *)client;
+               container_of(client, struct submission_client, common);
 
        subm_client->proxy_state = SUBMISSION_PROXY_BANNER;
        subm_client->proxy_capability = 0;
@@ -446,7 +446,7 @@ void submission_proxy_reset(struct client *client)
 void submission_proxy_error(struct client *client, const char *text)
 {
        struct submission_client *subm_client =
-               (struct submission_client *)client;
+               container_of(client, struct submission_client, common);
 
        struct smtp_server_cmd_ctx *cmd = subm_client->pending_auth;
        if (cmd != NULL) {
@@ -458,7 +458,7 @@ void submission_proxy_error(struct client *client, const char *text)
 const char *submission_proxy_get_state(struct client *client)
 {
        struct submission_client *subm_client =
-               (struct submission_client *)client;
+               container_of(client, struct submission_client, common);
 
        i_assert(subm_client->proxy_state < SUBMISSION_PROXY_STATE_COUNT);
        return submission_proxy_state_names[subm_client->proxy_state];