aniani/icecast-server
0
0
Fork 0
mirror of https://gitlab.xiph.org/xiph/icecast-server.git synced 2025-06-30 22:18:19 -04:00
Code

Use poll if available, select can cause stack corruption if descriptor value is over 1024

Browse Source 
svn path=/icecast/trunk/net/; revision=14457
This commit is contained in:
Karl Heyes 2008-02-05 04:21:12 +00:00
parent 3344ff6f09
commit 1cdc68cf1d
1 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/net/sock.c
View File

@ -30,6 +30,9 @@
#include <string.h> #include <string.h>
#include <fcntl.h> #include <fcntl.h>
#include <errno.h> #include <errno.h>
#ifdef HAVE_POLL
#include <poll.h>
#endif
#ifdef HAVE_SYS_SELECT_H #ifdef HAVE_SYS_SELECT_H
#include <sys/select.h> #include <sys/select.h>
#endif #endif
@ -508,6 +511,26 @@ int sock_read_line(sock_t sock, char *buff, const int len)
* return 0 for try again, interrupted * return 0 for try again, interrupted
* return 1 for ok * return 1 for ok
*/ */
#ifdef HAVE_POLL
int sock_connected (sock_t sock, int timeout)
{
struct pollfd check;
check.fd = sock;
check.events = POLLOUT;
switch (poll (&check, 1, timeout*1000))
{
case 0: return SOCK_TIMEOUT;
case -1:
if (sock_recoverable (sock_error()))
return 0;
return SOCK_ERROR;
default: return 1;
}
}
#else
int sock_connected (sock_t sock, int timeout) int sock_connected (sock_t sock, int timeout)
{ {
fd_set wfds; fd_set wfds;
@ -545,6 +568,7 @@ int sock_connected (sock_t sock, int timeout)
return SOCK_ERROR; return SOCK_ERROR;
} }
} }
#endif
#ifdef HAVE_GETADDRINFO #ifdef HAVE_GETADDRINFO