From 9658ca2784958da8ee42c328dbd91a3df0fb3b4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=AD=A6=E5=88=A9?= Date: Tue, 8 Aug 2023 08:23:07 +0000 Subject: [PATCH] =?UTF-8?q?TSG-16515:=20=E5=8D=95=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=8C=85=E5=A4=9A=E6=AC=A1=E6=89=AB=E6=8F=8F=E5=91=BD=E4=B8=AD?= =?UTF-8?q?=E7=BB=93=E6=9E=9C=E8=B6=8516=E4=B8=AA=E6=97=B6=E5=AD=98?= =?UTF-8?q?=E5=9C=A8=E9=9D=9E=E6=B3=95=E5=86=99=E5=AF=BC=E8=87=B4=E6=AE=B5?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitlab-ci.yml | 2 +- src/tsg_action.cpp | 4 ++-- src/tsg_rule.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8e735c6..199759a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,7 +4,7 @@ variables: BUILD_IMAGE_CENTOS8: "git.mesalab.cn:7443/mesa_platform/build-env:rockylinux" BUILD_PADDING_PREFIX: /tmp/padding_for_CPACK_RPM_BUILD_SOURCE_DIRS_PREFIX_PREFIX_PREFIX_PREFIX_PREFIX_PREFIX/ INSTALL_PREFIX: "/home/mesasoft/sapp_run/" - INSTALL_DEPENDENCY_LIBRARY: systemd-devel libbreakpad_mini numactl-devel zlib-devel vim-common libMESA_handle_logger-devel libcjson-devel libMESA_field_stat2-devel sapp sapp-devel framework_env libMESA_prof_load-devel http-devel dns-devel ftp-devel mail-devel ssl-devel librdkafka-devel libmaat4-devel quic-devel mesa_sip-devel gtp-devel libMESA_htable-devel libasan mrzcpd rapidjson-devel libMESA_jump_layer-devel stratum-devel rdp-devel dtls-devel-1.0.10.ab7166e libfieldstat3-devel openssl-devel + INSTALL_DEPENDENCY_LIBRARY: systemd-devel libbreakpad_mini numactl-devel zlib-devel vim-common libMESA_handle_logger-devel libcjson-devel libMESA_field_stat2-devel sapp sapp-devel framework_env libMESA_prof_load-devel http-devel dns-devel ftp-devel mail-devel ssl-devel librdkafka-devel libmaat4-4.0.31.73887d5 libmaat4-devel-4.0.31.73887d5 quic-devel mesa_sip-devel gtp-devel libMESA_htable-devel libasan mrzcpd rapidjson-devel libMESA_jump_layer-devel stratum-devel rdp-devel dtls-devel-1.0.10.ab7166e libfieldstat3-devel openssl-devel stages: - analysis diff --git a/src/tsg_action.cpp b/src/tsg_action.cpp index cd0c9f5..7c33051 100644 --- a/src/tsg_action.cpp +++ b/src/tsg_action.cpp @@ -228,7 +228,7 @@ static void template_generate(const struct streaminfo *a_stream, int status_code static int get_response_pages(const struct streaminfo *a_stream, struct maat_rule *p_result, struct compile_user_region *user_region, char **payload, int thread_seq) { - int payload_len=0; + size_t payload_len=0; switch(user_region->deny->type) { @@ -260,7 +260,7 @@ static int get_response_pages(const struct streaminfo *a_stream, struct maat_rul } } - return payload_len; + return (int)payload_len; } static int set_tcp_rst_flags(char *packet, int ip_tcp_hdr_len) diff --git a/src/tsg_rule.cpp b/src/tsg_rule.cpp index 325f977..f2ec737 100644 --- a/src/tsg_rule.cpp +++ b/src/tsg_rule.cpp @@ -2209,7 +2209,7 @@ int srt_attribute_set_subscriber_id(const struct streaminfo *a_stream, struct ma size_t matche_rules_convert(struct maat *feather,long long *rules, size_t n_rules, struct maat_rule *matched_rules, size_t n_matched_rules) { size_t offset=0; - for(size_t i=0; i