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

attribute-manager: Pass the full IKE_SA to provider methods

Browse Source
This commit is contained in:
Martin Willi
2015-02-20 13:34:56 +01:00
parent 124490a8e0
commit a16058a491
5 changed files with 32 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/sa/ike_sa.c
+1 -3
View File
@@ -2372,13 +2372,11 @@ METHOD(ike_sa_t, destroy, void,
if (this->peer_cfg)
{
linked_list_t *pools;
identification_t *id;
id = get_other_eap_id(this);
pools = linked_list_create_from_enumerator(
this->peer_cfg->create_pool_enumerator(this->peer_cfg));
charon->attributes->release_address(charon->attributes,
pools, vip, id);
pools, vip, &this->public);
pools->destroy(pools);
}
vip->destroy(vip);
src/libcharon/sa/ikev1/tasks/mode_config.c
+5 -5
View File
@@ -372,11 +372,11 @@ static status_t build_set(private_mode_config_t *this, message_t *message)
pools = linked_list_create_with_items(name, NULL);
/* try IPv4, then IPv6 */
found = charon->attributes->acquire_address(charon->attributes,
pools, id, any4);
pools, this->ike_sa, any4);
if (!found)
{
found = charon->attributes->acquire_address(charon->attributes,
pools, id, any6);
pools, this->ike_sa, any6);
}
pools->destroy(pools);
if (found)
@@ -398,7 +398,7 @@ static status_t build_set(private_mode_config_t *this, message_t *message)
pools = linked_list_create_from_enumerator(
config->create_pool_enumerator(config));
enumerator = charon->attributes->create_responder_enumerator(
charon->attributes, pools, id, this->vips);
charon->attributes, pools, this->ike_sa, this->vips);
while (enumerator->enumerate(enumerator, &type, &value))
{
add_attribute(this, cp, type, value, NULL);
@@ -489,7 +489,7 @@ static status_t build_reply(private_mode_config_t *this, message_t *message)
DBG1(DBG_IKE, "peer requested virtual IP %H", requested);
found = charon->attributes->acquire_address(charon->attributes,
pools, id, requested);
pools, this->ike_sa, requested);
if (found)
{
DBG1(DBG_IKE, "assigning virtual IP %H to peer '%Y'", found, id);
@@ -509,7 +509,7 @@ static status_t build_reply(private_mode_config_t *this, message_t *message)
/* query registered providers for additional attributes to include */
enumerator = charon->attributes->create_responder_enumerator(
charon->attributes, pools, id, vips);
charon->attributes, pools, this->ike_sa, vips);
while (enumerator->enumerate(enumerator, &type, &value))
{
cp->add_attribute(cp,
src/libcharon/sa/ikev2/tasks/ike_config.c
+2 -2
View File
@@ -352,7 +352,7 @@ METHOD(task_t, build_r, status_t,
DBG1(DBG_IKE, "peer requested virtual IP %H", requested);
found = charon->attributes->acquire_address(charon->attributes,
pools, id, requested);
pools, this->ike_sa, requested);
if (found)
{
DBG1(DBG_IKE, "assigning virtual IP %H to peer '%Y'", found, id);
@@ -398,7 +398,7 @@ METHOD(task_t, build_r, status_t,
/* query registered providers for additional attributes to include */
enumerator = charon->attributes->create_responder_enumerator(
charon->attributes, pools, id, vips);
charon->attributes, pools, this->ike_sa, vips);
while (enumerator->enumerate(enumerator, &type, &value))
{
if (!cp)