director: Add mail_host.ip_str

This avoids having to use net_ip2addr() all the time to convert it into a
string.

diff --git a/src/director/mail-host.c b/src/director/mail-host.c
index a5c5b409f4e9270d14549be0a4ff16ab1b70ebd6..f5a272e2897a4f2fd4bbac88a25f4c250d70396d 100644 (file)
--- a/src/director/mail-host.c
+++ b/src/director/mail-host.c
@@ -171,6 +171,7 @@ mail_host_add_ip(struct mail_host_list *list, const struct ip_addr *ip,
        host->list = list;
        host->vhost_count = VHOST_MULTIPLIER;
        host->ip = *ip;
+       host->ip_str = i_strdup(net_ip2addr(ip));
        host->tag = mail_tag_get(list, tag_name);
        array_append(&list->hosts, &host, 1);
 
@@ -363,6 +364,7 @@ void mail_host_set_vhost_count(struct mail_host *host, unsigned int vhost_count,
 static void mail_host_free(struct mail_host *host)
 {
        i_free(host->hostname);
+       i_free(host->ip_str);
        i_free(host);
 }
 
@@ -522,6 +524,7 @@ mail_host_dup(struct mail_host_list *dest_list, const struct mail_host *src)
        dest = i_new(struct mail_host, 1);
        *dest = *src;
        dest->tag = mail_tag_get(dest_list, src->tag->name);
+       dest->ip_str = i_strdup(src->ip_str);
        dest->hostname = i_strdup(src->hostname);
        return dest;
 }

diff --git a/src/director/mail-host.h b/src/director/mail-host.h
index 4cf65c9294dff701c4be580c6001cc181527ed72..2349e2d40faf3a55e9d4df5282bcbb342c765299 100644 (file)
--- a/src/director/mail-host.h
+++ b/src/director/mail-host.h
@@ -33,6 +33,7 @@ struct mail_host {
        time_t last_updown_change;
 
        struct ip_addr ip;
+       char *ip_str;
        char *hostname;
        struct mail_tag *tag;