diff options
| author | songyanchao <[email protected]> | 2022-08-04 22:54:52 -0400 |
|---|---|---|
| committer | songyanchao <[email protected]> | 2022-08-04 22:54:52 -0400 |
| commit | 5bc05b83d15444c51af24626946b6486f1a7bb60 (patch) | |
| tree | 2e0397622881eee6febbfedfeaaa0cb94abdfaed /tools | |
| parent | 31dbaa0410d8a2c8b0748f4b6538e0fbee60fc08 (diff) | |
🎈 perf(TSG-11533): 统一 RPC Topic 定义位置
统一 RPC Topic 定义位置
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/classifier_rule_test/classifier_rule_test.c | 17 | ||||
| -rw-r--r-- | tools/lb_rule_test/lb_rule_test.c | 9 |
2 files changed, 4 insertions, 22 deletions
diff --git a/tools/classifier_rule_test/classifier_rule_test.c b/tools/classifier_rule_test/classifier_rule_test.c index c7c0cd5..ccc59ab 100644 --- a/tools/classifier_rule_test/classifier_rule_test.c +++ b/tools/classifier_rule_test/classifier_rule_test.c @@ -21,15 +21,6 @@ #define MR_CLI_RESPONSE_ENABLE 1 #define MR_CLI_CLOSE_DELAY 100 -/* Dynamic Classifier Rule Topic */ -#ifndef MR_CLASSIFIER_TOPIC_IPV4_SINGLE_RULE_ADD -#define MR_CLASSIFIER_TOPIC_IPV4_SINGLE_RULE_ADD "IPv4SingleRuleAdd" -#endif - -#ifndef MR_CLASSIFIER_TOPIC_IPV4_SINGLE_RULE_DEL -#define MR_CLASSIFIER_TOPIC_IPV4_SINGLE_RULE_DEL "IPv4SingleRuleDel" -#endif - #ifndef MR_CLASSIFIER_RPC_RESULT #define MR_CLASSIFIER_RPC_RESULT "Result" #endif @@ -151,10 +142,10 @@ void send_classifier_rule_add_msg(struct rpc_instance * instance,int rule_id) cJSON_AddNumberToObject(cjson_rule, "SrcIpMask", 24); cJSON_AddStringToObject(cjson_rule, "DstIp", str_dst_addr); cJSON_AddNumberToObject(cjson_rule, "DstIpMask", 24); - cJSON_AddNumberToObject(cjson_rule, "SrcPortLow", 20); - cJSON_AddNumberToObject(cjson_rule, "SrcPortHigh", 60000); - cJSON_AddNumberToObject(cjson_rule, "DstPortLow", 20); - cJSON_AddNumberToObject(cjson_rule, "DstPortHigh", 50000+rule_id); + cJSON_AddNumberToObject(cjson_rule, "SrcPortLow", 0); + cJSON_AddNumberToObject(cjson_rule, "SrcPortHigh", 65530); + cJSON_AddNumberToObject(cjson_rule, "DstPortLow", 0); + cJSON_AddNumberToObject(cjson_rule, "DstPortHigh", 64511+rule_id); cJSON_AddNumberToObject(cjson_rule, "Proto", IPPROTO_TCP); cJSON_AddNumberToObject(cjson_rule, "Priority", 1); cJSON_AddNumberToObject(cjson_rule, "SiId", rule_id%2); diff --git a/tools/lb_rule_test/lb_rule_test.c b/tools/lb_rule_test/lb_rule_test.c index c35f65c..6ea7280 100644 --- a/tools/lb_rule_test/lb_rule_test.c +++ b/tools/lb_rule_test/lb_rule_test.c @@ -21,15 +21,6 @@ #define MR_CLI_RESPONSE_ENABLE 1 #define MR_CLI_CLOSE_DELAY 100 -/* Dynamic Load Balance Topic */ -#ifndef MR_LB_TOPIC_SINGLE_RULE_ADD -#define MR_LB_TOPIC_SINGLE_RULE_ADD "LBSingleRuleAdd" -#endif - -#ifndef MR_LB_TOPIC_SINGLE_RULE_DEL -#define MR_LB_TOPIC_SINGLE_RULE_DEL "LBSingleRuleDel" -#endif - #ifndef MR_LB_RPC_RESULT #define MR_LB_RPC_RESULT "Result" #endif |