lib-master: master_service_anvil_connect() - Add support for proxy session destination IP

diff --git a/src/lib-master/master-service.c b/src/lib-master/master-service.c
index 2519fd36a3f45416696bd84bdb656c1260526855..abe9f81fa3bc688625b537fa9d36e05938696056 100644 (file)
--- a/src/lib-master/master-service.c
+++ b/src/lib-master/master-service.c
@@ -978,6 +978,9 @@ bool master_service_anvil_connect(struct master_service *service,
                str_append_c(cmd, 'S');
        else
                str_append_c(cmd, 'A');
+       str_append_c(cmd, '\t');
+       if (session->dest_ip.family != 0)
+               str_append(cmd, net_ip2addr(&session->dest_ip));
        if (session->alt_usernames != NULL) {
                string_t *alt_usernames = t_str_new(64);
                for (unsigned int i = 0; session->alt_usernames[i] != NULL; i++) {

diff --git a/src/lib-master/master-service.h b/src/lib-master/master-service.h
index a624e6664dea1bfec73e395097a174d9c47120d2..2ee69f9934662371e66add4057fdcbe9403bd45c 100644 (file)
--- a/src/lib-master/master-service.h
+++ b/src/lib-master/master-service.h
@@ -99,6 +99,8 @@ struct master_service_anvil_session {
        const char *const *alt_usernames;
        const char *service_name;
        struct ip_addr ip;
+       /* Proxy destination IP */
+       struct ip_addr dest_ip;
 };
 
 typedef void