* modules/access_filter/timeshift.c: a whole bunch of timeshift improvements.

[vlc] / include / vlc_network.h

diff --git a/include/vlc_network.h b/include/vlc_network.h
index f2743934f8a652b697218ec7c7058df5f8f06374..3b7f248075b8d4ec243d5c16fbb27650c38aa878 100644 (file)
--- a/include/vlc_network.h
+++ b/include/vlc_network.h
@@ -46,6 +46,9 @@
 #   define ENETUNREACH WSAENETUNREACH
 #   define net_errno (WSAGetLastError())
 extern const char *net_strerror( int val );
+#   ifndef IPV6_V6ONLY
+#       define IPV6_V6ONLY 27
+#   endif
 #else
 #   if HAVE_SYS_SOCKET_H
 #      include <sys/socket.h>
@@ -75,7 +78,6 @@ int net_SetupSocket (int fd);
 VLC_EXPORT( int, __net_Connect, (vlc_object_t *p_this, const char *psz_host, int i_port, int socktype, int protocol) );
 
 VLC_EXPORT( int *, net_Listen, (vlc_object_t *p_this, const char *psz_host, int i_port, int family, int socktype, int protocol) );
-VLC_EXPORT( int, net_ListenSingle, (vlc_object_t *p_this, const char *psz_host, int i_port, int family, int socktype, int protocol) );
 
 #define net_ListenTCP(a, b, c) __net_ListenTCP(VLC_OBJECT(a), b, c)
 #define net_ConnectTCP(a, b, c) __net_ConnectTCP(VLC_OBJECT(a), b, c)
@@ -101,15 +103,14 @@ static inline int net_ConnectUDP (vlc_object_t *obj, const char *host, int port,
     return net_ConnectDgram (obj, host, port, hlim, IPPROTO_UDP);
 }
 
+#define net_OpenDgram( a, b, c, d, e, g, h ) __net_OpenDgram(VLC_OBJECT(a), b, c, d, e, g, h)
+VLC_EXPORT( int, __net_OpenDgram, ( vlc_object_t *p_this, const char *psz_bind, int i_bind, const char *psz_server, int i_server, int family, int proto ) );
+
 static inline int net_ListenUDP1 (vlc_object_t *obj, const char *host, int port)
 {
-    return net_ListenSingle (obj, host, port, AF_UNSPEC, SOCK_DGRAM, 0);
+    return net_OpenDgram (obj, host, port, NULL, 0, 0, IPPROTO_UDP);
 }
 
-#define net_OpenDgram( a, b, c, d, e, g, h ) __net_OpenDgram(VLC_OBJECT(a), b, c, d, e, g, h)
-VLC_EXPORT( int, __net_OpenDgram, ( vlc_object_t *p_this, const char *psz_bind, int i_bind, const char *psz_server, int i_server, int family, int proto ) );
-
-VLC_EXPORT( void, net_Close, ( int fd ) );
 VLC_EXPORT( void, net_ListenClose, ( int *fd ) );
 
 VLC_EXPORT( int, net_SetDSCP, ( int fd, uint8_t dscp ) );
@@ -176,32 +177,17 @@ struct pollfd
 int poll (struct pollfd *fds, unsigned nfds, int timeout);
 #endif
 
-
-/*****************************************************************************
- * net_StopRecv/Send
- *****************************************************************************
- * Wrappers for shutdown()
- *****************************************************************************/
-#if defined (SHUT_WR)
-/* the standard way */
-# define net_StopSend( fd ) (void)shutdown( fd, SHUT_WR )
-# define net_StopRecv( fd ) (void)shutdown( fd, SHUT_RD )
-#elif defined (SD_SEND)
-/* the Microsoft seemingly-purposedly-different-for-the-sake-of-it way */
-# define net_StopSend( fd ) (void)shutdown( fd, SD_SEND )
-# define net_StopRecv( fd ) (void)shutdown( fd, SD_RECEIVE )
-#else
-# ifndef SYS_BEOS /* R5 just doesn't have a working shutdown() */
-#  warning FIXME: implement shutdown on your platform!
-# endif
-# define net_StopSend( fd ) (void)0
-# define net_StopRecv( fd ) (void)0
-#endif
-
 #ifdef WIN32
+/* Microsoft: same semantic, same value, different name... go figure */
+# define SHUT_RD SD_RECEIVE
+# define SHUT_WR SD_SEND
+# define SHUT_RDWR SD_BOTH
 # define net_Close( fd ) closesocket ((SOCKET)fd)
 #else
-# define net_Close( fd ) close (fd)
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+# define net_Close( fd ) (void)close (fd)
 #endif
 
 /* Portable network names/addresses resolution layer */
@@ -237,8 +223,11 @@ int poll (struct pollfd *fds, unsigned nfds, int timeout);
 # ifndef EAI_MEMORY
 #  define EAI_MEMORY -10
 # endif
+#ifndef EAI_OVERFLOW
+#  define EAI_OVERFLOW -11
+#endif
 # ifndef EAI_SYSTEM
-#  define EAI_SYSTEM -11
+#  define EAI_SYSTEM -12
 # endif
 
 
@@ -287,7 +276,7 @@ net_SockAddrIsMulticast (const struct sockaddr *addr, socklen_t len)
 #ifdef IN_MULTICAST
         case AF_INET:
         {
-            struct sockaddr_in *v4 = (struct sockaddr_in *)addr;
+            const struct sockaddr_in *v4 = (const struct sockaddr_in *)addr;
             if ((size_t)len < sizeof (*v4))
                 return VLC_FALSE;
             return IN_MULTICAST (ntohl (v4->sin_addr.s_addr)) != 0;
@@ -297,7 +286,7 @@ net_SockAddrIsMulticast (const struct sockaddr *addr, socklen_t len)
 #ifdef IN6_IS_ADDR_MULTICAST
         case AF_INET6:
         {
-            struct sockaddr_in6 *v6 = (struct sockaddr_in6 *)addr;
+            const struct sockaddr_in6 *v6 = (const struct sockaddr_in6 *)addr;
             if ((size_t)len < sizeof (*v6))
                 return VLC_FALSE;
             return IN6_IS_ADDR_MULTICAST (&v6->sin6_addr) != 0;