StarMirror/toxcore
1
0
Fork 0
mirror of https://github.com/irungentoo/toxcore.git synced 2024-03-22 13:30:51 +08:00
Code Issues Projects Releases Wiki Activity

When socket dies, kill it.

Browse Source 
Use epoll to detect when socket closed connection.
This commit is contained in:
irungentoo 2015-02-22 19:45:28 -05:00
parent bca649fa67
commit 085f90432f
No known key found for this signature in database
GPG Key ID: 10349DC9BED89E98
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
toxcore/TCP_server.c
View File

@ -1192,7 +1192,7 @@ static void do_TCP_epoll(TCP_Server *TCP_server)
sock_t sock = events[n].data.u64 & 0xFFFFFFFF; sock_t sock = events[n].data.u64 & 0xFFFFFFFF;
int status = (events[n].data.u64 >> 32) & 0xFFFF, index = (events[n].data.u64 >> 48); int status = (events[n].data.u64 >> 32) & 0xFFFF, index = (events[n].data.u64 >> 48);
if ((events[n].events & EPOLLERR) || (events[n].events & EPOLLHUP)) { if ((events[n].events & EPOLLERR) || (events[n].events & EPOLLHUP) || (events[n].events & EPOLLRDHUP)) {
switch (status) { switch (status) {
case TCP_SOCKET_LISTENING: { case TCP_SOCKET_LISTENING: {
//should never happen //should never happen
@ -1239,7 +1239,7 @@ static void do_TCP_epoll(TCP_Server *TCP_server)
} }
struct epoll_event ev = { struct epoll_event ev = {
.events = EPOLLIN | EPOLLET, .events = EPOLLIN | EPOLLET | EPOLLRDHUP,
.data.u64 = sock_new | ((uint64_t)TCP_SOCKET_INCOMING << 32) | ((uint64_t)index_new << 48) .data.u64 = sock_new | ((uint64_t)TCP_SOCKET_INCOMING << 32) | ((uint64_t)index_new << 48)
}; };
@ -1255,7 +1255,7 @@ static void do_TCP_epoll(TCP_Server *TCP_server)
int index_new; int index_new;
if ((index_new = do_incoming(TCP_server, index)) != -1) { if ((index_new = do_incoming(TCP_server, index)) != -1) {
events[n].events = EPOLLIN | EPOLLET; events[n].events = EPOLLIN | EPOLLET | EPOLLRDHUP;
events[n].data.u64 = sock | ((uint64_t)TCP_SOCKET_UNCONFIRMED << 32) | ((uint64_t)index_new << 48); events[n].data.u64 = sock | ((uint64_t)TCP_SOCKET_UNCONFIRMED << 32) | ((uint64_t)index_new << 48);
if (epoll_ctl(TCP_server->efd, EPOLL_CTL_MOD, sock, &events[n]) == -1) { if (epoll_ctl(TCP_server->efd, EPOLL_CTL_MOD, sock, &events[n]) == -1) {
@ -1271,7 +1271,7 @@ static void do_TCP_epoll(TCP_Server *TCP_server)
int index_new; int index_new;
if ((index_new = do_unconfirmed(TCP_server, index)) != -1) { if ((index_new = do_unconfirmed(TCP_server, index)) != -1) {
events[n].events = EPOLLIN | EPOLLET; events[n].events = EPOLLIN | EPOLLET | EPOLLRDHUP;
events[n].data.u64 = sock | ((uint64_t)TCP_SOCKET_CONFIRMED << 32) | ((uint64_t)index_new << 48); events[n].data.u64 = sock | ((uint64_t)TCP_SOCKET_CONFIRMED << 32) | ((uint64_t)index_new << 48);
if (epoll_ctl(TCP_server->efd, EPOLL_CTL_MOD, sock, &events[n]) == -1) { if (epoll_ctl(TCP_server->efd, EPOLL_CTL_MOD, sock, &events[n]) == -1) {