修复Verify Policy中fqdn entry的命中路径错误，增加Verify Policy测试用例代码框架v4.0.22-20240802

2 files changed, 4 insertions, 32 deletions

diff --git a/common/include/verify_policy_utils.h b/common/include/utils.h
index 4d6966e..ece1b36 100644
--- a/common/include/verify_policy_utils.h
+++ b/common/include/utils.h
@@ -24,27 +24,6 @@
 #define FOREVER for(;;)
 #endif
 
-#ifdef SOCK_NONBLOCK
-#define EVUTIL_SOCK_NONBLOCK SOCK_NONBLOCK
-#else
-#define EVUTIL_SOCK_NONBLOCK 0x4000000
-#endif
-#ifdef SOCK_CLOEXEC
-#define EVUTIL_SOCK_CLOEXEC SOCK_CLOEXEC
-#else
-#define EVUTIL_SOCK_CLOEXEC 0x80000000
-#endif
-#ifdef EFD_NONBLOCK
-#define EVUTIL_EFD_NONBLOCK EFD_NONBLOCK
-#else
-#define EVUTIL_EFD_NONBLOCK 0x4000
-#endif
-#ifdef EFD_CLOEXEC
-#define EVUTIL_EFD_CLOEXEC EFD_CLOEXEC
-#else
-#define EVUTIL_EFD_CLOEXEC 0x8000
-#endif
-
 #define	__rt_always_inline__	__attribute__((always_inline)) inline
 
 #define ALLOC(type, number) ((type *)calloc(sizeof(type), number))
diff --git a/common/include/verify_policy.h b/common/include/verify_policy.h
index 618d9e6..13221d4 100644
--- a/common/include/verify_policy.h
+++ b/common/include/verify_policy.h
@@ -9,8 +9,8 @@
 #define _VERIFY_POLICY_H
 
 #include <event2/event.h>
-#include <log.h>
-#include "verify_policy_utils.h"
+#include "log.h"
+#include "utils.h"
 
 struct breakpad_instance;
 
@@ -146,15 +146,8 @@ struct verify_policy_query
 extern struct verify_policy * g_verify_proxy;
 
 int maat_table_init(struct verify_policy * verify, const char* profile_path);
-int policy_verify_regex_expression(const char *expression);
-int get_ip_entry_tag_ids(cJSON *hit_library, int vsys_id, struct ipaddr *ip_addr);
-int get_fqdn_entry_tag_ids(cJSON *hit_library, int vsys_id, const char *fqdn);
-int http_hit_policy_list(struct verify_policy_query *verify_policy, int num, size_t hit_cnt, cJSON *data_obj, void *pme);
-size_t policy_verify_scan(int vsys_id, int compile_table_id, struct request_query_obj *query_obj, void *pme);
-void policy_scan_ctx_free(void * pme);
+cJSON *get_library_search_query(const char *data, ssize_t data_len);
+cJSON *get_verify_policy_query(const char *data, ssize_t data_len, int thread_id);
 void verify_reload_loglevel();
-void verify_policy_tunnle_add(void * pme);
-void http_get_scan_status(struct request_query_obj *query_obj, int type, cJSON *attributes, cJSON  *data_obj, void *pme);
-void *policy_scan_ctx_new(unsigned int thread_id, int vsys_id, int compile_table_id);
 
 #endif