nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-24 20:33:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

patch to let poll() recognize eof on more architectures

Browse Source 
svn:r372
This commit is contained in:
Roger Dingledine 2003-08-06 18:38:46 +00:00
parent ac5893c626
commit 60d52a7e08
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/or/main.c
View File

@ -274,7 +274,8 @@ static void conn_read(int i) {
connection_free(conn); connection_free(conn);
if(i<nfds) { /* we just replaced the one at i with a new one. if(i<nfds) { /* we just replaced the one at i with a new one.
process it too. */ process it too. */
if(poll_array[i].revents & POLLIN) /* something to read */ if(poll_array[i].revents & POLLIN ||
poll_array[i].revents & POLLHUP ) /* something to read */
conn_read(i); conn_read(i);
} }
} }
@ -552,8 +553,11 @@ static int do_main_loop(void) {
if(poll_result > 0) { /* we have at least one connection to deal with */ if(poll_result > 0) { /* we have at least one connection to deal with */
/* do all the reads first, so we can detect closed sockets */ /* do all the reads first, so we can detect closed sockets */
for(i=0;i<nfds;i++) for(i=0;i<nfds;i++)
if(poll_array[i].revents & POLLIN) /* something to read */ if(poll_array[i].revents & POLLIN ||
poll_array[i].revents & POLLHUP ) /* something to read */
conn_read(i); /* this also blows away broken connections */ conn_read(i); /* this also blows away broken connections */
/* see http://www.greenend.org.uk/rjk/2001/06/poll.html for discussion
* of POLLIN vs POLLHUP */
/* then do the writes */ /* then do the writes */
for(i=0;i<nfds;i++) for(i=0;i<nfds;i++)