Use var_Inherit* instead of var_CreateGet*.

[vlc] / src / network / io.c

diff --git a/src/network/io.c b/src/network/io.c
index 69b1e0bedd23180bf9a324438cab73a665a262c0..2defe3188b5e3193328b0bc36019c3d21ab88ebb 100644 (file)
--- a/src/network/io.c
+++ b/src/network/io.c
@@ -52,7 +52,6 @@
 #endif
 
 #include <vlc_network.h>
-#include <vlc_fs.h>
 
 #ifndef INADDR_ANY
 #   define INADDR_ANY  0x00000000
@@ -77,20 +76,6 @@
 extern int rootwrap_bind (int family, int socktype, int protocol,
                           const struct sockaddr *addr, size_t alen);
 
-int net_SetupSocket (int fd)
-{
-#if defined (WIN32) || defined (UNDER_CE)
-    ioctlsocket (fd, FIONBIO, &(unsigned long){ 1 });
-#else
-    fcntl (fd, F_SETFD, FD_CLOEXEC);
-    fcntl (fd, F_SETFL, fcntl (fd, F_GETFL, 0) | O_NONBLOCK);
-#endif
-
-    setsockopt (fd, SOL_SOCKET, SO_REUSEADDR, &(int){ 1 }, sizeof (int));
-    return 0;
-}
-
-
 int net_Socket (vlc_object_t *p_this, int family, int socktype,
                 int protocol)
 {
@@ -142,11 +127,12 @@ int net_Socket (vlc_object_t *p_this, int family, int socktype,
 
 
 int *net_Listen (vlc_object_t *p_this, const char *psz_host,
-                 int i_port, int protocol)
+                 int i_port, int type, int protocol)
 {
     struct addrinfo hints, *res;
 
     memset (&hints, 0, sizeof( hints ));
+    hints.ai_socktype = type;
     hints.ai_protocol = protocol;
     hints.ai_flags = AI_PASSIVE;
 
@@ -156,7 +142,7 @@ int *net_Listen (vlc_object_t *p_this, const char *psz_host,
     if (i_val)
     {
         msg_Err (p_this, "Cannot resolve %s port %d : %s", psz_host, i_port,
-                 vlc_gai_strerror (i_val));
+                 gai_strerror (i_val));
         return NULL;
     }
 
@@ -250,7 +236,7 @@ int *net_Listen (vlc_object_t *p_this, const char *psz_host,
             net_Close (fd);
     }
 
-    vlc_freeaddrinfo (res);
+    freeaddrinfo (res);
 
     if (sockv != NULL)
         sockv[sockc] = -1;
@@ -343,6 +329,7 @@ net_Read (vlc_object_t *restrict p_this, int fd, const v_socket_t *vs,
             switch (WSAGetLastError ())
             {
                 case WSAEWOULDBLOCK:
+                case WSAEINTR:
                 /* only happens with vs != NULL (TLS) - not really an error */
                     continue;