From 7446fa28603a88f111aa12f817473c62825837a6 Mon Sep 17 00:00:00 2001
From: Martin Willi <martin@revosec.ch>
Date: Thu, 25 Jul 2013 13:40:53 +0200
Subject: [PATCH] trap-manager: use ike_cfg resolver functions

---
 src/libcharon/sa/trap_manager.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/libcharon/sa/trap_manager.c b/src/libcharon/sa/trap_manager.c
index 37426fc47..0d5c10d59 100644
--- a/src/libcharon/sa/trap_manager.c
+++ b/src/libcharon/sa/trap_manager.c
@@ -105,16 +105,14 @@ METHOD(trap_manager_t, install, u_int32_t,
 
 	/* try to resolve addresses */
 	ike_cfg = peer->get_ike_cfg(peer);
-	other = host_create_from_dns(ike_cfg->get_other_addr(ike_cfg, NULL),
-								 0, ike_cfg->get_other_port(ike_cfg));
+	other = ike_cfg->resolve_other(ike_cfg, AF_UNSPEC);
 	if (!other || other->is_anyaddr(other))
 	{
 		DESTROY_IF(other);
 		DBG1(DBG_CFG, "installing trap failed, remote address unknown");
 		return 0;
 	}
-	me = host_create_from_dns(ike_cfg->get_my_addr(ike_cfg, NULL),
-					other->get_family(other), ike_cfg->get_my_port(ike_cfg));
+	me = ike_cfg->resolve_me(ike_cfg, other->get_family(other));
 	if (!me || me->is_anyaddr(me))
 	{
 		DESTROY_IF(me);