sharpetronics/strongswan
1
0
Fork 0
mirror of https://github.com/strongswan/strongswan.git synced 2025-10-04 00:00:14 -04:00
Code Issues Projects Releases Wiki Activity

ikev1: Minor code optimization in task manager

Browse Source 
Signed-off-by: Thomas Egerer <thomas.egerer@secunet.com>
This commit is contained in:
Thomas Egerer 2016-12-06 13:24:59 +01:00 committed by Tobias Brunner
parent 8fe2cefd9d
commit 8c50bb6c36
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/libcharon/sa/ikev1/task_manager_v1.c
View File

@ -367,7 +367,7 @@ static status_t retransmit_packet(private_task_manager_t *this, uint32_t seqnr,
send_packets(this, packets);
lib->scheduler->schedule_job_ms(lib->scheduler, (job_t*)
retransmit_job_create(seqnr, this->ike_sa->get_id(this->ike_sa)), t);
return NEED_MORE;
return SUCCESS;
}
METHOD(task_manager_t, retransmit, status_t,
@ -380,10 +380,9 @@ METHOD(task_manager_t, retransmit, status_t,
{
status = retransmit_packet(this, seqnr, this->initiating.mid,
this->initiating.retransmitted, this->initiating.packets);
if (status == NEED_MORE)
if (status == SUCCESS)
{
this->initiating.retransmitted++;
status = SUCCESS;
}
}
if (seqnr == this->responding.seqnr &&
@ -391,10 +390,9 @@ METHOD(task_manager_t, retransmit, status_t,
{
status = retransmit_packet(this, seqnr, this->responding.mid,
this->responding.retransmitted, this->responding.packets);
if (status == NEED_MORE)
if (status == SUCCESS)
{
this->responding.retransmitted++;
status = SUCCESS;
}
}
return status;
@ -685,13 +683,9 @@ METHOD(task_manager_t, initiate, status_t,
message->destroy(message);
return retransmit(this, this->initiating.seqnr);
}
if (keep)
{ /* keep the packet for retransmission, the responder might request it */
send_packets(this, this->initiating.packets);
}
else
send_packets(this, this->initiating.packets);
if (!keep)
{
send_packets(this, this->initiating.packets);
clear_packets(this->initiating.packets);
}
message->destroy(message);