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

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);
}