TSG-20185 Proxy支持IP+Port组合objectv4.8.72-20240328

5 files changed, 16 insertions, 16 deletions

diff --git a/ci/travis.sh b/ci/travis.sh
index 09e4187..d84f210 100644
--- a/ci/travis.sh
+++ b/ci/travis.sh
@@ -34,7 +34,7 @@ env | sort
 
 # Install dependency from YUM
 yum install -y mrzcpd-corei7-4.* numactl-devel zlib-devel librdkafka-devel systemd-devel
-yum install -y libcjson-devel libmaatframe-devel libMESA_field_stat2-devel libfieldstat3-devel libMESA_handle_logger-devel libelua-devel
+yum install -y libcjson-devel libmaatframe-devel libMESA_field_stat2-devel libfieldstat3-devel libfieldstat4-devel libMESA_handle_logger-devel libelua-devel
 yum install -y libMESA_htable-devel libMESA_prof_load-devel libwiredcfg-devel libWiredLB-devel sapp-devel libbreakpad_mini-devel
 yum install -y libasan
 yum install -y numactl-libs # required by mrzcpd
diff --git a/common/src/tfe_resource.cpp b/common/src/tfe_resource.cpp
index f1626ae..f730f8e 100644
--- a/common/src/tfe_resource.cpp
+++ b/common/src/tfe_resource.cpp
@@ -152,7 +152,6 @@ static struct maat *create_maat_feather(const char *instance_name, const char *p
 		maat_options_set_deferred_load_on(opts);
     }
 
