denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

support for virtual IP definition on client side:

Browse Source 
if leftsourceip is defined, it is requested.
  server may define rightsourceip=%config to accept any,
  or it may overwrite it using rightsourceip.
  if server does not return an IP, client enforces its configured leftsourceip.
This commit is contained in:
Martin Willi
2007-05-22 13:49:31 +00:00
parent a06c068191
commit 16878f6823
6 changed files with 59 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/charon/config/peer_cfg.c
+20 -11
View File
@@ -352,23 +352,31 @@ static dpd_action_t get_dpd_action(private_peer_cfg_t *this)
}
/**
* Implementation of peer_cfg_t.get_virtual_ip.
* Implementation of peer_cfg_t.get_my_virtual_ip.
*/
static host_t* get_virtual_ip(private_peer_cfg_t *this, host_t *suggestion)
static host_t* get_my_virtual_ip(private_peer_cfg_t *this)
{
if (suggestion == NULL)
if (this->my_virtual_ip == NULL)
{
if (this->my_virtual_ip)
{
return this->my_virtual_ip->clone(this->my_virtual_ip);
}
return NULL;
}
if (this->other_virtual_ip)
{
return this->my_virtual_ip->clone(this->my_virtual_ip);
}
/**
* Implementation of peer_cfg_t.get_other_virtual_ip.
*/
static host_t* get_other_virtual_ip(private_peer_cfg_t *this, host_t *suggestion)
{
if (this->other_virtual_ip == NULL)
{ /* disallow */
return NULL;
}
if (!this->other_virtual_ip->is_anyaddr(this->other_virtual_ip))
{ /* force own configuration */
return this->other_virtual_ip->clone(this->other_virtual_ip);
}
if (suggestion->is_anyaddr(suggestion))
if (suggestion == NULL || suggestion->is_anyaddr(suggestion))
{
return NULL;
}
@@ -438,7 +446,8 @@ peer_cfg_t *peer_cfg_create(char *name, u_int ike_version, ike_cfg_t *ike_cfg,
this->public.use_reauth = (bool (*) (peer_cfg_t *))use_reauth;
this->public.get_dpd_delay = (u_int32_t (*) (peer_cfg_t *))get_dpd_delay;
this->public.get_dpd_action = (dpd_action_t (*) (peer_cfg_t *))get_dpd_action;
this->public.get_virtual_ip = (host_t* (*) (peer_cfg_t *, host_t *))get_virtual_ip;
this->public.get_my_virtual_ip = (host_t* (*) (peer_cfg_t *))get_my_virtual_ip;
this->public.get_other_virtual_ip = (host_t* (*) (peer_cfg_t *, host_t *))get_other_virtual_ip;
this->public.get_ref = (void(*)(peer_cfg_t *))get_ref;
this->public.destroy = (void(*)(peer_cfg_t *))destroy;
src/charon/config/peer_cfg.h
+21 -14
View File
@@ -273,23 +273,30 @@ struct peer_cfg_t {
dpd_action_t (*get_dpd_action) (peer_cfg_t *this);
/**
* @brief Get a virtual IP for the local or the remote host.
* @brief Get a virtual IP for the local peer.
*
* If no virtual IP should be used, NULL is returned. %any means to request
* a virtual IP using configuration payloads. A specific address is also
* used for a request and may be changed by the server.
*
* By supplying NULL as IP, an IP for the local host is requested. It
* may be %any or specific.
* By supplying %any as host, an IP from the pool is selected to be
* served to the peer.
* If a specified host is supplied, it is checked if this address
* is acceptable to serve to the peer. If so, it is returned. Otherwise,
* an alternative IP is returned.
* In any mode, this call may return NULL indicating virtual IP should
* not be used.
*
* @param this peer_cfg
* @param suggestion NULL, %any or specific, see description
* @return clone of an IP to use, or NULL
* @param suggestion NULL, %any or specific
* @return clone of an IP, %any or NULL
*/
host_t* (*get_virtual_ip) (peer_cfg_t *this, host_t *suggestion);
host_t* (*get_my_virtual_ip) (peer_cfg_t *this);
/**
* @brief Get a virtual IP for the remote peer.
*
* An IP may be supplied, if one was requested by the initiator. However,
* the suggestion is not more as it says, any address may be returned, even
* NULL to not use virtual IPs.
*
* @param this peer_cfg
* @param suggestion NULL, %any or specific
* @return clone of an IP to use
*/
host_t* (*get_other_virtual_ip) (peer_cfg_t *this, host_t *suggestion);
/**
* @brief Get a new reference.