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

Release virtual IPs with the same identity as we acquired it

Browse Source
This commit is contained in:
Martin Willi
2010-03-25 14:29:10 +01:00
parent e06a6154e2
commit 045833c79d
3 changed files with 44 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/sa/tasks/ike_config.c
+1 -33
View File
@@ -299,38 +299,6 @@ static status_t process_r(private_ike_config_t *this, message_t *message)
return NEED_MORE;
}
/**
* Find a peer (EAP) identity to query provider for attributes
*/
static identification_t *get_peer_identity(private_ike_config_t *this)
{
identification_t *id = NULL, *current;
enumerator_t *enumerator;
auth_cfg_t *cfg;
enumerator = this->ike_sa->create_auth_cfg_enumerator(this->ike_sa, FALSE);
while (enumerator->enumerate(enumerator, &cfg))
{
/* prefer EAP-Identity of last round */
current = cfg->get(cfg, AUTH_RULE_EAP_IDENTITY);
if (!current || current->get_type(current) == ID_ANY)
{
current = cfg->get(cfg, AUTH_RULE_IDENTITY);
}
if (current && current->get_type(current) != ID_ANY)
{
id = current;
continue;
}
}
enumerator->destroy(enumerator);
if (!id)
{ /* fallback, should not happen */
id = this->ike_sa->get_other_id(this->ike_sa);
}
return id;
}
/**
* Implementation of task_t.build for responder
*/
@@ -346,7 +314,7 @@ static status_t build_r(private_ike_config_t *this, message_t *message)
peer_cfg_t *config;
identification_t *id;
id = get_peer_identity(this);
id = this->ike_sa->get_other_eap_id(this->ike_sa);
config = this->ike_sa->get_peer_cfg(this->ike_sa);
if (config && this->virtual_ip)