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

implementation of an CFG attribute framework, currently supporting virtual IPs

Browse Source 
updated ipsec.conf sourceip parameter to support
	CIDR notatation to serve from a pool
	%poolname to query a separate (database?) pool
This commit is contained in:
Martin Willi
2008-04-09 12:54:47 +00:00
parent 4a96521965
commit cdcfe777f4
19 changed files with 466 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/charon/sa/ike_sa.c
+10 -1
View File
@@ -2315,7 +2315,16 @@ static void destroy(private_ike_sa_t *this)
this->my_virtual_ip);
this->my_virtual_ip->destroy(this->my_virtual_ip);
}
DESTROY_IF(this->other_virtual_ip);
if (this->other_virtual_ip)
{
if (this->peer_cfg && this->peer_cfg->get_pool(this->peer_cfg))
{
charon->attributes->release_address(charon->attributes,
this->peer_cfg->get_pool(this->peer_cfg),
this->other_virtual_ip);
}
this->other_virtual_ip->destroy(this->other_virtual_ip);
}
remove_dns_servers(this);
this->dns_servers->destroy_offset(this->dns_servers,
src/charon/sa/tasks/child_create.c
+1 -2
View File
@@ -535,11 +535,10 @@ static status_t build_i(private_child_create_t *this, message_t *message)
if (!this->reqid)
{
peer_cfg = this->ike_sa->get_peer_cfg(this->ike_sa);
vip = peer_cfg->get_my_virtual_ip(peer_cfg);
vip = peer_cfg->get_virtual_ip(peer_cfg);
if (vip)
{
propose_all = TRUE;
vip->destroy(vip);
}
}
src/charon/sa/tasks/ike_config.c
+16 -19
View File
@@ -261,15 +261,15 @@ static status_t build_i(private_ike_config_t *this, message_t *message)
/* reuse virtual IP if we already have one */
vip = this->ike_sa->get_virtual_ip(this->ike_sa, TRUE);
if (!vip)
{
config = this->ike_sa->get_peer_cfg(this->ike_sa);
vip = config->get_virtual_ip(config);
}
if (vip)
{
this->virtual_ip = vip->clone(vip);
}
else
{
config = this->ike_sa->get_peer_cfg(this->ike_sa);
this->virtual_ip = config->get_my_virtual_ip(config);
}
build_payloads(this, message, CFG_REQUEST);
}
@@ -305,11 +305,14 @@ static status_t build_r(private_ike_config_t *this, message_t *message)
host_t *ip;
DBG1(DBG_IKE, "peer requested virtual IP %H", this->virtual_ip);
ip = config->get_other_virtual_ip(config, this->virtual_ip);
if (ip == NULL || ip->is_anyaddr(ip))
ip = charon->attributes->acquire_address(charon->attributes,
config->get_pool(config),
this->ike_sa->get_other_id(this->ike_sa),
this->ike_sa->get_other_auth(this->ike_sa),
this->virtual_ip);
if (ip == NULL)
{
DBG1(DBG_IKE, "not assigning a virtual IP to peer");
DESTROY_IF(ip);
return SUCCESS;
}
DBG1(DBG_IKE, "assigning virtual IP %H to peer", ip);
@@ -318,16 +321,6 @@ static status_t build_r(private_ike_config_t *this, message_t *message)
this->virtual_ip->destroy(this->virtual_ip);
this->virtual_ip = ip;
/* DNS testing values
if (this->dns->remove_last(this->dns, (void**)&ip) == SUCCESS)
{
ip->destroy(ip);
ip = host_create_from_string("10.3.0.1", 0);
this->dns->insert_last(this->dns, ip);
ip = host_create_from_string("10.3.0.2", 0);
this->dns->insert_last(this->dns, ip);
} */
build_payloads(this, message, CFG_REPLY);
}
return SUCCESS;
@@ -354,7 +347,11 @@ static status_t process_i(private_ike_config_t *this, message_t *message)
if (this->virtual_ip == NULL)
{ /* force a configured virtual IP, even server didn't return one */
config = this->ike_sa->get_peer_cfg(this->ike_sa);
this->virtual_ip = config->get_my_virtual_ip(config);
this->virtual_ip = config->get_virtual_ip(config);
if (this->virtual_ip)
{
this->virtual_ip = this->virtual_ip->clone(this->virtual_ip);
}
}
if (this->virtual_ip && !this->virtual_ip->is_anyaddr(this->virtual_ip))