Send empty CDATA batch if TNC client has no data to send

1 files changed, 28 insertions, 16 deletions

diff --git a/src/libcharon/plugins/tnccs_20/tnccs_20.c b/src/libcharon/plugins/tnccs_20/tnccs_20.c
index e1ba56642..6239b152d 100644
--- a/src/libcharon/plugins/tnccs_20/tnccs_20.c
+++ b/src/libcharon/plugins/tnccs_20/tnccs_20.c
@@ -646,28 +646,40 @@ METHOD(tls_t, build, status_t,
 
 	if (this->batch_type == PB_BATCH_NONE)
 	{
-		if (this->is_server && state == PB_STATE_SERVER_WORKING)
+		if (this->is_server)
 		{
-			if (this->state_machine->get_empty_cdata(this->state_machine))
-			{
-				check_and_build_recommendation(this);
-			}
-			else
+			if (state == PB_STATE_SERVER_WORKING)
 			{
-				DBG2(DBG_TNC, "no recommendation available yet, "
-							  "sending empty PB-TNC SDATA batch");
-				this->batch_type = PB_BATCH_SDATA;
+				if (this->state_machine->get_empty_cdata(this->state_machine))
+				{
+					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
-        {
-			/**
-			 * In the DECIDED state and if no CRETRY is under way,
-			 * a PB-TNC client replies with an empty CLOSE batch.
-			 */
-			if (state == PB_STATE_DECIDED)
+		{
+			switch (state)
 			{
-				this->batch_type = PB_BATCH_CLOSE;
+				case PB_STATE_CLIENT_WORKING:
+					DBG2(DBG_TNC, "no client data to send, "
+								  "sending empty PB-TNC CDATA batch");
+					this->batch_type = PB_BATCH_CDATA;
+					break;
+				case PB_STATE_DECIDED:
+					/**
+					 * In the DECIDED state and if no CRETRY is under way,
+					 * a PB-TNC client replies with an empty CLOSE batch.
+					 */
+					this->batch_type = PB_BATCH_CLOSE;
+					break;
+				default:
+					break;
 			}
 		}
 	}