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

Enforce encapsulation mode of configuration, in case initiator proposes both

Browse Source
This commit is contained in:
Martin Willi
2012-03-20 17:31:34 +01:00
parent e129168ba6
commit c40963b457
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/sa/ikev1/tasks/quick_mode.c
+2 -1
View File
@@ -765,7 +765,6 @@ METHOD(task_t, process_r, status_t,
get_lifetimes(this); get_lifetimes(this);
apply_lifetimes(this, sa_payload); apply_lifetimes(this, sa_payload);
this->mode = sa_payload->get_encap_mode(sa_payload, &udp);
if (!this->proposal) if (!this->proposal)
{ {
@@ -799,6 +798,7 @@ METHOD(task_t, process_r, status_t,
check_for_rekeyed_child(this); check_for_rekeyed_child(this);
udp = this->ike_sa->has_condition(this->ike_sa, COND_NAT_ANY);
this->child_sa = child_sa_create( this->child_sa = child_sa_create(
this->ike_sa->get_my_host(this->ike_sa), this->ike_sa->get_my_host(this->ike_sa),
this->ike_sa->get_other_host(this->ike_sa), this->ike_sa->get_other_host(this->ike_sa),
@@ -846,6 +846,7 @@ METHOD(task_t, build_r, status_t,
this->proposal->set_spi(this->proposal, this->spi_r); this->proposal->set_spi(this->proposal, this->spi_r);
udp = this->child_sa->has_encap(this->child_sa); udp = this->child_sa->has_encap(this->child_sa);
this->mode = this->config->get_mode(this->config);
if (udp && this->mode == MODE_TRANSPORT) if (udp && this->mode == MODE_TRANSPORT)
{ {
/* TODO-IKEv1: disable NAT-T for TRANSPORT mode by default? */ /* TODO-IKEv1: disable NAT-T for TRANSPORT mode by default? */