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

bugfix: reasion -> reason

Browse Source
This commit is contained in:
luwenpeng
2024-03-08 13:33:49 +08:00
parent 62c70d0d67
commit 31c9303a93
14 changed files with 89 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/session/session_manager.cpp
View File

@@ -112,9 +112,9 @@ static inline void tcp_init_timeout_cb(struct session *sess, void *arg)
struct session_manager *mgr = (struct session_manager *)arg;
assert(mgr != NULL);
if (session_get_closing_reasion(sess) == 0)
if (session_get_closing_reason(sess) == 0)
{
session_set_closing_reasion(sess, CLOSING_BY_TIMEOUT);
session_set_closing_reason(sess, CLOSING_BY_TIMEOUT);
}
session_manager_update_tcp_to_closing(mgr, sess, 1);
}
@@ -125,9 +125,9 @@ static inline void tcp_handshake_timeout_cb(struct session *sess, void *arg)
struct session_manager *mgr = (struct session_manager *)arg;
assert(mgr != NULL);
if (session_get_closing_reasion(sess) == 0)
if (session_get_closing_reason(sess) == 0)
{
session_set_closing_reasion(sess, CLOSING_BY_TIMEOUT);
session_set_closing_reason(sess, CLOSING_BY_TIMEOUT);
}
session_manager_update_tcp_to_closing(mgr, sess, 1);
}
@@ -138,9 +138,9 @@ static inline void tcp_data_timeout_cb(struct session *sess, void *arg)
struct session_manager *mgr = (struct session_manager *)arg;
assert(mgr != NULL);
if (session_get_closing_reasion(sess) == 0)
if (session_get_closing_reason(sess) == 0)
{
session_set_closing_reasion(sess, CLOSING_BY_TIMEOUT);
session_set_closing_reason(sess, CLOSING_BY_TIMEOUT);
}
session_manager_update_tcp_to_closing(mgr, sess, 1);
}
@@ -151,9 +151,9 @@ static inline void tcp_half_closed_timeout_cb(struct session *sess, void *arg)
struct session_manager *mgr = (struct session_manager *)arg;
assert(mgr != NULL);
if (session_get_closing_reasion(sess) == 0)
if (session_get_closing_reason(sess) == 0)
{
session_set_closing_reasion(sess, CLOSING_BY_TIMEOUT);
session_set_closing_reason(sess, CLOSING_BY_TIMEOUT);
}
session_manager_update_tcp_to_closing(mgr, sess, 1);
}
@@ -173,9 +173,9 @@ static inline void udp_data_timeout_cb(struct session *sess, void *arg)
struct session_manager *mgr = (struct session_manager *)arg;
assert(mgr != NULL);
if (session_get_closing_reasion(sess) == 0)
if (session_get_closing_reason(sess) == 0)
{
session_set_closing_reasion(sess, CLOSING_BY_TIMEOUT);
session_set_closing_reason(sess, CLOSING_BY_TIMEOUT);
}
session_manager_update_udp_to_closing(mgr, sess);
}
@@ -484,7 +484,7 @@ on packet update session
on closing update session
[*] session_set_state
[*] session_set_closing_reasion
[*] session_set_closing_reason
*/
static inline void session_manager_update_session_state(struct session_manager *mgr, struct session *sess, enum session_state state)
@@ -705,7 +705,7 @@ static inline void session_manager_handle_tcp_on_opening(struct session_manager
if (tcp_mod_state & (TCP_C2S_RST_RECVED | TCP_S2C_RST_RECVED))
{
SESSION_LOG_DEBUG("TCP %s RST received, session %lu opening -> closing", (tcp_curr_state & TCP_C2S_RST_RECVED ? "C2S" : "S2C"), session_get_id(sess));
session_set_closing_reasion(sess, (tcp_mod_state & TCP_C2S_RST_RECVED) ? CLOSING_BY_CLIENT_RST : CLOSING_BY_SERVER_RST);
session_set_closing_reason(sess, (tcp_mod_state & TCP_C2S_RST_RECVED) ? CLOSING_BY_CLIENT_RST : CLOSING_BY_SERVER_RST);
session_manager_update_tcp_to_closing(mgr, sess, 1);
return;
}
@@ -723,7 +723,7 @@ static inline void session_manager_handle_tcp_on_opening(struct session_manager
{
SESSION_LOG_DEBUG("TCP %s FIN received, session %lu opening -> opening", (tcp_curr_state & TCP_C2S_FIN_RECVED ? "C2S" : "S2C"), session_get_id(sess));
// still opening, only update timeout
session_set_closing_reasion(sess, (tcp_mod_state & TCP_C2S_FIN_RECVED) ? CLOSING_BY_CLIENT_FIN : CLOSING_BY_SERVER_FIN);
session_set_closing_reason(sess, (tcp_mod_state & TCP_C2S_FIN_RECVED) ? CLOSING_BY_CLIENT_FIN : CLOSING_BY_SERVER_FIN);
session_manager_update_session_timer(mgr, sess, tcp_half_closed_timeout_cb, mgr->config.tcp_timeout_half_closed);
return;
}
@@ -772,7 +772,7 @@ static inline void session_manager_handle_tcp_on_active(struct session_manager *
if (tcp_curr_state & (TCP_C2S_RST_RECVED | TCP_S2C_RST_RECVED))
{
SESSION_LOG_DEBUG("TCP %s RST received, session %lu active -> closing", (tcp_curr_state & TCP_C2S_RST_RECVED) ? "C2S" : "S2C", session_get_id(sess));
session_set_closing_reasion(sess, (tcp_curr_state & TCP_C2S_RST_RECVED) ? CLOSING_BY_CLIENT_RST : CLOSING_BY_SERVER_RST);
session_set_closing_reason(sess, (tcp_curr_state & TCP_C2S_RST_RECVED) ? CLOSING_BY_CLIENT_RST : CLOSING_BY_SERVER_RST);
session_manager_update_tcp_to_closing(mgr, sess, 1);
return;
}
@@ -782,7 +782,7 @@ static inline void session_manager_handle_tcp_on_active(struct session_manager *
{
SESSION_LOG_DEBUG("TCP %s FIN received, session %lu active -> active", (tcp_curr_state & TCP_C2S_FIN_RECVED) ? "C2S" : "S2C", session_get_id(sess));
// still active
session_set_closing_reasion(sess, (tcp_curr_state & TCP_C2S_FIN_RECVED) ? CLOSING_BY_CLIENT_FIN : CLOSING_BY_SERVER_FIN);
session_set_closing_reason(sess, (tcp_curr_state & TCP_C2S_FIN_RECVED) ? CLOSING_BY_CLIENT_FIN : CLOSING_BY_SERVER_FIN);
session_manager_update_session_timer(mgr, sess, tcp_half_closed_timeout_cb, mgr->config.tcp_timeout_half_closed);
return;
}
@@ -981,7 +981,7 @@ static inline void session_manager_free_session(struct session_manager *mgr, str
{
if (sess)
{
SESSION_LOG_DEBUG("%s, session %lu closing -> closed", session_closing_reasion_tostring(session_get_closing_reasion(sess)), session_get_id(sess));
SESSION_LOG_DEBUG("%s, session %lu closing -> closed", session_closing_reason_tostring(session_get_closing_reason(sess)), session_get_id(sess));
session_manager_update_session_to_closed(mgr, sess);
if (session_get_type(sess) == SESSION_TYPE_TCP)
{
@@ -1014,7 +1014,7 @@ static inline void session_manager_recycle_session(struct session_manager *mgr)
static inline void session_manager_evicte_session(struct session_manager *mgr, struct session *sess)
{
session_set_closing_reasion(sess, CLOSING_BY_EVICTED);
session_set_closing_reason(sess, CLOSING_BY_EVICTED);
session_manager_update_session_state(mgr, sess, SESSION_STATE_CLOSING);
session_queue_push(mgr->sess_evicted_queue, sess);
session_timer_del_session(mgr->sess_timer, sess);