github/wangyu-udp2raw
1
0
Fork 0
mirror of https://github.com/wangyu-/udp2raw.git synced 2025-11-04 20:25:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

trival

Browse Source
This commit is contained in:
wangyu
2017-07-29 00:25:20 +08:00
committed by wangyu
parent 2b7774dcc3
commit b4d9549c0b
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
main.cpp
View File

@@ -457,7 +457,7 @@ struct conv_manager_t //TODO change map to unordered map
mylog(log_info,"conv %x cleared\n"); mylog(log_info,"conv %x cleared\n");
return 0; return 0;
} }
int clean_inactive() int clear_inactive()
{ {
if(disable_conv_clear) return 0; if(disable_conv_clear) return 0;
@@ -617,7 +617,7 @@ struct conn_manager_t
u64|=port; u64|=port;
return mp[u64]; return mp[u64];
} }
int clean_inactive() int clear_inactive()
{ {
if(disable_conv_clear) return 0; if(disable_conv_clear) return 0;
@@ -2420,7 +2420,7 @@ int keep_connection_client(conn_info_t &conn_info) //for client
packet_info_t &recv_info=conn_info.raw_info.recv_info; packet_info_t &recv_info=conn_info.raw_info.recv_info;
raw_info_t &raw_info=conn_info.raw_info; raw_info_t &raw_info=conn_info.raw_info;
current_time_rough=get_current_time(); current_time_rough=get_current_time();
conn_info.conv_manager.clean_inactive(); conn_info.conv_manager.clear_inactive();
mylog(log_trace,"timer!\n"); mylog(log_trace,"timer!\n");
begin: begin:
@@ -2575,7 +2575,7 @@ int keep_connection_server_multi(conn_info_t &conn_info)
mylog(log_debug,"server timer!\n"); mylog(log_debug,"server timer!\n");
raw_info_t &raw_info=conn_info.raw_info; raw_info_t &raw_info=conn_info.raw_info;
current_time_rough=get_current_time(); current_time_rough=get_current_time();
conn_info.conv_manager.clean_inactive(); conn_info.conv_manager.clear_inactive();
if(conn_info.server_current_state==server_ready) if(conn_info.server_current_state==server_ready)
{ {
@@ -3823,7 +3823,7 @@ int server_event_loop()
{ {
uint64_t dummy; uint64_t dummy;
read(timer_fd, &dummy, 8); read(timer_fd, &dummy, 8);
conn_manager.clean_inactive(); conn_manager.clear_inactive();
} }
if ((events[n].data.u64 >>32u) == 2u) if ((events[n].data.u64 >>32u) == 2u)
{ {