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

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