-	maat_options_set_rule_effect_interval_ms(opts, effect_interval);
     if (strlen(accept_path) > 0)
     {
         MESA_load_profile_string_def(accept_path, "maat", "ACCEPT_TAGS", accept_tags, sizeof(accept_tags), "{\"tags\":[{\"tag\":\"device_id\",\"value\":\"device_1\"}]}");
diff --git a/common/src/tfe_scan.cpp b/common/src/tfe_scan.cpp
index ce9bdf7..49a0aa2 100644
--- a/common/src/tfe_scan.cpp
+++ b/common/src/tfe_scan.cpp
@@ -434,8 +434,9 @@ int tfe_scan_ipv4_addr(const struct tfe_stream *stream, long long *result, struc
     {
         hit_cnt_ip += n_hit_result;
     }
-    scan_ret = maat_scan_ipv4((struct maat *)tfe_bussiness_resouce_get(STATIC_MAAT), tfe_bussiness_tableid_get(PXY_CTRL_SOURCE_IP), sapp_addr.v4->saddr,
-                               result+hit_cnt+hit_cnt_ip, MAX_SCAN_RESULT-hit_cnt-hit_cnt_ip, &n_hit_result, scan_mid);
+
+    scan_ret = maat_scan_ipv4_port((struct maat *)tfe_bussiness_resouce_get(STATIC_MAAT), tfe_bussiness_tableid_get(PXY_CTRL_SOURCE_IP), sapp_addr.v4->saddr, ntohs(sapp_addr.v4->source),
+                                    result+hit_cnt+hit_cnt_ip, MAX_SCAN_RESULT-hit_cnt-hit_cnt_ip, &n_hit_result, scan_mid);
     if (scan_ret == MAAT_SCAN_HIT)
     {
         hit_cnt_ip += n_hit_result;
@@ -452,8 +453,8 @@ int tfe_scan_ipv4_addr(const struct tfe_stream *stream, long long *result, struc
         hit_cnt_ip += scan_ret;
     }
 
-    scan_ret = maat_scan_ipv4((struct maat *)tfe_bussiness_resouce_get(STATIC_MAAT), tfe_bussiness_tableid_get(PXY_CTRL_DESTINATION_IP), sapp_addr.v4->daddr, 
-                              result+hit_cnt+hit_cnt_ip, MAX_SCAN_RESULT-hit_cnt-hit_cnt_ip, &n_hit_result, scan_mid);
+    scan_ret = maat_scan_ipv4_port((struct maat *)tfe_bussiness_resouce_get(STATIC_MAAT), tfe_bussiness_tableid_get(PXY_CTRL_DESTINATION_IP), sapp_addr.v4->daddr, ntohs(sapp_addr.v4->dest),
+                                   result+hit_cnt+hit_cnt_ip, MAX_SCAN_RESULT-hit_cnt-hit_cnt_ip, &n_hit_result, scan_mid);
     if(scan_ret == MAAT_SCAN_HIT)
     {
         hit_cnt_ip += n_hit_result;
@@ -488,9 +489,9 @@ int tfe_scan_ipv6_addr(const struct tfe_stream *stream, long long *result, struc
     {
         hit_cnt_ip += n_hit_result;
     }
-    
-    scan_ret = maat_scan_ipv6((struct maat *)tfe_bussiness_resouce_get(STATIC_MAAT), tfe_bussiness_tableid_get(PXY_CTRL_SOURCE_IP), sapp_addr.v6->saddr,
-                              result+hit_cnt+hit_cnt_ip, MAX_SCAN_RESULT-hit_cnt-hit_cnt_ip, &n_hit_result, scan_mid);
+
+    scan_ret = maat_scan_ipv6_port((struct maat *)tfe_bussiness_resouce_get(STATIC_MAAT), tfe_bussiness_tableid_get(PXY_CTRL_SOURCE_IP), sapp_addr.v6->saddr, ntohs(sapp_addr.v6->source),
+                                   result+hit_cnt+hit_cnt_ip, MAX_SCAN_RESULT-hit_cnt-hit_cnt_ip, &n_hit_result, scan_mid);
     if (scan_ret == MAAT_SCAN_HIT)
     {
         hit_cnt_ip += n_hit_result;
@@ -506,9 +507,9 @@ int tfe_scan_ipv6_addr(const struct tfe_stream *stream, long long *result, struc
     {
         hit_cnt_ip += scan_ret;
     }
-
-    scan_ret = maat_scan_ipv6((struct maat *)tfe_bussiness_resouce_get(STATIC_MAAT), tfe_bussiness_tableid_get(PXY_CTRL_DESTINATION_IP), sapp_addr.v6->daddr, 
-                              result+hit_cnt+hit_cnt_ip, MAX_SCAN_RESULT-hit_cnt-hit_cnt_ip, &n_hit_result, scan_mid);
+    
+    scan_ret = maat_scan_ipv6_port((struct maat *)tfe_bussiness_resouce_get(STATIC_MAAT), tfe_bussiness_tableid_get(PXY_CTRL_DESTINATION_IP), sapp_addr.v6->daddr, ntohs(sapp_addr.v6->dest),
+                                  result+hit_cnt+hit_cnt_ip, MAX_SCAN_RESULT-hit_cnt-hit_cnt_ip, &n_hit_result, scan_mid);
     if (scan_ret == MAAT_SCAN_HIT)
     {
         hit_cnt_ip += n_hit_result;
diff --git a/plugin/business/traffic-mirror/src/entry.cpp b/plugin/business/traffic-mirror/src/entry.cpp
index ef56552..0701054 100644
--- a/plugin/business/traffic-mirror/src/entry.cpp
+++ b/plugin/business/traffic-mirror/src/entry.cpp
@@ -414,7 +414,6 @@ static struct maat* maat_feather_create_with_override(const char * instance_name
 	{
 		maat_options_set_deferred_load_on(opts);
 	}
-	maat_options_set_rule_effect_interval_ms(opts, effect_interval);
     if (strlen(accept_tags) > 0)
     {
 		maat_options_set_accept_tags(opts, accept_tags);
diff --git a/resource/pangu/table_info.conf b/resource/pangu/table_info.conf
index e16534f..6b27e75 100644
--- a/resource/pangu/table_info.conf
+++ b/resource/pangu/table_info.conf
@@ -66,15 +66,16 @@
         "table_id":5,
 		"table_name":"TSG_OBJ_IP",
         "db_tables":["TSG_OBJ_IP_ADDR","TSG_OBJ_IP_LEARNING_ADDR"],
-        "table_type":"ip_plus",
-        "valid_column":7,
+        "table_type":"ip",
+        "valid_column":8,
         "custom": {
             "item_id":1,
             "group_id":2,
             "addr_type":3,
             "addr_format":4,
             "ip1":5,
-            "ip2":6
+            "ip2":6,
+            "port":7
         }
     },	
 	{