Changeset cc227c7270cfc3ba47f988df3cdaf232a41a8f34

Timestamp:

01/21/08 18:12:41 (8 months ago)

Author:

Rémi Denis-Courmont <rem@videolan.org>

git-committer:

Rémi Denis-Courmont <rem@videolan.org> 1200935561 +0000

git-parent:

[370f789fed007cb60ba145ff7af76417f2eaeee2]

git-author:

Rémi Denis-Courmont <rem@videolan.org> 1200935561 +0000

Message:

Set non-blocking mode on accepted sockets

Files:

• include/vlc_network.h (modified) (1 diff)
• modules/control/telnet.c (modified) (1 diff)
• src/network/httpd.c (modified) (2 diffs)
• src/network/tcp.c (modified) (3 diffs)

include/vlc_network.h

@@ -87 +87 @@
-}
-
+
+VLC_EXPORT( int, net_AcceptSingle, (vlc_object_t *obj, int lfd) );
+
-#define net_Accept(a, b, c) __net_Accept(VLC_OBJECT(a), b, c)
-VLC_EXPORT( int, __net_Accept, ( vlc_object_t *, int *, mtime_t ) );

modules/control/telnet.c

@@ -491 +491 @@
-                continue;
-
-accept (ufd[ncli + i].fd, NULL, NULL
+net_AcceptSingle (VLC_OBJECT(p_intf), ufd[ncli + i].fd
-            if (fd == -1)
-                continue;

src/network/httpd.c

@@ -2510 +2510 @@
-            httpd_client_t *cl;
-            int i_state = -1;
-
-
+
+
+
-
-            if( ufd[nfd].revents == 0 )
@@ -2517 +2518 @@
-
-            /* */
-int fd = accept (ufd[nfd].
+fd = accept (
-            if (fd == -1)
-                continue;
-
+            net_SetupSocket (fd);
-            if( p_tls != NULL )
-            {

src/network/tcp.c

@@ -259 +259 @@
-
-
+int net_AcceptSingle (vlc_object_t *obj, int lfd)
+{
+    int fd = accept (lfd, NULL, NULL);
+    if (fd == -1)
+    {
+        if (net_errno != EAGAIN)
+            msg_Err (obj, "accept failed (from socket %d): %m", lfd);
+        return -1;
+    }
+
+    msg_Dbg (obj, "accepted socket %d (from socket %d)", fd, lfd);
+    net_SetupSocket (fd);
+    return 0;
+}
+
+
-/*****************************************************************************
- * __net_Accept:
@@ -313 +329 @@
-
-            int sfd = ufd[i].fd;
-accept (sfd, NULL, NULL
+net_AcceptSingle (p_this, sfd
-            if (fd == -1)
-            {
-                msg_Err (p_this, "accept failed (%m)");
-                continue;
-            }
-            net_SetupSocket (fd);
-
-            /*
@@ -328 +340 @@
-            pi_fd[n - 1] = sfd;
-            vlc_object_unlock (p_this);
-            msg_Dbg (p_this, "accepted socket %d (from socket %d)", fd, sfd);
-            return fd;
-        }