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

refactor: move duplicated_packet_filter to packet dir

Browse Source
This commit is contained in:
luwenpeng
2024-08-16 11:43:45 +08:00
parent eaf77888e8
commit d2de4bd328
10 changed files with 88 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/session/session_manager.cpp
View File

@@ -8,6 +8,7 @@
#include "udp_utils.h"
#include "packet_layer.h"
#include "packet_utils.h"
#include "packet_filter.h"
#include "snowflake.h"
#include "session_def.h"
#include "session_utils.h"
@@ -17,7 +18,6 @@
#include "session_filter.h"
#include "session_manager.h"
#include "session_transition.h"
#include "duplicated_packet_filter.h"
#define SESSION_LOG_ERROR(format, ...) LOG_ERROR("session", format, ##__VA_ARGS__)
#define SESSION_LOG_DEBUG(format, ...) LOG_DEBUG("session", format, ##__VA_ARGS__)
@@ -30,7 +30,7 @@ struct session_manager
struct session_table *tcp_sess_table;
struct session_table *udp_sess_table;
struct duplicated_packet_filter *dup_pkt_filter;
struct packet_filter *dup_pkt_filter;
struct session_filter *evicte_sess_filter;
struct session_manager_stat stat;
@@ -499,7 +499,7 @@ static int duplicated_packet_bypass(struct session_manager *mgr, struct session
enum flow_direction dir = identify_direction_by_history(sess, key);
if (session_get_stat(sess, dir, STAT_RAW_PACKETS_RECEIVED) < 3 || session_has_duplicate_traffic(sess))
{
if (duplicated_packet_filter_lookup(mgr->dup_pkt_filter, pkt, mgr->now_ms))
if (packet_filter_lookup(mgr->dup_pkt_filter, pkt, mgr->now_ms))
{
session_inc_stat(sess, dir, STAT_DUPLICATE_PACKETS_BYPASS, 1);
session_inc_stat(sess, dir, STAT_DUPLICATE_BYTES_BYPASS, packet_get_raw_len(pkt));
@@ -523,7 +523,7 @@ static int duplicated_packet_bypass(struct session_manager *mgr, struct session
}
else
{
duplicated_packet_filter_add(mgr->dup_pkt_filter, pkt, mgr->now_ms);
packet_filter_add(mgr->dup_pkt_filter, pkt, mgr->now_ms);
return 0;
}
}
@@ -729,7 +729,7 @@ static struct session *session_manager_new_tcp_session(struct session_manager *m
if (mgr->opts.duplicated_packet_filter_enable)
{
duplicated_packet_filter_add(mgr->dup_pkt_filter, pkt, mgr->now_ms);
packet_filter_add(mgr->dup_pkt_filter, pkt, mgr->now_ms);
}
SESS_MGR_STAT_INC(&mgr->stat, next_state, tcp);
@@ -918,9 +918,9 @@ struct session_manager *session_manager_new(struct session_manager_options *opts
}
if (mgr->opts.duplicated_packet_filter_enable)
{
mgr->dup_pkt_filter = duplicated_packet_filter_new(mgr->opts.duplicated_packet_filter_capacity,
mgr->opts.duplicated_packet_filter_timeout,
mgr->opts.duplicated_packet_filter_error_rate, now_ms);
mgr->dup_pkt_filter = packet_filter_new(mgr->opts.duplicated_packet_filter_capacity,
mgr->opts.duplicated_packet_filter_timeout,
mgr->opts.duplicated_packet_filter_error_rate, now_ms);
if (mgr->dup_pkt_filter == NULL)
{
goto error;
@@ -966,7 +966,7 @@ void session_manager_free(struct session_manager *mgr)
}
if (mgr->opts.duplicated_packet_filter_enable)
{
duplicated_packet_filter_free(mgr->dup_pkt_filter);
packet_filter_free(mgr->dup_pkt_filter);
}
session_timer_free(mgr->sess_timer);
session_table_free(mgr->udp_sess_table);
@@ -981,7 +981,7 @@ void session_manager_record_duplicated_packet(struct session_manager *mgr, const
{
if (mgr->opts.duplicated_packet_filter_enable)
{
duplicated_packet_filter_add(mgr->dup_pkt_filter, pkt, mgr->now_ms);
packet_filter_add(mgr->dup_pkt_filter, pkt, mgr->now_ms);
}
}