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

Request and handle retransmission of a lost third aggressive mode message

Browse Source
This commit is contained in:
Martin Willi
2012-03-20 17:31:34 +01:00
parent 37c12bd31e
commit 346dad30d4
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/sa/ikev1/task_manager_v1.c
+8 -5
View File
@@ -529,9 +529,10 @@ METHOD(task_manager_t, initiate, status_t,
message->destroy(message); message->destroy(message);
return retransmit(this, this->initiating.seqnr); return retransmit(this, this->initiating.seqnr);
} }
if (message->get_exchange_type(message) == QUICK_MODE) if (message->get_exchange_type(message) == QUICK_MODE ||
{ /* keep the packet for retransmission in quick mode. The responder message->get_exchange_type(message) == AGGRESSIVE)
* might request a retransmission */ { /* keep the packet for retransmission in quick/aggressive mode.
* The responder might request a retransmission */
charon->sender->send(charon->sender, charon->sender->send(charon->sender,
this->initiating.packet->clone(this->initiating.packet)); this->initiating.packet->clone(this->initiating.packet));
} }
@@ -598,7 +599,8 @@ static status_t build_response(private_task_manager_t *this, message_t *request)
continue; continue;
case NEED_MORE: case NEED_MORE:
/* processed, but task needs another exchange */ /* processed, but task needs another exchange */
if (task->get_type(task) == TASK_QUICK_MODE) if (task->get_type(task) == TASK_QUICK_MODE ||
task->get_type(task) == TASK_AGGRESSIVE_MODE)
{ /* we rely on initiator retransmission, except for { /* we rely on initiator retransmission, except for
* three-message exchanges */ * three-message exchanges */
expect_request = TRUE; expect_request = TRUE;
@@ -960,7 +962,8 @@ METHOD(task_manager_t, process_message, status_t,
{ {
if (this->initiating.packet && if (this->initiating.packet &&
i == (this->initiating.old_hash_pos % MAX_OLD_HASHES) && i == (this->initiating.old_hash_pos % MAX_OLD_HASHES) &&
msg->get_exchange_type(msg) == QUICK_MODE) (msg->get_exchange_type(msg) == QUICK_MODE ||
msg->get_exchange_type(msg) == AGGRESSIVE))
{ {
DBG1(DBG_IKE, "received retransmit of response with ID %u, " DBG1(DBG_IKE, "received retransmit of response with ID %u, "
"resending last request", mid); "resending last request", mid);