gfwleak/stellar-stellar
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resolve merge conflicts

Browse Source
This commit is contained in:
luwenpeng
2024-05-20 11:12:24 +08:00
parent ccaddf7fdb
commit 0e33a1b647
24 changed files with 172 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
test/gtest_inject_tcp_rst.cpp
View File

@@ -32,7 +32,7 @@ TEST(INJECT_IPV4_BASED_TCP_RST, AFTER_RECV_SYN_ACK)
.s2c_output_pcap = "inject-192.0.2.110:80-192.0.2.211:59942-2.pcap",
// packet injector command
.packet_injector_cmd = {"./packet_injector", "-t", "tcp-rst", "-c", "s2c-packet", "-n", "1"},
.packet_injector_cmd = {"./packet_injector", "-t", "tcp-rst", "-c", "s2c-packet", "-n", "1"},
.diff_skip_pattern = "-I frame.time -I frame.time_epoch -I ip.id -I ip.ttl -I ip.checksum -I tcp.checksum -I tcp.window_size",
};
@@ -68,7 +68,7 @@ TEST(INJECT_IPV4_BASED_TCP_RST, AFTER_RECV_SUB_ACK)
.s2c_output_pcap = "inject-192.0.2.110:80-192.0.2.211:42242-2.pcap",
// packet injector command
.packet_injector_cmd = {"./packet_injector", "-t", "tcp-rst", "-c", "c2s-packet", "-n", "2"},
.packet_injector_cmd = {"./packet_injector", "-t", "tcp-rst", "-c", "c2s-packet", "-n", "2"},
.diff_skip_pattern = "-I frame.time -I frame.time_epoch -I ip.id -I ip.ttl -I ip.checksum -I tcp.checksum -I tcp.window_size",
};
@@ -104,7 +104,7 @@ TEST(INJECT_IPV4_BASED_TCP_RST, AFTER_RECV_C2S_FIRST_PAYLOAD)
.s2c_output_pcap = "inject-192.0.2.110:80-192.0.2.211:35116-2.pcap",
// packet injector command
.packet_injector_cmd = {"./packet_injector", "-t", "tcp-rst", "-c", "c2s-packet", "-n", "3"},
.packet_injector_cmd = {"./packet_injector", "-t", "tcp-rst", "-c", "c2s-packet", "-n", "3"},
.diff_skip_pattern = "-I frame.time -I frame.time_epoch -I ip.id -I ip.ttl -I ip.checksum -I tcp.checksum -I tcp.window_size",
};
@@ -140,7 +140,7 @@ TEST(INJECT_IPV4_BASED_TCP_RST, AFTER_RECV_S2C_FIRST_PAYLOAD)
.s2c_output_pcap = "inject-192.0.2.110:80-192.0.2.211:54408-2.pcap",
// packet injector command
.packet_injector_cmd = "./packet_injector -t tcp-rst -c s2c-packet -n 3",
.packet_injector_cmd = {"./packet_injector", "-t", "tcp-rst", "-c", "s2c-packet", "-n", "3"},
.diff_skip_pattern = "-I frame.time -I frame.time_epoch -I ip.id -I ip.ttl -I ip.checksum -I tcp.checksum -I tcp.window_size",
};

18
test/packet_injector.cpp
View File

@@ -53,22 +53,22 @@ struct inject_rule
static void inject_packet_plugin(struct session *sess, int topic_id, const void *msg, void *per_session_ctx, void *plugin_env)
{
char buffer[1024] = {0};
struct inject_rule *p_rule = &rule;
struct packet *pkt = (struct packet *)msg;
const struct tuple6 *tuple = session_get_tuple6(sess);
if (rule->ip_type == 4 &&
memcmp(&tuple->src_addr.v4, &rule->v4, sizeof(struct in_addr)) &&
memcmp(&tuple->dst_addr.v4, &rule->v4, sizeof(struct in_addr)))
if (p_rule->ip_type == 4 &&
memcmp(&tuple->src_addr.v4, &p_rule->v4, sizeof(struct in_addr)) &&
memcmp(&tuple->dst_addr.v4, &p_rule->v4, sizeof(struct in_addr)))
{
return;
}
if (rule->ip_type == 6 &&
memcmp(&tuple->src_addr.v6, &rule->v6, sizeof(struct in6_addr)) &&
memcmp(&tuple->dst_addr.v6, &rule->v6, sizeof(struct in6_addr)))
if (p_rule->ip_type == 6 &&
memcmp(&tuple->src_addr.v6, &p_rule->v6, sizeof(struct in6_addr)) &&
memcmp(&tuple->dst_addr.v6, &p_rule->v6, sizeof(struct in6_addr)))
{
return;
}
if (rule->port != 0 &&
tuple->src_port != rule->port &&
tuple->dst_port != rule->port)
if (p_rule->port != 0 && tuple->src_port != p_rule->port && tuple->dst_port != p_rule->port)
{
return;
}

6
test/packet_injector_test_frame.cpp
View File

@@ -187,11 +187,11 @@ void packet_injector_test_frame_run(struct packet_injector_case *test)
EXPECT_TRUE(replace_file_string(config_file_abs_path, "dumpfile_dir = \"/tmp/dumpfile/\"", temp) == 0);
// run packet injector
//system_cmd("cd %s && %s && cd ..", test->work_dir, test->packet_injector_cmd);
char cwd[1024];
getcwd(cwd, sizeof(cwd));
chdir(test->work_dir);
inject_packet_main(args_len(test->packet_injector_cmd),(char**)test->packet_injector_cmd);
inject_packet_main(args_len(test->packet_injector_cmd), (char **)test->packet_injector_cmd);
// compare pcap
if (test->c2s_output_pcap && test->c2s_expect_pcap)
{
@@ -215,5 +215,5 @@ void packet_injector_test_frame_run(struct packet_injector_case *test)
{
system_cmd("rm -rf %s", test->work_dir);
}
chdir(cwd);
chdir(cwd);
}