X-Git-Url: https://git.strongswan.org/?p=strongswan.git;a=blobdiff_plain;f=src%2Flibimcv%2Fplugins%2Fimv_attestation%2Fimv_attestation_state.c;h=6305dac2f76e694ba7fd88b9379091e3cf3869a4;hp=0e11f751a400eefe7d25f37900ca8e75fe43f24e;hb=a2ca89676bbe433b123b95c23e83929451948ea9;hpb=925f54d36ece8f26d817d732fabf8ea6b9ad75d9

diff --git a/src/libimcv/plugins/imv_attestation/imv_attestation_state.c b/src/libimcv/plugins/imv_attestation/imv_attestation_state.c
index 0e11f75..6305dac 100644
--- a/src/libimcv/plugins/imv_attestation/imv_attestation_state.c
+++ b/src/libimcv/plugins/imv_attestation/imv_attestation_state.c
@@ -26,7 +26,8 @@ typedef struct request_t request_t;
  * PTS File/Directory Measurement request entry
  */
 struct request_t {
-	int id;
+	u_int16_t id;
+	int file_id;
 	bool is_dir;
 };
 
@@ -66,6 +67,11 @@ struct private_imv_attestation_state_t {
 	TNC_IMV_Evaluation_Result eval;
 
 	/**
+	 * Request counter
+	 */
+	u_int16_t request_counter;
+
+	/**
 	 * List of PTS File/Directory Measurement requests
 	 */
 	linked_list_t *requests;
@@ -194,19 +200,23 @@ METHOD(imv_attestation_state_t, get_pts, pts_t*,
 	return this->pts;
 }
 
-METHOD(imv_attestation_state_t, add_request, void,
-	private_imv_attestation_state_t *this, int id, bool is_dir)
+METHOD(imv_attestation_state_t, add_request, u_int16_t,
+	private_imv_attestation_state_t *this, int file_id, bool is_dir)
 {
 	request_t *request;
 
 	request = malloc_thing(request_t);
-	request->id = id;
+	request->id = ++this->request_counter;
+	request->file_id = file_id;
 	request->is_dir = is_dir;
 	this->requests->insert_last(this->requests, request);
+
+	return this->request_counter;
 }
 
 METHOD(imv_attestation_state_t, check_off_request, bool,
-	private_imv_attestation_state_t *this, int id, bool* is_dir)
+	private_imv_attestation_state_t *this, u_int16_t id, int *file_id,
+	bool* is_dir)
 {
 	enumerator_t *enumerator;
 	request_t *request;
@@ -218,6 +228,7 @@ METHOD(imv_attestation_state_t, check_off_request, bool,
 		if (request->id == id)
 		{
 			found = TRUE;
+			*file_id = request->file_id;
 			*is_dir = request->is_dir;
 			this->requests->remove_at(this->requests, enumerator);
 			free(request);