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

some cleanups

Browse Source 
not assigning %any virtual IPs to peer anymore
This commit is contained in:
Martin Willi
2007-03-05 22:07:36 +00:00
parent 02b3101b67
commit 6e1be42744
2 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/charon/config/proposal.c
+1 -5
View File
@@ -222,9 +222,6 @@ static bool select_algo(linked_list_t *first, linked_list_t *second, bool *add,
second_iter->reset(second_iter); second_iter->reset(second_iter);
while (second_iter->iterate(second_iter, (void**)&second_alg)) while (second_iter->iterate(second_iter, (void**)&second_alg))
{ {
DBG2(DBG_CFG, "comparing algo %d - %d, keylen %d - %d",
first_alg->algorithm, second_alg->algorithm,
first_alg->key_size, second_alg->key_size);
if (first_alg->algorithm == second_alg->algorithm && if (first_alg->algorithm == second_alg->algorithm &&
first_alg->key_size == second_alg->key_size) first_alg->key_size == second_alg->key_size)
{ {
@@ -276,8 +273,7 @@ static proposal_t *select_proposal(private_proposal_t *this, private_proposal_t
else else
{ {
selected->destroy(selected); selected->destroy(selected);
DBG2(DBG_CFG, " no acceptable ENCRYPTION_ALGORITHM found contained %d - %d, skipping", DBG2(DBG_CFG, " no acceptable ENCRYPTION_ALGORITHM found, skipping");
this->encryption_algos->get_count(this->encryption_algos), other->encryption_algos->get_count(other->encryption_algos));
return NULL; return NULL;
} }
/* select integrity algorithm */ /* select integrity algorithm */
src/charon/sa/tasks/child_create.c
+6 -8
View File
@@ -193,9 +193,13 @@ static status_t select_and_install(private_child_create_t *this)
my_vip = this->ike_sa->get_virtual_ip(this->ike_sa, TRUE); my_vip = this->ike_sa->get_virtual_ip(this->ike_sa, TRUE);
other_vip = this->ike_sa->get_virtual_ip(this->ike_sa, FALSE); other_vip = this->ike_sa->get_virtual_ip(this->ike_sa, FALSE);
DBG1(DBG_IKE, "received %d proposals, selecting:", this->proposals->get_count(this->proposals));
this->proposal = this->policy->select_proposal(this->policy, this->proposals); this->proposal = this->policy->select_proposal(this->policy, this->proposals);
DBG1(DBG_IKE, "proposal is %p", this->proposal);
if (this->proposal == NULL)
{
SIG(CHILD_UP_FAILED, "no acceptable proposal found");
return FAILED;
}
if (this->initiator && my_vip) if (this->initiator && my_vip)
{ /* if we have a virtual IP, shorten our TS to the minimum */ { /* if we have a virtual IP, shorten our TS to the minimum */
@@ -232,12 +236,6 @@ static status_t select_and_install(private_child_create_t *this)
this->tsi = other_ts; this->tsi = other_ts;
} }
if (this->proposal == NULL)
{
SIG(CHILD_UP_FAILED, "no acceptable proposal found");
return FAILED;
}
if (this->tsi->get_count(this->tsi) == 0 || if (this->tsi->get_count(this->tsi) == 0 ||
this->tsr->get_count(this->tsr) == 0) this->tsr->get_count(this->tsr) == 0)
{ {