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

Generate a new mid only after we start a new task (and exchange)

Browse Source
This commit is contained in:
Martin Willi
2012-03-20 17:30:50 +01:00
parent a7910b1c6e
commit 3e246c4883
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/sa/task_manager_v1.c
+7 -3
View File
@@ -236,6 +236,7 @@ METHOD(task_manager_t, initiate, status_t,
host_t *me, *other; host_t *me, *other;
status_t status; status_t status;
exchange_type_t exchange = EXCHANGE_TYPE_UNDEFINED; exchange_type_t exchange = EXCHANGE_TYPE_UNDEFINED;
bool new_mid = FALSE;
if (!this->rng) if (!this->rng)
{ {
@@ -266,11 +267,14 @@ METHOD(task_manager_t, initiate, status_t,
if (activate_task(this, TASK_QUICK_MODE)) if (activate_task(this, TASK_QUICK_MODE))
{ {
exchange = QUICK_MODE; exchange = QUICK_MODE;
new_mid = TRUE;
break;
} }
if (activate_task(this, TASK_XAUTH_REQUEST)) if (activate_task(this, TASK_XAUTH_REQUEST))
{ {
exchange = TRANSACTION; exchange = TRANSACTION;
new_mid = TRUE;
break;
} }
break; break;
default: default:
@@ -311,12 +315,12 @@ METHOD(task_manager_t, initiate, status_t,
other = this->ike_sa->get_other_host(this->ike_sa); other = this->ike_sa->get_other_host(this->ike_sa);
message = message_create(IKEV1_MAJOR_VERSION, IKEV1_MINOR_VERSION); message = message_create(IKEV1_MAJOR_VERSION, IKEV1_MINOR_VERSION);
if (exchange != ID_PROT) if (new_mid)
{ {
this->rng->get_bytes(this->rng, sizeof(this->initiating.mid), this->rng->get_bytes(this->rng, sizeof(this->initiating.mid),
(void*)&this->initiating.mid); (void*)&this->initiating.mid);
message->set_message_id(message, this->initiating.mid);
} }
message->set_message_id(message, this->initiating.mid);
message->set_source(message, me->clone(me)); message->set_source(message, me->clone(me));
message->set_destination(message, other->clone(other)); message->set_destination(message, other->clone(other));
message->set_exchange_type(message, exchange); message->set_exchange_type(message, exchange);