Remove the sys/socket.h check. We don't really use it anyway, and socket calls have...

[vlc] / include / vlc_network.h

diff --git a/include/vlc_network.h b/include/vlc_network.h
index 3b7f248075b8d4ec243d5c16fbb27650c38aa878..5e09fb298416292ce71796ff73468db956c1e8db 100644 (file)
--- a/include/vlc_network.h
+++ b/include/vlc_network.h
@@ -32,12 +32,7 @@
 # define __VLC_NETWORK_H
 
 #if defined( WIN32 )
-#   if defined(UNDER_CE) && defined(sockaddr_storage)
-#       undef sockaddr_storage
-#   endif
-#   if defined(UNDER_CE)
-#       define HAVE_STRUCT_ADDRINFO
-#   else
+#   if !defined(UNDER_CE)
 #       define _NO_OLDNAMES 1
 #       include <io.h>
 #   endif
@@ -50,9 +45,7 @@ extern const char *net_strerror( int val );
 #       define IPV6_V6ONLY 27
 #   endif
 #else
-#   if HAVE_SYS_SOCKET_H
-#      include <sys/socket.h>
-#   endif
+#   include <sys/socket.h>
 #   if HAVE_NETINET_IN_H
 #      include <netinet/in.h>
 #   endif
@@ -63,7 +56,6 @@ extern const char *net_strerror( int val );
 #   endif
 #   include <netdb.h>
 #   define net_errno errno
-#   define net_strerror strerror
 #endif
 
 # ifdef __cplusplus
@@ -77,21 +69,19 @@ 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);
 }
 
+
+VLC_EXPORT( int, net_AcceptSingle, (vlc_object_t *obj, int lfd) );
+
 #define net_Accept(a, b, c) __net_Accept(VLC_OBJECT(a), b, c)
 VLC_EXPORT( int, __net_Accept, ( vlc_object_t *, int *, mtime_t ) );
 
@@ -113,10 +103,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,16 +119,13 @@ 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_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 ) );
 
 #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 +133,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
 
@@ -174,7 +162,7 @@ struct pollfd
     int revents;
 };
 
-int poll (struct pollfd *fds, unsigned nfds, int timeout);
+  VLC_EXPORT (int, poll, (struct pollfd *fds, unsigned nfds, int timeout));
 #endif
 
 #ifdef WIN32
@@ -369,11 +357,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