From: Tobias Brunner <tobias@strongswan.org>
Date: Tue, 28 Oct 2014 17:23:10 +0000 (+0100)
Subject: ike-cfg: Use host_create_from_range() helper
X-Git-Tag: 5.2.2dr1~46^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e0cd3bad3d40c71559adc23d340b6a6b170dabb0;p=thirdparty%2Fstrongswan.git

ike-cfg: Use host_create_from_range() helper
---

diff --git a/src/libcharon/config/ike_cfg.c b/src/libcharon/config/ike_cfg.c
index 42a3e90577..9464ceb5dc 100644
--- a/src/libcharon/config/ike_cfg.c
+++ b/src/libcharon/config/ike_cfg.c
@@ -459,25 +459,10 @@ static traffic_selector_t* make_range(char *str)
 {
 	traffic_selector_t *ts;
 	ts_type_t type;
-	char *pos;
 	host_t *from, *to;
 
-	pos = strchr(str, '-');
-	if (!pos)
-	{
-		return NULL;
-	}
-	to = host_create_from_string(pos + 1, 0);
-	if (!to)
-	{
-		return NULL;
-	}
-	str = strndup(str, pos - str);
-	from = host_create_from_string_and_family(str, to->get_family(to), 0);
-	free(str);
-	if (!from)
+	if (!host_create_from_range(str, &from, &to))
 	{
-		to->destroy(to);
 		return NULL;
 	}
 	if (to->get_family(to) == AF_INET)