Removes trailing spaces. Removes tabs.

[vlc] / src / network / io.c

diff --git a/src/network/io.c b/src/network/io.c
index c6f5d2e24e485dfe9ab8270b3a43dce91297466c..e83f985dafb53ff9f0c021d9f5c01e72d1d25bd1 100644 (file)
--- a/src/network/io.c
+++ b/src/network/io.c
@@ -97,12 +97,8 @@ int net_Socket (vlc_object_t *p_this, int family, int socktype,
 
 #ifdef IPV6_V6ONLY
     /*
-     * Accepts only IPv6 connections on IPv6 sockets
-     * (and open an IPv4 socket later as well if needed).
-     * Only Linux and FreeBSD can map IPv4 connections on IPv6 sockets,
-     * so this allows for more uniform handling across platforms. Besides,
-     * it makes sure that IPv4 addresses will be printed as w.x.y.z rather
-     * than ::ffff:w.x.y.z
+     * Accepts only IPv6 connections on IPv6 sockets.
+     * If possible, we should open two sockets, but it is not always possible.
      */
     if (family == AF_INET6)
         setsockopt (fd, IPPROTO_IPV6, IPV6_V6ONLY, &(int){ 1 }, sizeof (int));
@@ -215,6 +211,9 @@ int *net_Listen (vlc_object_t *p_this, const char *psz_host,
             case SOCK_STREAM:
             case SOCK_RDM:
             case SOCK_SEQPACKET:
+#ifdef SOCK_DCCP
+            case SOCK_DCCP:
+#endif
                 if (listen (fd, INT_MAX))
                 {
                     msg_Err (p_this, "socket listen error (%s)",
@@ -243,28 +242,6 @@ int *net_Listen (vlc_object_t *p_this, const char *psz_host,
 }
 
 
-int net_ListenSingle (vlc_object_t *obj, const char *host, int port,
-                      int family, int socktype, int protocol)
-{
-    int *fdv = net_Listen (obj, host, port, family, socktype, protocol);
-    if (fdv == NULL)
-        return -1;
-
-    for (unsigned i = 1; fdv[i] != -1; i++)
-    {
-        msg_Warn (obj, "Multiple sockets opened. Dropping extra ones!");
-        net_Close (fdv[i]);
-    }
-
-    int fd = fdv[0];
-    assert (fd != -1);
-
-    free (fdv);
-    return fd;
-}
-
-
-
 static ssize_t
 net_ReadInner (vlc_object_t *restrict p_this, unsigned fdc, const int *fdv,
                const v_socket_t *const *restrict vsv,
@@ -274,10 +251,10 @@ net_ReadInner (vlc_object_t *restrict p_this, unsigned fdc, const int *fdv,
 
     while (i_buflen > 0)
     {
-        if (p_this->b_die)
+        if( ( p_this->b_die ) || ( p_this->p_libvlc->b_die ) )
         {
 #if defined(WIN32) || defined(UNDER_CE)
-            WSASetLastError(WSAEINTR);
+            WSASetLastError (WSAEINTR);
 #else
             errno = EINTR;
 #endif
@@ -293,7 +270,7 @@ net_ReadInner (vlc_object_t *restrict p_this, unsigned fdc, const int *fdv,
             ufd[i].revents = 0;
         }
 
-        switch (poll (ufd, fdc, dontwait ? 0 : 500))
+        switch (poll (ufd, fdc, 500))
         {
             case -1:
                 goto error;
@@ -309,21 +286,25 @@ net_ReadInner (vlc_object_t *restrict p_this, unsigned fdc, const int *fdv,
             if (ufd[i].revents == 0)
                 continue;
 
+#ifndef POLLRDHUP /* This is nice but non-portable */
+# define POLLRDHUP 0
+#endif
             if (i_total > 0)
             {
                 // Errors (-1) and EOF (0) will be returned on next run
-                if (ufd[i].revents & (POLLERR|POLLNVAL|POLLHUP))
+                if (ufd[i].revents & (POLLERR|POLLNVAL|POLLRDHUP))
                     return i_total;
             }
             else
             {
-                if (ufd[i].revents & POLLHUP)
+                if (ufd[i].revents & POLLRDHUP)
                     return 0; // EOF, read() would yield 0
             }
 
             fdc = 1;
             fdv += i;
             vsv += i;
+
             break;
         }
 
@@ -334,13 +315,17 @@ net_ReadInner (vlc_object_t *restrict p_this, unsigned fdc, const int *fdv,
         }
         else
         {
+#ifdef WIN32
             n = recv (*fdv, p_buf, i_buflen, 0);
+#else
+            n = read (*fdv, p_buf, i_buflen);
+#endif
         }
 
         if (n == -1)
         {
 #if defined(WIN32) || defined(UNDER_CE)
-            switch (WSAGetLastError())
+            switch (WSAGetLastError ())
             {
                 case WSAEWOULDBLOCK:
                 /* only happens with vs != NULL (SSL) - not really an error */
@@ -443,13 +428,13 @@ ssize_t __net_Write( vlc_object_t *p_this, int fd, const v_socket_t *p_vs,
                 continue;
         }
 
-        if ((ufd[0].revents & POLLERR) && (i_total > 0))
+        if ((ufd[0].revents & (POLLERR|POLLNVAL|POLLHUP)) && (i_total > 0))
             return i_total; // error will be dequeued separately on next call
 
         if (p_vs != NULL)
             val = p_vs->pf_send (p_vs->p_sys, p_data, i_data);
         else
-#if defined(WIN32) || defined(UNDER_CE)
+#ifdef WIN32
             val = send (fd, p_data, i_data, 0);
 #else
             val = write (fd, p_data, i_data);
@@ -460,8 +445,6 @@ ssize_t __net_Write( vlc_object_t *p_this, int fd, const v_socket_t *p_vs,
             msg_Err (p_this, "Write error: %s", net_strerror (net_errno));
             break;
         }
-        if (val == 0)
-            return i_total;
 
         p_data += val;
         i_data -= val;
@@ -622,8 +605,8 @@ const char *inet_ntop(int af, const void * src,
                 memset(&addr, 0, sizeof(addr));
                 addr.sin6_family = AF_INET6;
                 addr.sin6_addr = *((struct in6_addr*)src);
-                if( 0 == WSAAddressToStringA((LPSOCKADDR)&addr, 
-                                             sizeof(struct sockaddr_in6), 
+                if( 0 == WSAAddressToStringA((LPSOCKADDR)&addr,
+                                             sizeof(struct sockaddr_in6),
                                              NULL, dst, &cnt) )
                 {
                     dst[cnt] = '\0';