X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_network.h;h=c2e83ad229ab96d7f11f79c4aca371baae0e383f;hb=ed9144bac360c3c29d92fe8f6cb8195680fdeb52;hp=9506ef5af46a519225a4f39e6d0bea8f2e112615;hpb=851b8a430e99148da397d24dd8ad75afbf05ea2d;p=vlc

diff --git a/include/vlc_network.h b/include/vlc_network.h
index 9506ef5af4..c2e83ad229 100644
--- a/include/vlc_network.h
+++ b/include/vlc_network.h
@@ -47,7 +47,7 @@
 #   define net_errno (WSAGetLastError())
 extern const char *net_strerror( int val );
 #   ifndef IPV6_V6ONLY
-#       define IPV6_V6ONLY FIXME_FIXME_FIXME
+#       define IPV6_V6ONLY 27
 #   endif
 #else
 #   if HAVE_SYS_SOCKET_H
@@ -63,7 +63,6 @@ extern const char *net_strerror( int val );
 #   endif
 #   include <netdb.h>
 #   define net_errno errno
-#   define net_strerror strerror
 #endif
 
 # ifdef __cplusplus
@@ -77,16 +76,11 @@ 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_Listen, (vlc_object_t *p_this, const char *psz_host, int i_port, int protocol) );
 
-#define net_ListenTCP(a, b, c) __net_ListenTCP(VLC_OBJECT(a), b, c)
+#define net_ListenTCP(a, b, c) net_Listen(VLC_OBJECT(a), b, c, IPPROTO_TCP)
 #define net_ConnectTCP(a, b, c) __net_ConnectTCP(VLC_OBJECT(a), b, c)
 
-static inline int *__net_ListenTCP (vlc_object_t *obj, const char *host, int port)
-{
-    return net_Listen (obj, host, port, AF_UNSPEC, SOCK_STREAM, IPPROTO_TCP);
-}
-
 static inline int __net_ConnectTCP (vlc_object_t *obj, const char *host, int port)
 {
     return __net_Connect (obj, host, port, SOCK_STREAM, IPPROTO_TCP);
@@ -113,10 +107,11 @@ static inline int net_ListenUDP1 (vlc_object_t *obj, const char *host, int port)
 
 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
 {
@@ -128,8 +123,8 @@ 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( 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_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_Select(a,b,c,d,e,f) __net_Select(VLC_OBJECT(a),b,c,d,e,f)
+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, int i_timeout ) );
 
 #define net_Write(a,b,c,d,e) __net_Write(VLC_OBJECT(a),b,c,d,e)
 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 ) );
@@ -137,7 +132,7 @@ VLC_EXPORT( ssize_t, __net_Write, ( vlc_object_t *p_this, int fd, const v_socket
 #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( ssize_t, 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( ssize_t, __net_vaPrintf, ( vlc_object_t *p_this, int fd, const v_socket_t *, const char *psz_fmt, va_list args ) );
@@ -145,14 +140,14 @@ VLC_EXPORT( ssize_t, __net_vaPrintf, ( vlc_object_t *p_this, int fd, const v_soc
 
 #ifndef HAVE_INET_PTON
 /* only in core, so no need for C++ extern "C" */
-VLC_EXPORT (int, inet_pton, (int af, const char *src, void *dst) );
+    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) );
+    VLC_EXPORT (const char *, inet_ntop, (int af, const void *src,
+                                          char *dst, socklen_t cnt) );
 #endif
 #endif
 
@@ -276,7 +271,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;
@@ -286,7 +281,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;
@@ -369,11 +364,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