trap-manager: use ike_cfg resolver functions
authorMartin Willi <martin@revosec.ch>
Thu, 25 Jul 2013 11:40:53 +0000 (13:40 +0200)
committerMartin Willi <martin@revosec.ch>
Wed, 4 Sep 2013 08:38:37 +0000 (10:38 +0200)
src/libcharon/sa/trap_manager.c

index 37426fc..0d5c10d 100644 (file)
@@ -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);