Remove useless <fcntl.h> inclusions

[vlc] / src / network / tcp.c

diff --git a/src/network/tcp.c b/src/network/tcp.c
index 04ce2a4144283ea72aa4d85733dd10e7cc73d647..cd5fa021a5a56bc04c071800f6f1dc3e4317ab00 100644 (file)
--- a/src/network/tcp.c
+++ b/src/network/tcp.c
@@ -35,12 +35,6 @@
 #include <errno.h>
 #include <assert.h>
 
-#ifdef HAVE_FCNTL_H
-#   include <fcntl.h>
-#endif
-#ifdef HAVE_SYS_TIME_H
-#    include <sys/time.h>
-#endif
 #ifdef HAVE_UNISTD_H
 #   include <unistd.h>
 #endif
@@ -153,8 +147,9 @@ int __net_Connect( vlc_object_t *p_this, const char *psz_host, int i_port,
 
     for( ptr = res; ptr != NULL; ptr = ptr->ai_next )
     {
-        int fd = net_Socket( p_this, ptr->ai_family, type ?: ptr->ai_socktype,
-                             proto ?: ptr->ai_protocol );
+        int fd = net_Socket( p_this, ptr->ai_family,
+                             type ? type : ptr->ai_socktype,
+                             proto ? proto : ptr->ai_protocol );
         if( fd == -1 )
         {
             msg_Dbg( p_this, "socket error: %m" );
@@ -254,8 +249,15 @@ next_ai: /* failure */
 int net_AcceptSingle (vlc_object_t *obj, int lfd)
 {
     int fd;
+
     do
+    {
+#ifdef HAVE_ACCEPT4
+        fd = accept4 (lfd, NULL, NULL, SOCK_CLOEXEC);
+        if (fd == -1 && errno == ENOSYS)
+#endif
         fd = accept (lfd, NULL, NULL);
+    }
     while (fd == -1 && errno == EINTR);
 
     if (fd == -1)
@@ -271,49 +273,46 @@ int net_AcceptSingle (vlc_object_t *obj, int lfd)
 }
 
 
-/*****************************************************************************
- * __net_Accept:
- *****************************************************************************
- * Accept a connection on a set of listening sockets and return it
- *****************************************************************************/
-int __net_Accept( vlc_object_t *p_this, int *pi_fd, mtime_t i_wait )
+#undef net_Accept
+/**
+ * Accepts an new connection on a set of listening sockets.
+ * If there are no pending connections, this function will wait.
+ * @note If the thread needs to handle events other than incoming connections,
+ * you need to use poll() and net_AcceptSingle() instead.
+ *
+ * @param p_this VLC object for logging and object kill signal
+ * @param pi_fd listening socket set
+ * @return -1 on error (may be transient error due to network issues),
+ * a new socket descriptor on success.
+ */
+int net_Accept (vlc_object_t *p_this, int *pi_fd)
 {
-    int timeout = (i_wait < 0) ? -1 : i_wait / 1000;
     int evfd = vlc_object_waitpipe (p_this);
 
-    assert( pi_fd != NULL );
+    assert (pi_fd != NULL);
 
-    for (;;)
-    {
-        unsigned n = 0;
-        while (pi_fd[n] != -1)
-            n++;
-        struct pollfd ufd[n + 1];
+    unsigned n = 0;
+    while (pi_fd[n] != -1)
+        n++;
+    struct pollfd ufd[n + 1];
 
-        /* Initialize file descriptor set */
-        for (unsigned i = 0; i <= n; i++)
-        {
-            ufd[i].fd = (i < n) ? pi_fd[i] : evfd;
-            ufd[i].events = POLLIN;
-            ufd[i].revents = 0;
-        }
+    /* Initialize file descriptor set */
+    for (unsigned i = 0; i <= n; i++)
+    {
+        ufd[i].fd = (i < n) ? pi_fd[i] : evfd;
+        ufd[i].events = POLLIN;
+    }
+    ufd[n].revents = 0;
 
-        switch (poll (ufd, n + (evfd != -1), timeout))
+    for (;;)
+    {
+        while (poll (ufd, n + (evfd != -1), -1) == -1)
         {
-            case -1:
-                if (net_errno == EINTR)
-                    continue;
+            if (net_errno != EINTR)
+            {
                 msg_Err (p_this, "poll error: %m");
                 return -1;
-            case 0:
-                errno = ETIMEDOUT;
-                return -1;
-        }
-
-        if (ufd[n].revents)
-        {
-            errno = EINTR;
-            break;
+            }
         }
 
         for (unsigned i = 0; i < n; i++)
@@ -334,6 +333,12 @@ int __net_Accept( vlc_object_t *p_this, int *pi_fd, mtime_t i_wait )
             pi_fd[n - 1] = sfd;
             return fd;
         }
+
+        if (ufd[n].revents)
+        {
+            errno = EINTR;
+            break;
+        }
     }
     return -1;
 }
@@ -421,7 +426,7 @@ static int SocksNegotiate( vlc_object_t *p_obj,
             msg_Err( p_obj, "socks: unsupported authentication method %x",
                      buffer[0] );
         else
-            msg_Err( p_obj, "socks: authentification needed" );
+            msg_Err( p_obj, "socks: authentication needed" );
         return VLC_EGENERIC;
     }
 
@@ -511,7 +516,7 @@ static int SocksHandshakeTCP( vlc_object_t *p_obj,
 
         if( buffer[1] != 0x00 )
         {
-            msg_Err( p_obj, "socks: CONNECT request failed\n" );
+            msg_Err( p_obj, "socks: CONNECT request failed" );
             return VLC_EGENERIC;
         }