X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_network.h;h=1c589625a788e07da9c8de3818e7160d7075e9dd;hb=f464bb35e8601535462bfd1bbcd8d2de79d404d7;hp=d330d55b189d7c08cbc4d99d1abf45d4a275e39b;hpb=d9906f4304081ab9145aecc2e7bd3adb708299a4;p=vlc

diff --git a/include/vlc_network.h b/include/vlc_network.h
index d330d55b18..1c589625a7 100644
--- 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>
@@ -69,12 +72,12 @@ extern "C" {
 
 /* Portable networking layer communication */
 int net_Socket (vlc_object_t *obj, int family, int socktype, int proto);
+int net_SetupSocket (int fd);
 
+#define net_Connect(a, b, c, d, e) __net_Connect(VLC_OBJECT(a), b, c, d, e)
 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) );
+VLC_EXPORT( int *, net_Listen, (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)
@@ -100,21 +103,21 @@ 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 ) );
 int net_Subscribe (vlc_object_t *obj, int fd, const struct sockaddr *addr,
                    socklen_t addrlen);
 
+VLC_EXPORT( int, net_SetCSCov, ( int fd, int sendcov, int recvcov ) );
+
 /* Functions to read from or write to the networking layer */
 struct virtual_socket_t
 {
@@ -124,24 +127,21 @@ struct virtual_socket_t
 };
 
 #define net_Read(a,b,c,d,e,f) __net_Read(VLC_OBJECT(a),b,c,d,e,f)
-VLC_EXPORT( int, __net_Read, ( vlc_object_t *p_this, int fd, const v_socket_t *, uint8_t *p_data, int i_data, vlc_bool_t b_retry ) );
+VLC_EXPORT( ssize_t, __net_Read, ( vlc_object_t *p_this, int fd, const v_socket_t *, uint8_t *p_data, size_t i_data, vlc_bool_t b_retry ) );
 
-#define net_ReadNonBlock(a,b,c,d,e,f) __net_ReadNonBlock(VLC_OBJECT(a),b,c,d,e,f)
-VLC_EXPORT( int, __net_ReadNonBlock, ( vlc_object_t *p_this, int fd, const v_socket_t *, uint8_t *p_data, int i_data, mtime_t i_wait ) );
-
-#define net_Select(a,b,c,d,e,f) __net_Select(VLC_OBJECT(a),b,c,d,e,f)
-VLC_EXPORT( int, __net_Select, ( vlc_object_t *p_this, const int *pi_fd, int i_fd, uint8_t *p_data, int i_data, mtime_t i_wait ) );
+#define net_Select(a,b,c,d,e) __net_Select(VLC_OBJECT(a),b,c,d,e)
+VLC_EXPORT( ssize_t, __net_Select, ( vlc_object_t *p_this, const int *pi_fd, int i_fd, uint8_t *p_data, size_t i_data ) );
 
 #define net_Write(a,b,c,d,e) __net_Write(VLC_OBJECT(a),b,c,d,e)
-VLC_EXPORT( int, __net_Write, ( vlc_object_t *p_this, int fd, const v_socket_t *, const uint8_t *p_data, int i_data ) );
+VLC_EXPORT( ssize_t, __net_Write, ( vlc_object_t *p_this, int fd, const v_socket_t *, const uint8_t *p_data, size_t i_data ) );
 
 #define net_Gets(a,b,c) __net_Gets(VLC_OBJECT(a),b,c)
 VLC_EXPORT( char *, __net_Gets, ( vlc_object_t *p_this, int fd, const v_socket_t * ) );
 
-VLC_EXPORT( int, net_Printf, ( vlc_object_t *p_this, int fd, const v_socket_t *, const char *psz_fmt, ... ) );
+VLC_EXPORT( ssize_t, net_Printf, ( vlc_object_t *p_this, int fd, const v_socket_t *, const char *psz_fmt, ... ) ATTRIBUTE_FORMAT( 4, 5 ) );
 
 #define net_vaPrintf(a,b,c,d,e) __net_vaPrintf(VLC_OBJECT(a),b,c,d,e)
-VLC_EXPORT( int, __net_vaPrintf, ( vlc_object_t *p_this, int fd, const v_socket_t *, const char *psz_fmt, va_list args ) );
+VLC_EXPORT( ssize_t, __net_vaPrintf, ( vlc_object_t *p_this, int fd, const v_socket_t *, const char *psz_fmt, va_list args ) );
 
 
 #ifndef HAVE_INET_PTON
@@ -149,6 +149,14 @@ VLC_EXPORT( int, __net_vaPrintf, ( vlc_object_t *p_this, int fd, const v_socket_
 VLC_EXPORT (int, inet_pton, (int af, const char *src, void *dst) );
 #endif
 
+#ifndef HAVE_INET_NTOP
+#ifdef WIN32
+/* only in core, so no need for C++ extern "C" */
+VLC_EXPORT (const char *, inet_ntop, (int af, const void *src,
+                                      char *dst, socklen_t cnt) );
+#endif
+#endif
+
 #ifndef HAVE_POLL
 enum
 {
@@ -170,26 +178,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 )
+#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
-# 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
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+# define net_Close( fd ) (void)close (fd)
 #endif
 
 /* Portable network names/addresses resolution layer */
@@ -225,8 +224,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
 
 
@@ -275,7 +277,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;
@@ -285,7 +287,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;
@@ -368,11 +370,11 @@ static inline void net_SetPort (struct sockaddr *addr, uint16_t port)
 #ifdef AF_INET6
         case AF_INET6:
             ((struct sockaddr_in6 *)addr)->sin6_port = port;
-	    break;
+        break;
 #endif
         case AF_INET:
             ((struct sockaddr_in *)addr)->sin_port = port;
-	    break;
+        break;
     }
 }
 # ifdef __cplusplus