moved file_meas_entry_t struct to header file

[strongswan.git] / src / libimcv / tcg / tcg_pts_attr_file_meas.c

diff --git a/src/libimcv/tcg/tcg_pts_attr_file_meas.c b/src/libimcv/tcg/tcg_pts_attr_file_meas.c
index c2f04a9..362f9ed 100644 (file)
--- a/src/libimcv/tcg/tcg_pts_attr_file_meas.c
+++ b/src/libimcv/tcg/tcg_pts_attr_file_meas.c
@@ -24,19 +24,10 @@
 #include <debug.h>
 
 typedef struct private_tcg_pts_attr_file_meas_t private_tcg_pts_attr_file_meas_t;
-typedef struct file_meas_entry_t file_meas_entry_t;
 
 /**
- * File Measurement entry
- */
-struct file_meas_entry_t {
-       chunk_t   measurement;
-       u_int16_t file_name_len;
-       chunk_t   file_name;
-};
-
-/**
- * File Measurement (see section 3.19.2 of PTS Protocol: Binding to TNC IF-M Specification)
+ * File Measurement
+ * see section 3.19.2 of PTS Protocol: Binding to TNC IF-M Specification
  * 
  *                       1                   2                   3
  *   0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
@@ -273,7 +264,7 @@ METHOD(tcg_pts_attr_file_meas_t, add_file_meas, void,
 /**
  * Enumerate file measurement entries
  */
-static bool port_filter(void *null, file_meas_entry_t **entry, chunk_t *measurement, 
+static bool measurement_filter(void *null, file_meas_entry_t **entry, chunk_t *measurement, 
                                                void *i2, u_int16_t *file_name_len,
                                                void *i3, chunk_t *file_name)
 {
@@ -287,7 +278,7 @@ METHOD(tcg_pts_attr_file_meas_t, create_file_meas_enumerator, enumerator_t*,
        private_tcg_pts_attr_file_meas_t *this)
 {
        return enumerator_create_filter(this->measurements->create_enumerator(this->measurements),
-                                       (void*)port_filter, NULL, NULL);
+                                       (void*)measurement_filter, NULL, NULL);
 }
 
 /**