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

ikev2: properly fall back to tunnel mode if transport/BEET mode not configured

Browse Source
This commit is contained in:
Martin Willi
2013-06-19 16:36:01 +02:00
parent 975457c4d8
commit ad5ad02ade
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/sa/ikev2/tasks/child_create.c
+8 -2
View File
@@ -555,6 +555,10 @@ static status_t select_and_install(private_child_create_t *this,
this->mode = MODE_TUNNEL; this->mode = MODE_TUNNEL;
DBG1(DBG_IKE, "not using transport mode, not host-to-host"); DBG1(DBG_IKE, "not using transport mode, not host-to-host");
} }
if (this->config->get_mode(this->config) != MODE_TRANSPORT)
{
this->mode = MODE_TUNNEL;
}
break; break;
case MODE_BEET: case MODE_BEET:
if (!ts_list_is_host(this->tsi, NULL) || if (!ts_list_is_host(this->tsi, NULL) ||
@@ -563,6 +567,10 @@ static status_t select_and_install(private_child_create_t *this,
this->mode = MODE_TUNNEL; this->mode = MODE_TUNNEL;
DBG1(DBG_IKE, "not using BEET mode, not host-to-host"); DBG1(DBG_IKE, "not using BEET mode, not host-to-host");
} }
if (this->config->get_mode(this->config) != MODE_BEET)
{
this->mode = MODE_TUNNEL;
}
break; break;
default: default:
break; break;
@@ -1169,8 +1177,6 @@ METHOD(task_t, build_r, status_t,
return SUCCESS; return SUCCESS;
} }
this->mode = this->config->get_mode(this->config);
/* check if ike_config_t included non-critical error notifies */ /* check if ike_config_t included non-critical error notifies */
enumerator = message->create_payload_enumerator(message); enumerator = message->create_payload_enumerator(message);
while (enumerator->enumerate(enumerator, &payload)) while (enumerator->enumerate(enumerator, &payload))