Renamed x-local-ip/port to x-connected-ip/port

--HG--
branch : HEAD

diff --git a/src/imap-login/client.c b/src/imap-login/client.c
index 7c01ce465af1223c941012b2958da30d4fe1c16c..6f9a7708568ac851fe628a5c6760fa7fedb114cc 100644 (file)
--- a/src/imap-login/client.c
+++ b/src/imap-login/client.c
@@ -217,9 +217,9 @@ client_update_info(struct imap_client *client, const struct imap_arg *args)
                        (void)net_addr2ip(value, &client->common.ip);
                else if (strcasecmp(key, "x-originating-port") == 0)
                        client->common.remote_port = atoi(value);
-               else if (strcasecmp(key, "x-local-ip") == 0)
+               else if (strcasecmp(key, "x-connected-ip") == 0)
                        (void)net_addr2ip(value, &client->common.local_ip);
-               else if (strcasecmp(key, "x-local-port") == 0)
+               else if (strcasecmp(key, "x-connected-port") == 0)
                        client->common.local_port = atoi(value);
                args += 2;
        }

diff --git a/src/imap-login/imap-proxy.c b/src/imap-login/imap-proxy.c
index e3c186acbd4813ba7de4ce52abbbf51dfa39c4bf..4aa01ff1c6952ac0ced86050eab5b61e78bed0e2 100644 (file)
--- a/src/imap-login/imap-proxy.c
+++ b/src/imap-login/imap-proxy.c
@@ -38,8 +38,8 @@ static void proxy_write_id(struct imap_client *client, string_t *str)
        str_printfa(str, "I ID ("
                    "\"x-originating-ip\" \"%s\" "
                    "\"x-originating-port\" \"%u\" "
-                   "\"x-local-ip\" \"%s\" "
-                   "\"x-local-port\" \"%u\")\r\n",
+                   "\"x-connected-ip\" \"%s\" "
+                   "\"x-connected-port\" \"%u\")\r\n",
                    net_ip2addr(&client->common.ip),
                    client->common.remote_port,
                    net_ip2addr(&client->common.local_ip),