From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Thu, 25 Dec 2014 18:35:49 +0000 (+0000)
Subject: Allow to listen on ipv6 IP.
X-Git-Tag: 0.8.0~20
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=35295fe9ead66b6b3aba11edac1af46d3a6e35d1;p=rspamd.git

Allow to listen on ipv6 IP.
---

diff --git a/contrib/snowball b/contrib/snowball
index 558c36912..4bc9f365c 160000
--- a/contrib/snowball
+++ b/contrib/snowball
@@ -1 +1 @@
-Subproject commit 558c36912b3ca63e2917d7df504a92dbc78e1b75
+Subproject commit 4bc9f365c4b674d0dd0cfd14c314a866f00e0883
diff --git a/src/libserver/cfg_utils.c b/src/libserver/cfg_utils.c
index ded0e0eb9..e28f6445e 100644
--- a/src/libserver/cfg_utils.c
+++ b/src/libserver/cfg_utils.c
@@ -66,7 +66,39 @@ rspamd_parse_bind_line (struct rspamd_config *cfg,
 		return FALSE;
 	}
 
-	tokens = g_strsplit_set (str, ":", 0);
+	if (str[0] == '[') {
+		/* This is an ipv6 address */
+		gsize len, ntok;
+		const gchar *start, *ip_pos;
+
+		start = str + 1;
+
+		len = strcspn (start, "]");
+		if (start[len] != ']') {
+			return FALSE;
+		}
+
+		ip_pos = start;
+		start += len + 1;
+		ntok = 1;
+
+		if (*start == ':') {
+			ntok = 2;
+			start ++;
+		}
+
+		tokens = g_malloc_n (ntok + 1, sizeof (gchar *));
+		tokens[ntok] = NULL;
+		tokens[0] = g_malloc (len + 1);
+		rspamd_strlcpy (tokens[0], ip_pos, len + 1);
+
+		if (ntok > 1) {
+			tokens[1] = g_strdup (start);
+		}
+	}
+	else {
+		tokens = g_strsplit_set (str, ":", 0);
+	}
 	if (!tokens || !tokens[0]) {
 		return FALSE;
 	}