ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

server: Propagate error from recv.

This commit is contained in:
Mike Kaplinskiy 2010-07-17 22:06:53 -04:00 committed by Alexandre Julliard
parent 75c7c63886
commit 394a142237
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
server/sock.c
View File

@ -419,16 +419,17 @@ static void sock_poll_event( struct fd *fd, int event )
call and the invocation of this routine */ call and the invocation of this routine */
if ( errno != EAGAIN ) if ( errno != EAGAIN )
{ {
error = errno;
event |= POLLERR;
if ( debug_level ) if ( debug_level )
fprintf( stderr, "recv error on socket %p: %d\n", sock, errno ); fprintf( stderr, "recv error on socket %p: %d\n", sock, errno );
event |= POLLERR;
} }
} }
} }
if ( (hangup_seen || event & (POLLHUP|POLLERR)) && (sock->state & (FD_READ|FD_WRITE)) ) if ( (hangup_seen || event & (POLLHUP|POLLERR)) && (sock->state & (FD_READ|FD_WRITE)) )
{ {
error = sock_error( fd ); error = error ? error : sock_error( fd );
if ( (event & POLLERR) || ( sock_shutdown_type == SOCK_SHUTDOWN_EOF && (event & POLLHUP) )) if ( (event & POLLERR) || ( sock_shutdown_type == SOCK_SHUTDOWN_EOF && (event & POLLHUP) ))
sock->state &= ~FD_WRITE; sock->state &= ~FD_WRITE;
sock->state &= ~FD_READ; sock->state &= ~FD_READ;