Process PB-TNC batches received via PT-TLS asynchronously

src/libcharon/plugins/tnc_pdp/tnc_pdp.c

@@ -587,8 +587,7 @@ static bool pt_tls_receive_more(pt_tls_server_t *this, int fd,
 	switch (this->handle(this))
 	{
 		case NEED_MORE:
-			DBG1(DBG_TNC, "PT-TLS connection needs more");
+			return TRUE;
-			break;
 		case FAILED:
 		case SUCCESS:
 		default:
@@ -597,8 +596,6 @@ static bool pt_tls_receive_more(pt_tls_server_t *this, int fd,
 			close(fd);
 			return FALSE;
 	}
-
-	return TRUE;
 }
 
 /**

src/libpttls/pt_tls_server.c

@@ -400,9 +400,7 @@ static bool authenticate(private_pt_tls_server_t *this)
 /**
  * Perform assessment
  */
-static bool assess(private_pt_tls_server_t *this, tls_t *tnccs)
+static status_t assess(private_pt_tls_server_t *this, tls_t *tnccs)
-{
-	while (TRUE)
 {
 	size_t msglen;
 	size_t buflen = PT_TLS_MAX_MESSAGE_LEN;
@@ -410,30 +408,12 @@ static bool assess(private_pt_tls_server_t *this, tls_t *tnccs)
 	bio_reader_t *reader;
 	u_int32_t vendor, type, identifier;
 	chunk_t data;
-
+	status_t status;
-		switch (tnccs->build(tnccs, buf, &buflen, &msglen))
-		{
-			case SUCCESS:
-				return tnccs->is_complete(tnccs);
-			case ALREADY_DONE:
-				data = chunk_create(buf, buflen);
-				if (!pt_tls_write(this->tls, PT_TLS_PB_TNC_BATCH,
-								  this->identifier++, data))
-				{
-					return FALSE;
-				}
-				break;
-			case INVALID_STATE:
-				break;
-			case FAILED:
-			default:
-				return FALSE;
-		}
 
 	reader = pt_tls_read(this->tls, &vendor, &type, &identifier);
 	if (!reader)
 	{
-			return FALSE;
+		return FAILED;
 	}
 	if (vendor == 0)
 	{
@@ -441,20 +421,20 @@ static bool assess(private_pt_tls_server_t *this, tls_t *tnccs)
 		{
 			DBG1(DBG_TNC, "received PT-TLS error");
 			reader->destroy(reader);
-				return FALSE;
+			return FAILED;
 		}
 		if (type != PT_TLS_PB_TNC_BATCH)
 		{
 			DBG1(DBG_TNC, "unexpected PT-TLS message: %d", type);
 			reader->destroy(reader);
-				return FALSE;
+			return FAILED;
 		}
 		data = reader->peek(reader);
 		switch (tnccs->process(tnccs, data.ptr, data.len))
 		{
 			case SUCCESS:
 				reader->destroy(reader);
-					return tnccs->is_complete(tnccs);
+				return tnccs->is_complete(tnccs) ? SUCCESS : FAILED;
 			case FAILED:
 			default:
 				reader->destroy(reader);
@@ -468,8 +448,19 @@ static bool assess(private_pt_tls_server_t *this, tls_t *tnccs)
 		DBG1(DBG_TNC, "ignoring vendor specific PT-TLS message");
 	}
 	reader->destroy(reader);
+
+	status = tnccs->build(tnccs, buf, &buflen, &msglen);
+	if (status == ALREADY_DONE)
+	{
+		data = chunk_create(buf, buflen);
+		if (!pt_tls_write(this->tls, PT_TLS_PB_TNC_BATCH,
+						  this->identifier++, data))
+		{
+			return FAILED;
 		}
 	}
+	return status;
+}
 
 METHOD(pt_tls_server_t, handle, status_t,
 	private_pt_tls_server_t *this)
@@ -492,15 +483,20 @@ METHOD(pt_tls_server_t, handle, status_t,
 				return FAILED;
 			}
 			this->state = PT_TLS_SERVER_TNCCS;
+			DBG1(DBG_TNC, "entering PT-TLS data transport phase");
 			break;
 		case PT_TLS_SERVER_TNCCS:
-			DBG1(DBG_TNC, "entering PT-TLS data transport phase");
+			switch (assess(this, (tls_t*)this->tnccs))
-			if (!assess(this, (tls_t*)this->tnccs))
 			{
-				return FAILED;
+				case SUCCESS:
-			}
 					this->state = PT_TLS_SERVER_END;
 					return SUCCESS;
+				case FAILED:
+					return FAILED;
+				default:
+					break;
+			}
+			break;
 		default:
 			return FAILED;
 	}