monoid/HW12
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Wiki Activity

fix poll

Browse source
This commit is contained in:
ubuntu201711081 2020-12-04 10:10:48 +00:00
parent 226a0fbdc6
commit aaeba28fb8
1 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
socket_wrapper.c
View file

@ -24,7 +24,7 @@ int getBufferSizeFrom(int sock){
ssize_t timeout_recv(int fd,void * buf,size_t n,int timeout) ssize_t timeout_recv(int fd,void * buf,size_t n,int timeout)
{ {
ssize_t ret; ssize_t ret = 0;
int poll_ret; int poll_ret;
struct pollfd fd_single; struct pollfd fd_single;
fd_single.fd = fd; fd_single.fd = fd;
@ -32,19 +32,15 @@ ssize_t timeout_recv(int fd,void * buf,size_t n,int timeout)
poll_ret = (poll(&fd_single,1,timeout * 1000)); poll_ret = (poll(&fd_single,1,timeout * 1000));
if (poll_ret < 0) return -1; if (poll_ret < 0) return -1;
else if(poll_ret == 0) return -2; else if(poll_ret == 0) return -2;
switch (fd_single.revents){ if (fd_single.revents & POLLHUP) //We'll treat hangups state like timeouts state.
case POLLHUP: //We'll treat hangups state like timeouts state.
return -2; return -2;
case POLLERR: if ((fd_single.revents & POLLERR) || (fd_single.revents & POLLNVAL))
case POLLNVAL:
return -1; return -1;
case POLL_IN: if (fd_single.revents & POLL_IN)
ret = recv(fd,buf,n,0); ret = recv(fd,buf,n,0);
assert(ret != 0); assert(ret != 0);
return ret; return ret;
default:
assert(0 && "unreachable");
}
assert(0 && "unreachable"); assert(0 && "unreachable");
} }