From: Timo Sirainen <timo.sirainen@dovecot.fi>
Date: Fri, 3 Nov 2017 23:49:29 +0000 (+0200)
Subject: director: Add mail_host.ip_str
X-Git-Tag: 2.3.0.rc1~574
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cfc891de6eeafd4bf17baa030360acd5447182d9;p=thirdparty%2Fdovecot%2Fcore.git

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 a5c5b409f4..f5a272e289 100644
--- 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 4cf65c9294..2349e2d40f 100644
--- 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;