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

24
src/session/session_manager.cpp
View File

@@ -271,7 +271,7 @@ static int tcp_init(struct session_manager *mgr, struct session *sess)
}
SESSION_LOG_DEBUG("session %lu %s new c2s tcp assembler %p, s2c tcp assembler %p",
session_get_id(sess), session_get_tuple6_str(sess),
session_get_id(sess), session_get0_readable_addr(sess),
sess->tcp_halfs[FLOW_DIRECTION_C2S].assembler,
sess->tcp_halfs[FLOW_DIRECTION_S2C].assembler);
@@ -524,7 +524,7 @@ static int duplicated_packet_bypass(struct session_manager *mgr, struct session
static void session_update(struct session *sess, enum session_state next_state, const struct packet *pkt, const struct tuple6 *key, enum flow_direction dir)
{
uint64_t real_sec = stellar_get_real_time_sec();
if (session_get_state(sess) == SESSION_STATE_INIT)
if (session_get_current_state(sess) == SESSION_STATE_INIT)
{
session_set_id(sess, id_generator_alloc());
session_set_tuple(sess, key);
@@ -589,7 +589,7 @@ static void session_update(struct session *sess, enum session_state next_state,
session_set_current_packet(sess, pkt);
session_set_current_flow_direction(sess, dir);
session_set_timestamp(sess, SESSION_TIMESTAMP_LAST, real_sec);
session_set_state(sess, next_state);
session_set_current_state(sess, next_state);
}
static void session_manager_evicte_session(struct session_manager *mgr, struct session *sess, uint64_t now, int reason)
@@ -600,10 +600,10 @@ static void session_manager_evicte_session(struct session_manager *mgr, struct s
}
// when session add to evicted queue, session lifetime is over
enum session_state curr_state = session_get_state(sess);
enum session_state curr_state = session_get_current_state(sess);
enum session_state next_state = session_transition_run(curr_state, reason);
session_transition_log(sess, curr_state, next_state, reason);
session_set_state(sess, next_state);
session_set_current_state(sess, next_state);
if (!session_get_closing_reason(sess))
{
if (reason == PORT_REUSE_EVICT)
@@ -776,7 +776,7 @@ static int session_manager_update_tcp_session(struct session_manager *mgr, struc
inputs |= tcp_layer->pld_len ? TCP_DATA : NONE;
// update state
enum session_state curr_state = session_get_state(sess);
enum session_state curr_state = session_get_current_state(sess);
enum session_state next_state = session_transition_run(curr_state, inputs);
// update session
@@ -851,12 +851,12 @@ static int session_manager_update_tcp_session(struct session_manager *mgr, struc
static int session_manager_update_udp_session(struct session_manager *mgr, struct session *sess, const struct packet *pkt, const struct tuple6 *key, uint64_t now)
{
enum flow_direction dir = identify_direction_by_history(sess, key);
enum session_state curr_state = session_get_state(sess);
enum session_state curr_state = session_get_current_state(sess);
enum session_state next_state = session_transition_run(curr_state, UDP_DATA);
session_update(sess, next_state, pkt, key, dir);
session_transition_log(sess, curr_state, next_state, UDP_DATA);
if (session_get_state(sess) == SESSION_STATE_DISCARD)
if (session_get_current_state(sess) == SESSION_STATE_DISCARD)
{
session_timer_update(mgr->sess_timer, sess, now + mgr->opts.udp_discard_timeout);
}
@@ -1019,7 +1019,7 @@ void session_manager_free_session(struct session_manager *mgr, struct session *s
{
session_table_del(mgr->tcp_sess_table, sess);
}
SESS_MGR_STAT_DEC(&mgr->stat, session_get_state(sess), tcp);
SESS_MGR_STAT_DEC(&mgr->stat, session_get_current_state(sess), tcp);
mgr->stat.curr_nr_tcp_sess_used--;
break;
case SESSION_TYPE_UDP:
@@ -1027,7 +1027,7 @@ void session_manager_free_session(struct session_manager *mgr, struct session *s
{
session_table_del(mgr->udp_sess_table, sess);
}
SESS_MGR_STAT_DEC(&mgr->stat, session_get_state(sess), udp);
SESS_MGR_STAT_DEC(&mgr->stat, session_get_current_state(sess), udp);
mgr->stat.curr_nr_udp_sess_used--;
break;
default:
@@ -1096,10 +1096,10 @@ struct session *session_manager_get_expired_session(struct session_manager *mgr,
struct session *sess = session_timer_expire(mgr->sess_timer, now);
if (sess)
{
enum session_state curr_state = session_get_state(sess);
enum session_state curr_state = session_get_current_state(sess);
enum session_state next_state = session_transition_run(curr_state, TIMEOUT);
session_transition_log(sess, curr_state, next_state, TIMEOUT);
session_set_state(sess, next_state);
session_set_current_state(sess, next_state);
switch (session_get_type(sess))
{