pop3-login: Log proxy state as human-readable string.

dovecot · Mar 9, 2017 · d77f679 · d77f679
1 parent b4bf604
commit d77f679
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 2 deletions.
diff --git a/src/pop3-login/client.c b/src/pop3-login/client.c
@@ -312,7 +312,7 @@ static struct client_vfuncs pop3_client_vfuncs = {
 	pop3_proxy_reset,
 	pop3_proxy_parse_line,
 	pop3_proxy_error,
-	NULL,
+	pop3_proxy_get_state,
 };
 
 static const struct login_binary pop3_login_binary = {

diff --git a/src/pop3-login/client.h b/src/pop3-login/client.h
@@ -10,7 +10,9 @@ enum pop3_proxy_state {
 	POP3_PROXY_STARTTLS,
 	POP3_PROXY_XCLIENT,
 	POP3_PROXY_LOGIN1,
-	POP3_PROXY_LOGIN2
+	POP3_PROXY_LOGIN2,
+
+	POP3_PROXY_STATE_COUNT
 };
 
 struct pop3_client {

diff --git a/src/pop3-login/pop3-proxy.c b/src/pop3-login/pop3-proxy.c
@@ -12,6 +12,10 @@
 #include "client.h"
 #include "pop3-proxy.h"
 
+static const char *pop3_proxy_state_names[POP3_PROXY_STATE_COUNT] = {
+	"banner", "starttls", "xclient", "login1", "login2"
+};
+
 static void proxy_free_password(struct client *client)
 {
 	if (client->proxy_password == NULL)
@@ -216,6 +220,8 @@ int pop3_proxy_parse_line(struct client *client, const char *line)
 
 		client_proxy_finish_destroy_client(client);
 		return 1;
+	case POP3_PROXY_STATE_COUNT:
+		i_unreached();
 	}
 
 	/* Login failed. Pass through the error message to client.
@@ -259,3 +265,8 @@ void pop3_proxy_error(struct client *client, const char *text)
 {
 	client_send_reply(client, POP3_CMD_REPLY_ERROR, text);
 }
+
+const char *pop3_proxy_get_state(struct client *client)
+{
+	return pop3_proxy_state_names[client->proxy_state];
+}
diff --git a/src/pop3-login/pop3-proxy.h b/src/pop3-login/pop3-proxy.h
@@ -5,5 +5,6 @@ void pop3_proxy_reset(struct client *client);
 int pop3_proxy_parse_line(struct client *client, const char *line);
 
 void pop3_proxy_error(struct client *client, const char *text);
+const char *pop3_proxy_get_state(struct client *client);
 
 #endif