diff options
Diffstat (limited to 'platform/src/ssl_service_cache.cpp')
| -rw-r--r-- | platform/src/ssl_service_cache.cpp | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/platform/src/ssl_service_cache.cpp b/platform/src/ssl_service_cache.cpp index 970edd7..a0c2f45 100644 --- a/platform/src/ssl_service_cache.cpp +++ b/platform/src/ssl_service_cache.cpp @@ -1,11 +1,11 @@ #include <ssl_service_cache.h> -#include <MESA/Maat_rule.h> +#include <MESA/maat.h> #include <tfe_resource.h> #include <ssl_stream.h> struct ssl_ja3_enforcer { - Maat_feather_t maat; + struct maat *maat; int table_id; }; @@ -28,7 +28,7 @@ struct ssl_svc_addr static struct ssl_ja3_enforcer g_static_enforcer = {0}; -static void ssl_svc_ja3_param_dup_cb(int table_id, MAAT_PLUGIN_EX_DATA *to, MAAT_PLUGIN_EX_DATA *from, long argl, void *argp) +static void ssl_svc_ja3_param_dup_cb(int table_id, void **to, void **from, long argl, void *argp) { struct ssl_svc_ja3 *param = (struct ssl_svc_ja3 *)*from; if (param) @@ -43,7 +43,7 @@ static void ssl_svc_ja3_param_dup_cb(int table_id, MAAT_PLUGIN_EX_DATA *to, MAAT return; } -static void ssl_svc_ja3_param_new_cb(int table_id, const char *key, const char *table_line, MAAT_PLUGIN_EX_DATA *ad, long argl, void *argp) +static void ssl_svc_ja3_param_new_cb(const char *table_name, int table_id, const char *key, const char *table_line, void **ad, long argl, void *argp) { int is_valid = 0; int pinning_state = 0; @@ -68,7 +68,7 @@ static void ssl_svc_ja3_param_new_cb(int table_id, const char *key, const char * param->fingerprint_id, param->ja3_hash, param->pinning_state, param->is_valid, param->ref_cnt); } -static void ssl_svc_ja3_param_free_cb(int table_id, MAAT_PLUGIN_EX_DATA *ad, long argl, void *argp) +static void ssl_svc_ja3_param_free_cb(int table_id, void **ad, long argl, void *argp) { struct ssl_svc_ja3 *param = (struct ssl_svc_ja3 *)*ad; if (param == NULL) @@ -93,21 +93,20 @@ static void ssl_svc_ja3_param_free(struct ssl_svc_ja3 *param) static int ssl_svc_ja3_init(const char *table_name) { - g_static_enforcer.maat = (Maat_feather_t)tfe_bussiness_resouce_get(STATIC_MAAT); - g_static_enforcer.table_id = Maat_table_register(g_static_enforcer.maat, table_name); + g_static_enforcer.maat = (struct maat *)tfe_bussiness_resouce_get(STATIC_MAAT); + g_static_enforcer.table_id = maat_get_table_id(g_static_enforcer.maat, table_name); if (g_static_enforcer.table_id < 0) { TFE_LOG_ERROR(g_default_logger, "Maat table %s register failed.", table_name); return 0; } - int ret = Maat_plugin_EX_register(g_static_enforcer.maat, - g_static_enforcer.table_id, - ssl_svc_ja3_param_new_cb, - ssl_svc_ja3_param_free_cb, - ssl_svc_ja3_param_dup_cb, - NULL, - 0, - &g_static_enforcer); + int ret = maat_plugin_table_ex_schema_register(g_static_enforcer.maat, + table_name, + ssl_svc_ja3_param_new_cb, + ssl_svc_ja3_param_free_cb, + ssl_svc_ja3_param_dup_cb, + 0, + &g_static_enforcer); if (ret < 0) { TFE_LOG_ERROR(g_default_logger, "failed at Maat_plugin_EX_register(%s), table_id = %d, ret = %d", @@ -122,7 +121,8 @@ enum ssl_ja3_pinning_status ssl_svc_ja3_scan(char *ja3_hash, const char *addr_st { enum ssl_ja3_pinning_status ret = JA3_PINNING_STATUS_UNKNOWN; struct ssl_svc_ja3 *param = NULL; - param = (struct ssl_svc_ja3 *)Maat_plugin_get_EX_data(g_static_enforcer.maat, g_static_enforcer.table_id, ja3_hash); + + param = (struct ssl_svc_ja3 *)maat_plugin_table_get_ex_data(g_static_enforcer.maat, g_static_enforcer.table_id, ja3_hash); if (param == NULL) { ret = JA3_PINNING_STATUS_UNKNOWN; |