From 1ac88df0019bf5a5f5dafa595d5a3984403ec428 Mon Sep 17 00:00:00 2001 From: fengweihao Date: Wed, 25 Sep 2019 15:54:41 +0800 Subject: [PATCH] =?UTF-8?q?*=20=E4=BF=AE=E6=94=B9tfe=E6=94=AF=E6=8C=81subs?= =?UTF-8?q?cribe=5Fid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plugin/business/pangu-http/src/pangu_http.cpp | 8 ++++---- resource/pangu/dynamic_maat_table_info.conf | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/plugin/business/pangu-http/src/pangu_http.cpp b/plugin/business/pangu-http/src/pangu_http.cpp index 691e6b9..6a07eaf 100644 --- a/plugin/business/pangu-http/src/pangu_http.cpp +++ b/plugin/business/pangu-http/src/pangu_http.cpp @@ -429,7 +429,7 @@ void subscribe_id_new_cb(int table_id, const char* key, const char* table_line, { int ret=0; size_t subscribe_id_offset, len; - ret=get_column_pos(table_line, 7, &subscribe_id_offset, &len); + ret=get_column_pos(table_line, 4, &subscribe_id_offset, &len); if(ret<0) { TFE_LOG_ERROR(g_pangu_rt->local_logger, "Add subscribe ID faild: %s", table_line); @@ -910,7 +910,7 @@ int pangu_policy_init(const char* profile_path, const char* static_section, cons { goto error_out; } - g_pangu_rt->subscriber_id_table_id=Maat_table_register(g_pangu_rt->dyn_maat, "IPD_DYN_SUBSCRIBE_IP"); + g_pangu_rt->subscriber_id_table_id=Maat_table_register(g_pangu_rt->dyn_maat, "TSG_DYN_SUBSCRIBE_IP"); ret=Maat_plugin_EX_register(g_pangu_rt->dyn_maat, g_pangu_rt->subscriber_id_table_id, subscribe_id_new_cb, @@ -2347,7 +2347,7 @@ void pangu_on_http_begin(const struct tfe_stream * stream, if(source_subscribe_id!=NULL) { scan_ret = Maat_full_scan_string(g_pangu_rt->maat, g_pangu_rt->scan_table_id[PXY_CTRL_SUBSCRIBE_ID], - CHARSET_UTF8, sip, strlen(sip), + CHARSET_UTF8, source_subscribe_id, strlen(source_subscribe_id), result+hit_cnt, NULL, MAX_SCAN_RESULT-hit_cnt, &(ctx->scan_mid), (int) thread_id); if(scan_ret>0) @@ -2358,7 +2358,7 @@ void pangu_on_http_begin(const struct tfe_stream * stream, if(dest_subscribe_id!=NULL) { scan_ret = Maat_full_scan_string(g_pangu_rt->maat, g_pangu_rt->scan_table_id[PXY_CTRL_SUBSCRIBE_ID], - CHARSET_UTF8, dip, strlen(dip), + CHARSET_UTF8, dest_subscribe_id, strlen(dest_subscribe_id), result+hit_cnt, NULL, MAX_SCAN_RESULT-hit_cnt, &(ctx->scan_mid), (int) thread_id); if(scan_ret>0) diff --git a/resource/pangu/dynamic_maat_table_info.conf b/resource/pangu/dynamic_maat_table_info.conf index 56f95e5..2bef3f1 100644 --- a/resource/pangu/dynamic_maat_table_info.conf +++ b/resource/pangu/dynamic_maat_table_info.conf @@ -16,4 +16,4 @@ #For expr/expr_plus Table #id name type src_charset dst_charset do_merge cross_cache quick_mode -1 IPD_DYN_SUBSCRIBE_IP plugin {"key":4,"valid":9} +1 TSG_DYN_SUBSCRIBE_IP plugin {"key":3,"valid":5}