From: Andreas Steffen <andreas.steffen@strongswan.org>
Date: Sun, 23 Jun 2013 22:22:38 +0000 (+0200)
Subject: Send PA-TNC assessment result even if no workitems are available
X-Git-Tag: 5.1.0dr1~39
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=69c4715bf852a856c14f2d7ba46f2cfd5c884261;p=thirdparty%2Fstrongswan.git

Send PA-TNC assessment result even if no workitems are available
---

diff --git a/src/libimcv/plugins/imv_scanner/imv_scanner_agent.c b/src/libimcv/plugins/imv_scanner/imv_scanner_agent.c
index b1640546f2..a8a12bccb1 100644
--- a/src/libimcv/plugins/imv_scanner/imv_scanner_agent.c
+++ b/src/libimcv/plugins/imv_scanner/imv_scanner_agent.c
@@ -255,6 +255,10 @@ METHOD(imv_agent_if_t, batch_ending, TNC_Result,
 		return TNC_RESULT_SUCCESS;
 	}
 
+	/* create an empty out message - we might need it */
+	out_msg = imv_msg_create(this->agent, state, id, imv_id, TNC_IMCID_ANY,
+							 msg_types[0]);
+
 	if (!session)
 	{
 		DBG2(DBG_IMV, "no workitems available - no evaluation possible");
@@ -263,13 +267,15 @@ METHOD(imv_agent_if_t, batch_ending, TNC_Result,
 							TNC_IMV_EVALUATION_RESULT_DONT_KNOW);
 		scanner_state->set_handshake_state(scanner_state,
 							IMV_SCANNER_STATE_END);
-		return TNC_RESULT_SUCCESS;
+		result = out_msg->send_assessment(out_msg);
+		out_msg->destroy(out_msg);
+		if (result != TNC_RESULT_SUCCESS)
+		{
+			return result;
+		}
+		return this->agent->provide_recommendation(this->agent, state);
 	}
 
-	/* create an empty out message - we might need it */
-	out_msg = imv_msg_create(this->agent, state, id, imv_id, TNC_IMCID_ANY,
-							 msg_types[0]);
-
 	if (handshake_state == IMV_SCANNER_STATE_INIT)
 	{
 		enumerator = session->create_workitem_enumerator(session);
diff --git a/src/libimcv/plugins/imv_scanner/imv_scanner_state.c b/src/libimcv/plugins/imv_scanner/imv_scanner_state.c
index eeb704513d..d8bba988ea 100644
--- a/src/libimcv/plugins/imv_scanner/imv_scanner_state.c
+++ b/src/libimcv/plugins/imv_scanner/imv_scanner_state.c
@@ -272,7 +272,7 @@ METHOD(imv_state_t, get_reason_string, bool,
 	private_imv_scanner_state_t *this, enumerator_t *language_enumerator,
 	chunk_t *reason_string, char **reason_language)
 {
-	if (!this->violating_ports)
+	if (this->violating_ports->get_count(this->violating_ports) == 0)
 	{
 		return FALSE;
 	}
@@ -292,7 +292,7 @@ METHOD(imv_state_t, get_remediation_instructions, bool,
 	private_imv_scanner_state_t *this, enumerator_t *language_enumerator,
 	chunk_t *string, char **lang_code, char **uri)
 {
-	if (!this->violating_ports)
+	if (this->violating_ports->get_count(this->violating_ports) == 0)
 	{
 		return FALSE;
 	}