github/wangyu-udp2raw
1
0
Fork 0
mirror of https://github.com/wangyu-/udp2raw.git synced 2025-01-19 14:29:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

more fix

Browse Source
This commit is contained in:
wangyu- 2017-10-30 08:37:53 -05:00
parent a54a0e269b
commit 1afe8d7317
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
connection.cpp
View File

@ -734,9 +734,9 @@ int recv_safer(conn_info_t &conn_info,char &type,char* &data,int &len)///safer t
void server_clear_function(u64_t u64)//used in conv_manager in server mode.for server we have to use one udp fd for one conv(udp connection), void server_clear_function(u64_t u64)//used in conv_manager in server mode.for server we have to use one udp fd for one conv(udp connection),
//so we have to close the fd when conv expires //so we have to close the fd when conv expires
{ {
int fd=int(u64); //int fd=int(u64);
int ret; // int ret;
assert(fd!=0); //assert(fd!=0);
/* /*
epoll_event ev; epoll_event ev;
@ -749,16 +749,18 @@ void server_clear_function(u64_t u64)//used in conv_manager in server mode.for s
mylog(log_fatal,"fd:%d epoll delete failed!!!!\n",fd); mylog(log_fatal,"fd:%d epoll delete failed!!!!\n",fd);
myexit(-1); //this shouldnt happen myexit(-1); //this shouldnt happen
}*/ //no need }*/ //no need
ret= close(fd); //closed fd should be auto removed from epoll
/*ret= close(fd); //closed fd should be auto removed from epoll
if (ret!=0) if (ret!=0)
{ {
mylog(log_fatal,"close fd %d failed !!!!\n",fd); mylog(log_fatal,"close fd %d failed !!!!\n",fd);
myexit(-1); //this shouldnt happen myexit(-1); //this shouldnt happen
} }*/
//mylog(log_fatal,"size:%d !!!!\n",conn_manager.udp_fd_mp.size()); //mylog(log_fatal,"size:%d !!!!\n",conn_manager.udp_fd_mp.size());
assert(fd_manager.exist(u64)); fd64_t fd64=u64;
fd_manager.fd64_close(u64); assert(fd_manager.exist(fd64));
fd_manager.fd64_close(fd64);
//assert(conn_manager.udp_fd_mp.find(fd)!=conn_manager.udp_fd_mp.end()); //assert(conn_manager.udp_fd_mp.find(fd)!=conn_manager.udp_fd_mp.end());
//conn_manager.udp_fd_mp.erase(fd); //conn_manager.udp_fd_mp.erase(fd);

3
main.cpp
View File

@ -1501,9 +1501,6 @@ int server_event_loop()
conn_info_t* p_conn_info=conn_manager.find_insert_p(ip,port); conn_info_t* p_conn_info=conn_manager.find_insert_p(ip,port);
if(fd64==p_conn_info->timer_fd64)//////////timer_fd64 if(fd64==p_conn_info->timer_fd64)//////////timer_fd64
{ {