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

ikev2: Only set STAT_INBOUND for valid and expected messages

Browse Source
This commit is contained in:
Tobias Brunner
2018-12-03 12:00:24 +01:00
parent 631abb6810
commit c99d3b6f63
1 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/sa/ikev2/task_manager_v2.c
+21 -2
View File
@@ -1568,8 +1568,6 @@ METHOD(task_manager_t, process_message, status_t,
/* add a timeout if peer does not establish it completely */ /* add a timeout if peer does not establish it completely */
schedule_delete_job = TRUE; schedule_delete_job = TRUE;
} }
this->ike_sa->set_statistic(this->ike_sa, STAT_INBOUND,
time_monotonic(NULL));
mid = msg->get_message_id(msg); mid = msg->get_message_id(msg);
if (msg->get_request(msg)) if (msg->get_request(msg))
@@ -1587,6 +1585,11 @@ METHOD(task_manager_t, process_message, status_t,
status = handle_fragment(this, &this->responding.defrag, msg); status = handle_fragment(this, &this->responding.defrag, msg);
if (status != SUCCESS) if (status != SUCCESS)
{ {
if (status == NEED_MORE)
{
this->ike_sa->set_statistic(this->ike_sa, STAT_INBOUND,
time_monotonic(NULL));
}
return status; return status;
} }
charon->bus->message(charon->bus, msg, TRUE, TRUE); charon->bus->message(charon->bus, msg, TRUE, TRUE);
@@ -1597,6 +1600,8 @@ METHOD(task_manager_t, process_message, status_t,
switch (process_request(this, msg)) switch (process_request(this, msg))
{ {
case SUCCESS: case SUCCESS:
this->ike_sa->set_statistic(this->ike_sa, STAT_INBOUND,
time_monotonic(NULL));
this->responding.mid++; this->responding.mid++;
break; break;
case NEED_MORE: case NEED_MORE:
@@ -1613,10 +1618,17 @@ METHOD(task_manager_t, process_message, status_t,
status = handle_fragment(this, &this->responding.defrag, msg); status = handle_fragment(this, &this->responding.defrag, msg);
if (status != SUCCESS) if (status != SUCCESS)
{ {
if (status == NEED_MORE)
{
this->ike_sa->set_statistic(this->ike_sa, STAT_INBOUND,
time_monotonic(NULL));
}
return status; return status;
} }
DBG1(DBG_IKE, "received retransmit of request with ID %d, " DBG1(DBG_IKE, "received retransmit of request with ID %d, "
"retransmitting response", mid); "retransmitting response", mid);
this->ike_sa->set_statistic(this->ike_sa, STAT_INBOUND,
time_monotonic(NULL));
charon->bus->alert(charon->bus, ALERT_RETRANSMIT_RECEIVE, msg); charon->bus->alert(charon->bus, ALERT_RETRANSMIT_RECEIVE, msg);
send_packets(this, this->responding.packets, send_packets(this, this->responding.packets,
msg->get_destination(msg), msg->get_source(msg)); msg->get_destination(msg), msg->get_source(msg));
@@ -1646,6 +1658,11 @@ METHOD(task_manager_t, process_message, status_t,
status = handle_fragment(this, &this->initiating.defrag, msg); status = handle_fragment(this, &this->initiating.defrag, msg);
if (status != SUCCESS) if (status != SUCCESS)
{ {
if (status == NEED_MORE)
{
this->ike_sa->set_statistic(this->ike_sa, STAT_INBOUND,
time_monotonic(NULL));
}
return status; return status;
} }
charon->bus->message(charon->bus, msg, TRUE, TRUE); charon->bus->message(charon->bus, msg, TRUE, TRUE);
@@ -1658,6 +1675,8 @@ METHOD(task_manager_t, process_message, status_t,
flush(this); flush(this);
return DESTROY_ME; return DESTROY_ME;
} }
this->ike_sa->set_statistic(this->ike_sa, STAT_INBOUND,
time_monotonic(NULL));
} }
else else
{ {