# define ETIMEDOUT WSAETIMEDOUT
#endif
+#include "libvlc.h" /* vlc_object_waitpipe */
+
static int SocksNegotiate( vlc_object_t *, int fd, int i_socks_version,
const char *psz_user, const char *psz_passwd );
static int SocksHandshakeTCP( vlc_object_t *,
int net_AcceptSingle (vlc_object_t *obj, int lfd)
{
- int fd = accept (lfd, NULL, NULL);
+ int fd;
+ do
+ fd = accept (lfd, NULL, NULL);
+ while (fd == -1 && errno == EINTR);
+
if (fd == -1)
{
if (net_errno != EAGAIN)
int timeout = (i_wait < 0) ? -1 : i_wait / 1000;
int evfd = vlc_object_waitpipe (p_this);
- if (evfd == -1)
- return -1;
-
assert( pi_fd != NULL );
for (;;)
switch (poll (ufd, n, timeout))
{
case -1:
- if (net_errno != EINTR)
- msg_Err (p_this, "poll error: %m");
+ if (net_errno == EINTR)
+ continue;
+ msg_Err (p_this, "poll error: %m");
+ return -1;
case 0:
- return -1; /* NOTE: p_this already unlocked */
+ errno = ETIMEDOUT;
+ return -1;
}
if (ufd[n].revents)