Fix menu removal of accelerators. This has yet to be more FIXMEd (jpeg :D)

[vlc] / src / network / tcp.c

diff --git a/src/network/tcp.c b/src/network/tcp.c
index 2dbaa64487d2617177c809ff9422da131758b08d..e027e277be6106fb2751a1fb344fe8b23bdd8dbc 100644 (file)
--- a/src/network/tcp.c
+++ b/src/network/tcp.c
@@ -30,7 +30,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 
 #include <errno.h>
 #include <assert.h>
@@ -58,7 +58,7 @@
 #   define ETIMEDOUT WSAETIMEDOUT
 #endif
 
-static int SocksNegociate( vlc_object_t *, int fd, int i_socks_version,
+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 fd, int i_socks_version,
@@ -85,10 +85,6 @@ int __net_Connect( vlc_object_t *p_this, const char *psz_host, int i_port,
     if (evfd == -1)
         return -1;
 
-    if( i_port == 0 )
-        i_port = 80; /* historical VLC thing */
-
-
     memset( &hints, 0, sizeof( hints ) );
     hints.ai_socktype = SOCK_STREAM;
 
@@ -165,7 +161,7 @@ int __net_Connect( vlc_object_t *p_this, const char *psz_host, int i_port,
         {
             int timeout, val;
 
-            if( net_errno != EINPROGRESS )
+            if( net_errno != EINPROGRESS && net_errno != EINTR )
             {
                 msg_Err( p_this, "connection failed: %m" );
                 goto next_ai;
@@ -253,7 +249,11 @@ next_ai: /* failure */
 
 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)
@@ -302,10 +302,13 @@ int __net_Accept( vlc_object_t *p_this, int *pi_fd, mtime_t i_wait )
         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)
@@ -338,26 +341,26 @@ int __net_Accept( vlc_object_t *p_this, int *pi_fd, mtime_t i_wait )
 
 
 /*****************************************************************************
- * SocksNegociate:
+ * SocksNegotiate:
  *****************************************************************************
- * Negociate authentication with a SOCKS server.
+ * Negotiate authentication with a SOCKS server.
  *****************************************************************************/
-static int SocksNegociate( vlc_object_t *p_obj,
+static int SocksNegotiate( vlc_object_t *p_obj,
                            int fd, int i_socks_version,
                            const char *psz_socks_user,
                            const char *psz_socks_passwd )
 {
     uint8_t buffer[128+2*256];
     int i_len;
-    vlc_bool_t b_auth = VLC_FALSE;
+    bool b_auth = false;
 
     if( i_socks_version != 5 )
         return VLC_SUCCESS;
 
-    /* We negociate authentication */
+    /* We negotiate authentication */
 
     if( ( psz_socks_user == NULL ) && ( psz_socks_passwd == NULL ) )
-        b_auth = VLC_TRUE;
+        b_auth = true;
 
     buffer[0] = i_socks_version;    /* SOCKS version */
     if( b_auth )
@@ -376,7 +379,7 @@ static int SocksNegociate( vlc_object_t *p_obj,
 
     if( net_Write( p_obj, fd, NULL, buffer, i_len ) != i_len )
         return VLC_EGENERIC;
-    if( net_Read( p_obj, fd, NULL, buffer, 2, VLC_TRUE ) != 2 )
+    if( net_Read( p_obj, fd, NULL, buffer, 2, true ) != 2 )
         return VLC_EGENERIC;
 
     msg_Dbg( p_obj, "socks: v=%d method=%x", buffer[0], buffer[1] );
@@ -403,7 +406,7 @@ static int SocksNegociate( vlc_object_t *p_obj,
         if( net_Write( p_obj, fd, NULL, buffer, i_len ) != i_len )
             return VLC_EGENERIC;
 
-        if( net_Read( p_obj, fd, NULL, buffer, 2, VLC_TRUE ) != 2 )
+        if( net_Read( p_obj, fd, NULL, buffer, 2, true ) != 2 )
             return VLC_EGENERIC;
 
         msg_Dbg( p_obj, "socks: v=%d status=%x", buffer[0], buffer[1] );
@@ -446,7 +449,7 @@ static int SocksHandshakeTCP( vlc_object_t *p_obj,
     }
 
     if( i_socks_version == 5 &&
-        SocksNegociate( p_obj, fd, i_socks_version,
+        SocksNegotiate( p_obj, fd, i_socks_version,
                         psz_user, psz_passwd ) )
         return VLC_EGENERIC;
 
@@ -471,7 +474,7 @@ static int SocksHandshakeTCP( vlc_object_t *p_obj,
 
         if( net_Write( p_obj, fd, NULL, buffer, 9 ) != 9 )
             return VLC_EGENERIC;
-        if( net_Read( p_obj, fd, NULL, buffer, 8, VLC_TRUE ) != 8 )
+        if( net_Read( p_obj, fd, NULL, buffer, 8, true ) != 8 )
             return VLC_EGENERIC;
 
         msg_Dbg( p_obj, "socks: v=%d cd=%d",
@@ -501,7 +504,7 @@ static int SocksHandshakeTCP( vlc_object_t *p_obj,
             return VLC_EGENERIC;
 
         /* Read the header */
-        if( net_Read( p_obj, fd, NULL, buffer, 5, VLC_TRUE ) != 5 )
+        if( net_Read( p_obj, fd, NULL, buffer, 5, true ) != 5 )
             return VLC_EGENERIC;
 
         msg_Dbg( p_obj, "socks: v=%d rep=%d atyp=%d",
@@ -523,7 +526,7 @@ static int SocksHandshakeTCP( vlc_object_t *p_obj,
         else
             return VLC_EGENERIC;
 
-        if( net_Read( p_obj, fd, NULL, buffer, i_len, VLC_TRUE ) != i_len )
+        if( net_Read( p_obj, fd, NULL, buffer, i_len, true ) != i_len )
             return VLC_EGENERIC;
     }