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

PB-TNC Client sends empty CLOSE batch only in DECIDED state

Browse Source
This commit is contained in:
Andreas Steffen
2012-07-11 17:09:05 +02:00
parent a287a3cdcd
commit 1de4af66d5
1 changed files with 23 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/plugins/tnccs_20/tnccs_20.c
+23 -10
View File
@@ -609,7 +609,7 @@ METHOD(tls_t, build, status_t,
state = this->state_machine->get_state(this->state_machine); state = this->state_machine->get_state(this->state_machine);
if (this->is_server && this->fatal_error && state == PB_STATE_END) if (this->fatal_error && state == PB_STATE_END)
{ {
DBG1(DBG_TNC, "a fatal PB-TNC error occurred, terminating connection"); DBG1(DBG_TNC, "a fatal PB-TNC error occurred, terminating connection");
return FAILED; return FAILED;
@@ -629,19 +629,32 @@ METHOD(tls_t, build, status_t,
this->request_handshake_retry = FALSE; this->request_handshake_retry = FALSE;
} }
if (this->batch_type == PB_BATCH_NONE && this->is_server && if (this->batch_type == PB_BATCH_NONE)
state == PB_STATE_SERVER_WORKING)
{ {
if (this->state_machine->get_empty_cdata(this->state_machine) || if (this->is_server && state == PB_STATE_SERVER_WORKING)
this->recs->have_recommendation(this->recs, NULL, NULL))
{ {
check_and_build_recommendation(this); if (this->state_machine->get_empty_cdata(this->state_machine) ||
this->recs->have_recommendation(this->recs, NULL, NULL))
{
check_and_build_recommendation(this);
}
else
{
DBG2(DBG_TNC, "no recommendation available yet, "
"sending empty PB-TNC SDATA batch");
this->batch_type = PB_BATCH_SDATA;
}
} }
else else
{ {
DBG2(DBG_TNC, "no recommendation available yet, " /**
"sending empty PB-TNC SDATA batch"); * In the DECIDED state and if no CRETRY is under way,
this->batch_type = PB_BATCH_SDATA; * a PB-TNC client replies with an empty CLOSE batch.
*/
if (state == PB_STATE_DECIDED)
{
this->batch_type = PB_BATCH_CLOSE;
}
} }
} }