ike-cfg: add a method to resolve local/remote hosts with port

diff --git a/src/libcharon/config/ike_cfg.c b/src/libcharon/config/ike_cfg.c
index 54a054e405519402f9e8b56269ab4b107a7e5ac6..3e182a6534489f572e116a56a23d6d2cd030f232 100644 (file)
--- a/src/libcharon/config/ike_cfg.c
+++ b/src/libcharon/config/ike_cfg.c
@@ -129,6 +129,18 @@ METHOD(ike_cfg_t, fragmentation, fragmentation_t,
        return this->fragmentation;
 }
 
+METHOD(ike_cfg_t, resolve_me, host_t*,
+       private_ike_cfg_t *this, int family)
+{
+       return host_create_from_dns(this->me, family, this->my_port);
+}
+
+METHOD(ike_cfg_t, resolve_other, host_t*,
+       private_ike_cfg_t *this, int family)
+{
+       return host_create_from_dns(this->other, family, this->other_port);
+}
+
 METHOD(ike_cfg_t, get_my_addr, char*,
        private_ike_cfg_t *this, bool *allow_any)
 {
@@ -333,6 +345,8 @@ ike_cfg_t *ike_cfg_create(ike_version_t version, bool certreq, bool force_encap,
                        .send_certreq = _send_certreq,
                        .force_encap = _force_encap_,
                        .fragmentation = _fragmentation,
+                       .resolve_me = _resolve_me,
+                       .resolve_other = _resolve_other,
                        .get_my_addr = _get_my_addr,
                        .get_other_addr = _get_other_addr,
                        .get_my_port = _get_my_port,

diff --git a/src/libcharon/config/ike_cfg.h b/src/libcharon/config/ike_cfg.h
index 719ceb9dd516f418f6e29f80d1c86cb8c1f18631..d1db3b46372410f3327a485c9d07f06c7fc7a5a3 100644 (file)
--- a/src/libcharon/config/ike_cfg.h
+++ b/src/libcharon/config/ike_cfg.h
@@ -77,6 +77,22 @@ struct ike_cfg_t {
         */
        ike_version_t (*get_version)(ike_cfg_t *this);
 
+       /**
+        * Resolve the local address to use for initiation.
+        *
+        * @param family                address family to prefer, or AF_UNSPEC
+        * @return                              resolved host, NULL on error
+        */
+       host_t* (*resolve_me)(ike_cfg_t *this, int family);
+
+       /**
+        * Resolve the remote address to use for initiation.
+        *
+        * @param family                address family to prefer, or AF_UNSPEC
+        * @return                              resolved host, NULL on error
+        */
+       host_t* (*resolve_other)(ike_cfg_t *this, int family);
+
        /**
         * Get own address.
         *