diff options
| author | yangwei <[email protected]> | 2023-08-02 13:29:12 +0800 |
|---|---|---|
| committer | yangwei <[email protected]> | 2023-08-02 18:22:12 +0800 |
| commit | ae7175a4793f9d91b20f1d018213291cc5271eda (patch) | |
| tree | 10020bb5816bd7756540984c3ead7d8ab9115c37 /module_test | |
| parent | 44f4cabef1fd40969e6b874c8d99d0acdf79895a (diff) | |
通过cppcheck代码检查,修复告警
Diffstat (limited to 'module_test')
| -rw-r--r-- | module_test/src/gtest_main.cpp | 10 | ||||
| -rw-r--r-- | module_test/src/gtest_sapp_comm.cpp | 4 | ||||
| -rw-r--r-- | module_test/src/gtest_sapp_inject_plug.cpp | 18 | ||||
| -rw-r--r-- | module_test/src/gtest_sapp_jump_layer_plug.cpp | 110 | ||||
| -rw-r--r-- | module_test/src/gtest_sapp_tcp_plug.cpp | 14 | ||||
| -rw-r--r-- | module_test/src/gtest_sapp_udp_plug.cpp | 8 |
6 files changed, 85 insertions, 79 deletions
diff --git a/module_test/src/gtest_main.cpp b/module_test/src/gtest_main.cpp index 8102ac6..a02a208 100644 --- a/module_test/src/gtest_main.cpp +++ b/module_test/src/gtest_main.cpp @@ -153,13 +153,13 @@ void call_libsapp_devel_online_mode(void) { int ret; gtest_set_libsapp_devel_result(GTEST_SAPP_ERR); - + if(g_slient_mode){ - char *sapp_online_start_args[] = {(char *)"./sapp", (char *)"-s", (char *)"-n", (char *)NULL}; - ret = libsapp_setup_env(3, sapp_online_start_args); + char *sapp_online_start_args_3[] = {(char *)"./sapp", (char *)"-s", (char *)"-n", (char *)NULL}; + ret = libsapp_setup_env(3, sapp_online_start_args_3); }else{ - char *sapp_online_start_args[] = {(char *)"./sapp", (char *)"-n", (char *)NULL}; - ret = libsapp_setup_env(2, sapp_online_start_args); + char *sapp_online_start_args_2[] = {(char *)"./sapp", (char *)"-n", (char *)NULL}; + ret = libsapp_setup_env(2, sapp_online_start_args_2); } if(ret < 0){ diff --git a/module_test/src/gtest_sapp_comm.cpp b/module_test/src/gtest_sapp_comm.cpp index e5bec76..fe4d390 100644 --- a/module_test/src/gtest_sapp_comm.cpp +++ b/module_test/src/gtest_sapp_comm.cpp @@ -767,7 +767,7 @@ void gtest_start_transparent_env_progress(const char *prog_name, const char *pca void gtest_start_sapp_progress(const char *user_argv[]) { pid_t pid; - int nouse_result, null_fd; + int nouse_result; const char *__null_argv[1] = {0}; char **argv; @@ -1322,7 +1322,7 @@ int sapp_set_mpls_addr(struct layer_addr_mpls *addr, const unsigned char *raw_mp } } - if(1 != this_mpls_hdr->mpls_bls) /* 超过MAX_MPLS_ADDR_LAYER, MPLS还没有结�?*/ + if(this_mpls_hdr== NULL || 1 != this_mpls_hdr->mpls_bls) /* 超过MAX_MPLS_ADDR_LAYER, MPLS还没有结�?*/ { return -1; } diff --git a/module_test/src/gtest_sapp_inject_plug.cpp b/module_test/src/gtest_sapp_inject_plug.cpp index 041bd81..8c667e5 100644 --- a/module_test/src/gtest_sapp_inject_plug.cpp +++ b/module_test/src/gtest_sapp_inject_plug.cpp @@ -2003,7 +2003,7 @@ static int MESA_rst_tcp_test_case_c2s(struct streaminfo *pstream, void *a_packet return -1; } - while((0 == g_recv_tun_rst_flag) && (g_recv_tun_rst_flag != 2)){ + while((g_recv_tun_rst_flag != 2)){ usleep(1000); } @@ -2097,7 +2097,7 @@ static int MESA_inject_udp_test_case_s2c(struct streaminfo *pstream, void *a_pac return -1; } - while((0 == g_recv_tun_rst_flag) && (g_recv_tun_rst_flag != 2)){ + while((g_recv_tun_rst_flag != 2)){ usleep(1000); } @@ -2219,7 +2219,7 @@ extern "C" char MESA_rst_tcp_plug_entry_in_double_dir(struct streaminfo *pstream static int MESA_kill_tcp_test_check_pkt(struct streaminfo *pstream, struct inject_pkt_para *inject_paras, void *a_packet) { - while((0 == g_recv_tun_rst_flag) && (g_recv_tun_rst_flag != 2)){ + while((g_recv_tun_rst_flag != 2)){ usleep(1000); } @@ -2326,7 +2326,7 @@ extern "C" int sapp_inject_tcp_payload_c2s(struct streaminfo *pstream,void **pme return APP_STATE_DROPME; } - while((0 == g_recv_tun_rst_flag) && (g_recv_tun_rst_flag != 2)){ + while((g_recv_tun_rst_flag != 2)){ usleep(1000); } @@ -2371,7 +2371,7 @@ extern "C" int sapp_inject_tcp_payload_s2c(struct streaminfo *pstream,void **pme return APP_STATE_DROPME; } - while((0 == g_recv_tun_rst_flag) && (g_recv_tun_rst_flag != 2)){ + while((g_recv_tun_rst_flag != 2)){ usleep(1000); } @@ -2422,7 +2422,7 @@ extern "C" int sapp_inject_udp_payload_c2s(struct streaminfo *pstream,void **pme return APP_STATE_DROPME; } - while((0 == g_recv_tun_rst_flag) && (g_recv_tun_rst_flag != 2)){ + while((g_recv_tun_rst_flag != 2)){ usleep(1000); } @@ -2466,7 +2466,7 @@ extern "C" int MESA_inject_tcp_payload_c2s(struct streaminfo *pstream,void **pme return APP_STATE_DROPME; } - while((0 == g_recv_tun_rst_flag) && (g_recv_tun_rst_flag != 2)){ + while((g_recv_tun_rst_flag != 2)){ usleep(1000); } @@ -2510,7 +2510,7 @@ extern "C" int MESA_inject_tcp_payload_s2c(struct streaminfo *pstream,void **pme return APP_STATE_DROPME; } - while((0 == g_recv_tun_rst_flag) && (g_recv_tun_rst_flag != 2)){ + while((g_recv_tun_rst_flag != 2)){ usleep(1000); } @@ -2555,7 +2555,7 @@ static int plug_inject_payload_test(struct streaminfo *pstream, void *a_packet, return -1; } - while((0 == g_recv_tun_rst_flag) && (g_recv_tun_rst_flag != 2)){ + while((g_recv_tun_rst_flag != 2)){ usleep(1000); } diff --git a/module_test/src/gtest_sapp_jump_layer_plug.cpp b/module_test/src/gtest_sapp_jump_layer_plug.cpp index 48160aa..b18c96a 100644 --- a/module_test/src/gtest_sapp_jump_layer_plug.cpp +++ b/module_test/src/gtest_sapp_jump_layer_plug.cpp @@ -34,7 +34,7 @@ static int jump_check_ipv4_pkt(const struct ip *ip4hdr, int expect_tot_len, unsigned char expect_protocol, const char *expect_src_addr_str, const char *expect_dst_addr_str) { unsigned int expect_src_addr_net, expect_dst_addr_net; - + if(ip4hdr== NULL) return -1; /* 简单判断一下ipv4头部是否正确 */ if(ip4hdr->ip_v != 4){ printf("\033[1;31;40mMESA_net_jump_to_layer(): ipv4 header check version error!\033[0m\n"); @@ -113,6 +113,7 @@ static int jump_check_ipv6_pkt(const struct ip6_hdr *ip6h, int expect_payload_le static int jump_check_tcp_pkt(const struct tcphdr *thdr, int expect_tcp_hdr_offset, unsigned short expect_sport_host, unsigned short expect_dport_host) { + if(thdr== NULL) return -1; if(thdr->doff * 4 != expect_tcp_hdr_offset){ printf("\033[1;31;40mMESA_net_jump_to_layer(): tcp header offset error!\033[0m\n"); sendto_test_result(GTEST_SAPP_ERR); @@ -134,6 +135,7 @@ static int jump_check_tcp_pkt(const struct tcphdr *thdr, int expect_tcp_hdr_offs static int jump_check_udp_pkt(const struct udphdr *uhdr, unsigned short expect_udp_tot_len, unsigned short expect_sport_host, unsigned short expect_dport_host) { + if(uhdr== NULL) return -1; if(ntohs(uhdr->len) != expect_udp_tot_len){ printf("\033[1;31;40mMESA_net_jump_to_layer(): udp header length error!\033[0m\n"); sendto_test_result(GTEST_SAPP_ERR); @@ -156,6 +158,7 @@ static int jump_check_udp_pkt(const struct udphdr *uhdr, unsigned short expect_u static int jump_check_vlan_pkt(const void *vlan_hdr, unsigned int expect_vlan_hex_data) { + if(vlan_hdr == NULL) return -1; if(memcmp(vlan_hdr, &expect_vlan_hex_data, sizeof(int)) != 0){ printf("\033[1;31;40mMESA_net_jump_to_layer(): vlan header error!\033[0m\n"); sendto_test_result(GTEST_SAPP_ERR); @@ -448,30 +451,32 @@ extern "C" char jump_layer_eth_ipv4_gtp_ipv4_tcpall_entry(struct streaminfo *pst printf("\033[1;31;40m MESA_net_jump_to_layer(): eth->ipv4->gtp error!\033[0m\n"); sendto_test_result(GTEST_SAPP_ERR); - } - const struct gtp_hdr *net_gtp_hdr = (struct gtp_hdr *)next_header; - if(net_gtp_hdr->flags != 0x30){ - printf("\033[1;31;40m gtp hdr flags is not 0x30!\033[0m\n"); - sendto_test_result(GTEST_SAPP_ERR); - - } - if(net_gtp_hdr->msg_type != 0xFF){ - printf("\033[1;31;40m gtp hdr msg_type is not 0xFF!\033[0m\n"); - sendto_test_result(GTEST_SAPP_ERR); - } - if(ntohs(net_gtp_hdr->len) != 40){ - printf("\033[1;31;40m gtp hdr length is not 40!\033[0m\n"); - sendto_test_result(GTEST_SAPP_ERR); - - } - if(ntohl(net_gtp_hdr->teid) != 0xb68311b){ - printf("\033[1;31;40m gtp hdr teid is not 0xb68311b!\033[0m\n"); - sendto_test_result(GTEST_SAPP_ERR); - + const struct gtp_hdr *net_gtp_hdr = (struct gtp_hdr *)next_header; + if (net_gtp_hdr) + { + if (net_gtp_hdr->flags != 0x30) + { + printf("\033[1;31;40m gtp hdr flags is not 0x30!\033[0m\n"); + sendto_test_result(GTEST_SAPP_ERR); + } + if (net_gtp_hdr->msg_type != 0xFF) + { + printf("\033[1;31;40m gtp hdr msg_type is not 0xFF!\033[0m\n"); + sendto_test_result(GTEST_SAPP_ERR); + } + if (ntohs(net_gtp_hdr->len) != 40) + { + printf("\033[1;31;40m gtp hdr length is not 40!\033[0m\n"); + sendto_test_result(GTEST_SAPP_ERR); + } + if (ntohl(net_gtp_hdr->teid) != 0xb68311b) + { + printf("\033[1;31;40m gtp hdr teid is not 0xb68311b!\033[0m\n"); + sendto_test_result(GTEST_SAPP_ERR); + } } - next_header = MESA_net_jump_to_layer_greedy(pkt_header, ADDR_TYPE_MAC, ADDR_TYPE_IPV4); /* 内层ipv4 */ if(NULL == next_header){ printf("\033[1;31;40m MESA_net_jump_to_layer(): eth->ipv4->gtp->ipv4 error!\033[0m\n"); @@ -604,43 +609,44 @@ extern "C" char jump_layer_eth_ip4_l2tp_ip4_tcpall_entry(struct streaminfo *pstr printf("\033[1;31;40mMESA_net_jump_to_layer(): eth->ipv4->l2tp error!\033[0m\n"); sendto_test_result(GTEST_SAPP_ERR); - } - const struct l2tp_hdr_v2 *p_l2tp_hdr = (struct l2tp_hdr_v2 *)next_header; - if(p_l2tp_hdr->length_present != 1){ - printf("\033[1;31;40mMESA_net_jump_to_layer():l2tp header length flag is not 1!\033[0m\n"); - sendto_test_result(GTEST_SAPP_ERR); - } - if(p_l2tp_hdr->version != 2){ - printf("\033[1;31;40mMESA_net_jump_to_layer():l2tp header version is not 2!\033[0m\n"); - sendto_test_result(GTEST_SAPP_ERR); - - } - const unsigned short *short_ptr = (unsigned short *)((char *)next_header + sizeof(struct l2tp_hdr_v2)); - if(ntohs(*short_ptr) != 64){ - printf("\033[1;31;40mMESA_net_jump_to_layer():l2tp header lenth is not 64!\033[0m\n"); - sendto_test_result(GTEST_SAPP_ERR); - + const struct l2tp_hdr_v2 *p_l2tp_hdr = (struct l2tp_hdr_v2 *)next_header; + if (p_l2tp_hdr) + { + if (p_l2tp_hdr->length_present != 1) + { + printf("\033[1;31;40mMESA_net_jump_to_layer():l2tp header length flag is not 1!\033[0m\n"); + sendto_test_result(GTEST_SAPP_ERR); + } + if (p_l2tp_hdr->version != 2) + { + printf("\033[1;31;40mMESA_net_jump_to_layer():l2tp header version is not 2!\033[0m\n"); + sendto_test_result(GTEST_SAPP_ERR); + } + const unsigned short *short_ptr = (unsigned short *)((char *)next_header + sizeof(struct l2tp_hdr_v2)); + if (ntohs(*short_ptr) != 64) + { + printf("\033[1;31;40mMESA_net_jump_to_layer():l2tp header lenth is not 64!\033[0m\n"); + sendto_test_result(GTEST_SAPP_ERR); + } + short_ptr++; + if (ntohs(*short_ptr) != 28998) + { + printf("\033[1;31;40mMESA_net_jump_to_layer():l2tp header tunnel id is not 28998!\033[0m\n"); + sendto_test_result(GTEST_SAPP_ERR); + } + short_ptr++; + if (ntohs(*short_ptr) != 2) + { + printf("\033[1;31;40mMESA_net_jump_to_layer():l2tp header session id is not 2!\033[0m\n"); + sendto_test_result(GTEST_SAPP_ERR); + } } - short_ptr++; - if(ntohs(*short_ptr) != 28998){ - printf("\033[1;31;40mMESA_net_jump_to_layer():l2tp header tunnel id is not 28998!\033[0m\n"); - sendto_test_result(GTEST_SAPP_ERR); - - } - short_ptr++; - if(ntohs(*short_ptr) != 2){ - printf("\033[1;31;40mMESA_net_jump_to_layer():l2tp header session id is not 2!\033[0m\n"); - sendto_test_result(GTEST_SAPP_ERR); - - } - /* 跳转到内层ipv4需要用greedy接口 */ next_header = MESA_net_jump_to_layer_greedy(pkt_header, ADDR_TYPE_MAC, ADDR_TYPE_IPV4); if(NULL == next_header){ printf("\033[1;31;40mMESA_net_jump_to_layer(): eth->ipv4->l2tp->ipv4 error!\033[0m\n"); sendto_test_result(GTEST_SAPP_ERR); - } const struct ip* inner_ip4hdr = (struct ip*)next_header; jump_check_ipv4_pkt(inner_ip4hdr, 52, IPPROTO_TCP, "172.16.2.100", "10.0.6.229"); diff --git a/module_test/src/gtest_sapp_tcp_plug.cpp b/module_test/src/gtest_sapp_tcp_plug.cpp index 49a6a51..b9833b0 100644 --- a/module_test/src/gtest_sapp_tcp_plug.cpp +++ b/module_test/src/gtest_sapp_tcp_plug.cpp @@ -45,7 +45,7 @@ extern "C" char tcp_pkt_stat(struct streaminfo *pstream,void **pme, int thread_s } if(pstream->opstate != OP_STATE_CLOSE){ - printf("tcp_pkt_stat, curdir:%d, data_len:%d, c2s_pkt:%d, c2s_bytes:%d, s2c_pkt:%d, s2c_bytes:%d\n", + printf("tcp_pkt_stat, curdir:%u, data_len:%u, c2s_pkt:%u, c2s_bytes:%llu, s2c_pkt:%u, s2c_bytes:%llu\n", pstream->curdir, pdetail->datalen, gtest_tcp_stat.C2S_data_pkt, gtest_tcp_stat.C2S_data_byte, gtest_tcp_stat.S2C_data_pkt, gtest_tcp_stat.S2C_data_byte); if(DIR_C2S == pstream->curdir){ @@ -76,7 +76,7 @@ extern "C" char tcpall_pkt_stat(struct streaminfo *pstream,void **pme, int threa } if(pstream->pktstate != OP_STATE_CLOSE){ - printf("tcpall_pkt_stat, curdir:%d, data_len:%d,c2s_pkt:%d, c2s_bytes:%d, s2c_pkt:%d, s2c_bytes:%d\n", pstream->curdir, pdetail->datalen + printf("tcpall_pkt_stat, curdir:%u, data_len:%u,c2s_pkt:%u, c2s_bytes:%llu, s2c_pkt:%u, s2c_bytes:%llu\n", pstream->curdir, pdetail->datalen , gtest_tcp_stat.C2S_all_pkt, gtest_tcp_stat.C2S_all_byte, gtest_tcp_stat.S2C_all_pkt, gtest_tcp_stat.S2C_all_byte); if(DIR_C2S == pstream->curdir){ gtest_tcp_stat.C2S_all_pkt++; @@ -117,7 +117,7 @@ extern "C" char ip_entry_check_tcp_timeout(const struct streaminfo *pstream, printf("\033[32mtcp.timeout_reset() test succ!\033[0m\n"); gtest_set_libsapp_devel_result(GTEST_SAPP_SUCC); }else{ - printf("\033[1;31;40mtcp_timeout_reset: check data error, ip_number:%d, tcp_c2s:%d, tcp_s2c:%d, tcpall_c2s:%d, tcpall_s2c:%d!\033[0m\n", + printf("\033[1;31;40mtcp_timeout_reset: check data error, ip_number:%d, tcp_c2s:%u, tcp_s2c:%u, tcpall_c2s:%u, tcpall_s2c:%u!\033[0m\n", ip_pkt_number, gtest_tcp_stat.C2S_data_pkt, gtest_tcp_stat.S2C_data_pkt, gtest_tcp_stat.C2S_all_pkt, gtest_tcp_stat.S2C_all_pkt); gtest_set_libsapp_devel_result(GTEST_SAPP_ERR); } @@ -2295,7 +2295,7 @@ extern "C" char tcpall_offload_1st_givestate_entry(struct streaminfo *pstream,vo gtest_tcpall_offload_stat1.S2C_all_byte += pdetail->datalen; } - printf("tcpall_pkt_stat, curdir:%d, data_len:%d,c2s_pkt:%d, c2s_bytes:%d, s2c_pkt:%d, s2c_bytes:%d\n", + printf("tcpall_pkt_stat, curdir:%d, data_len:%u,c2s_pkt:%u, c2s_bytes:%llu, s2c_pkt:%u, s2c_bytes:%llu\n", pstream->curdir, pdetail->datalen, gtest_tcpall_offload_stat1.C2S_all_pkt, @@ -2359,7 +2359,7 @@ extern "C" char tcpall_offload_2st_giveme_entry(struct streaminfo *pstream,void gtest_tcpall_offload_stat2.S2C_all_byte += pdetail->datalen; } - printf("tcpall_pkt_stat, curdir:%d, data_len:%d,c2s_pkt:%d, c2s_bytes:%d, s2c_pkt:%d, s2c_bytes:%d\n", + printf("tcpall_pkt_stat, curdir:%d, data_len:%u,c2s_pkt:%u, c2s_bytes:%llu s2c_pkt:%u, s2c_bytes:%llu\n", pstream->curdir, pdetail->datalen, gtest_tcpall_offload_stat2.C2S_all_pkt, @@ -2425,7 +2425,7 @@ extern "C" char tcp_offload_1st_givestate_entry(struct streaminfo *pstream,void gtest_tcp_offload_stat1.S2C_all_byte += pdetail->datalen; } - printf("tcpall_pkt_stat, curdir:%d, data_len:%d,c2s_pkt:%d, c2s_bytes:%d, s2c_pkt:%d, s2c_bytes:%d\n", + printf("tcpall_pkt_stat, curdir:%d, data_len:%u,c2s_pkt:%u, c2s_bytes:%llu, s2c_pkt:%u, s2c_bytes:%llu\n", pstream->curdir, pdetail->datalen, gtest_tcp_offload_stat1.C2S_all_pkt, @@ -2489,7 +2489,7 @@ extern "C" char tcp_offload_2st_giveme_entry(struct streaminfo *pstream,void **p gtest_tcp_offload_stat2.S2C_all_byte += pdetail->datalen; } - printf("tcpall_pkt_stat, curdir:%d, data_len:%d,c2s_pkt:%d, c2s_bytes:%d, s2c_pkt:%d, s2c_bytes:%d\n", + printf("tcpall_pkt_stat, curdir:%d, data_len:%u,c2s_pkt:%u, c2s_bytes:%llu, s2c_pkt:%u, s2c_bytes:%llu\n", pstream->curdir, pdetail->datalen, gtest_tcp_offload_stat2.C2S_all_pkt, diff --git a/module_test/src/gtest_sapp_udp_plug.cpp b/module_test/src/gtest_sapp_udp_plug.cpp index d85b638..c9bcfd2 100644 --- a/module_test/src/gtest_sapp_udp_plug.cpp +++ b/module_test/src/gtest_sapp_udp_plug.cpp @@ -1420,7 +1420,7 @@ extern "C" char udp_offload_1st_givestate_entry(struct streaminfo *pstream,void } if(49383 != pdetail->clientbytes){ - printf("\033[1;31;40mudp_offload_1st_entry() error, C2S_all_byte is:%llu, but expect %d\033[0m\n", pdetail->clientbytes, 49383); + printf("\033[1;31;40mudp_offload_1st_entry() error, C2S_all_byte is:%u, but expect %d\033[0m\n", pdetail->clientbytes, 49383); gtest_set_libsapp_devel_result(GTEST_SAPP_ERR); return APP_STATE_DROPME; } @@ -1430,7 +1430,7 @@ extern "C" char udp_offload_1st_givestate_entry(struct streaminfo *pstream,void return APP_STATE_DROPME; } if(140937 != pdetail->serverbytes){ - printf("\033[1;31;40mudp_offload_1st_entry() error, S2C_all_byte is:%llu, but expect %d\033[0m\n", pdetail->serverbytes, 140937); + printf("\033[1;31;40mudp_offload_1st_entry() error, S2C_all_byte is:%u, but expect %d\033[0m\n", pdetail->serverbytes, 140937); gtest_set_libsapp_devel_result(GTEST_SAPP_ERR); return APP_STATE_DROPME; } @@ -1489,7 +1489,7 @@ extern "C" char udp_offload_2st_giveme_entry(struct streaminfo *pstream,void **p } if(49383 != pdetail->clientbytes){ - printf("\033[1;31;40mudp_offload_2st_entry() error, C2S_all_byte is:%llu, but expect %d\033[0m\n", pdetail->clientbytes, 49383); + printf("\033[1;31;40mudp_offload_2st_entry() error, C2S_all_byte is:%u, but expect %d\033[0m\n", pdetail->clientbytes, 49383); gtest_set_libsapp_devel_result(GTEST_SAPP_ERR); return APP_STATE_DROPME; } @@ -1499,7 +1499,7 @@ extern "C" char udp_offload_2st_giveme_entry(struct streaminfo *pstream,void **p return APP_STATE_DROPME; } if(140937 != pdetail->serverbytes){ - printf("\033[1;31;40mudp_offload_2st_entry() error, S2C_all_byte is:%llu, but expect %d\033[0m\n", pdetail->serverbytes, 140937); + printf("\033[1;31;40mudp_offload_2st_entry() error, S2C_all_byte is:%u, but expect %d\033[0m\n", pdetail->serverbytes, 140937); gtest_set_libsapp_devel_result(GTEST_SAPP_ERR); return APP_STATE_DROPME; } |
