diff options
| author | Martin Willi <martin@strongswan.org> | 2007-03-05 22:07:36 +0000 |
|---|---|---|
| committer | Martin Willi <martin@strongswan.org> | 2007-03-05 22:07:36 +0000 |
| commit | 6e1be4274411731df619d025355c21fda53b435c (patch) | |
| tree | 1ce0a974085b25e38ade080649fa6ecf10ea45d7 /src/charon/sa/tasks/child_create.c | |
| parent | 02b3101b670dca4b6e83ce41cf28afe605b852e2 (diff) | |
| download | strongswan-6e1be4274411731df619d025355c21fda53b435c.tar.bz2 strongswan-6e1be4274411731df619d025355c21fda53b435c.tar.xz | |
some cleanups
not assigning %any virtual IPs to peer anymore
Diffstat (limited to 'src/charon/sa/tasks/child_create.c')
| -rw-r--r-- | src/charon/sa/tasks/child_create.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/charon/sa/tasks/child_create.c b/src/charon/sa/tasks/child_create.c index 90ac2d06b..6e74f9d15 100644 --- a/src/charon/sa/tasks/child_create.c +++ b/src/charon/sa/tasks/child_create.c @@ -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); 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); - 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 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; } - if (this->proposal == NULL) - { - SIG(CHILD_UP_FAILED, "no acceptable proposal found"); - return FAILED; - } - if (this->tsi->get_count(this->tsi) == 0 || this->tsr->get_count(this->tsr) == 0) { |