X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_network.h;h=aca2b0a70498e9c721bae34ac3660a30e935d008;hb=75a1834d394b6a89a6ead139d57c097704d3943a;hp=3b7f248075b8d4ec243d5c16fbb27650c38aa878;hpb=e3578584a02cd72dedf1e63b76efb8309bf621c7;p=vlc diff --git a/include/vlc_network.h b/include/vlc_network.h index 3b7f248075..aca2b0a704 100644 --- a/include/vlc_network.h +++ b/include/vlc_network.h @@ -24,20 +24,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -#if !defined( __LIBVLC__ ) - #error You are not libvlc or one of its plugins. You cannot include this file -#endif - #ifndef __VLC_NETWORK_H # 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 # endif @@ -46,26 +37,47 @@ # define ENETUNREACH WSAENETUNREACH # define net_errno (WSAGetLastError()) extern const char *net_strerror( int val ); + +struct iovec +{ + void *iov_base; + size_t iov_len; +}; + +struct msghdr +{ + void *msg_name; + size_t msg_namelen; + struct iovec *msg_iov; + size_t msg_iovlen; + void *msg_control; + size_t msg_controllen; + int msg_flags; +}; + +#define sendmsg vlc_sendmsg +#define recvmsg vlc_recvmsg + # ifndef IPV6_V6ONLY # define IPV6_V6ONLY 27 # endif #else -# if HAVE_SYS_SOCKET_H -# include -# endif -# if HAVE_NETINET_IN_H +# include +# ifdef HAVE_NETINET_IN_H # include # endif -# if HAVE_ARPA_INET_H +# ifdef HAVE_ARPA_INET_H # include # elif defined( SYS_BEOS ) # include # endif # include # define net_errno errno -# define net_strerror strerror #endif +VLC_EXPORT( ssize_t, vlc_sendmsg, ( int, struct msghdr *, int ) ); +VLC_EXPORT( ssize_t, vlc_recvmsg, ( int, struct msghdr *, int ) ); + # ifdef __cplusplus extern "C" { # endif @@ -77,21 +89,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 +123,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 { @@ -126,10 +137,7 @@ 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 ) ); +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, bool b_retry ) ); #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,25 +145,24 @@ 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, ... ) LIBVLC_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 ) ); +/* Don't go to an extra call layer if we have the symbol */ #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) ); +#define inet_pton vlc_inet_pton #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 +#define inet_ntop vlc_inet_ntop #endif +VLC_EXPORT (int, vlc_inet_pton, (int af, const char *src, void *dst) ); +VLC_EXPORT (const char *, vlc_inet_ntop, (int af, const void *src, + char *dst, socklen_t cnt) ); + #ifndef HAVE_POLL enum { @@ -174,7 +181,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 @@ -262,13 +269,17 @@ struct addrinfo # define AI_NUMERICHOST 4 # endif /* if !HAVE_STRUCT_ADDRINFO */ +#ifndef AI_NUMERICSERV +# define AI_NUMERICSERV 0 +#endif + VLC_EXPORT( const char *, vlc_gai_strerror, ( int ) ); VLC_EXPORT( int, vlc_getnameinfo, ( const struct sockaddr *, int, char *, int, int *, int ) ); VLC_EXPORT( int, vlc_getaddrinfo, ( vlc_object_t *, const char *, int, const struct addrinfo *, struct addrinfo ** ) ); VLC_EXPORT( void, vlc_freeaddrinfo, ( struct addrinfo * ) ); -static inline vlc_bool_t +static inline bool net_SockAddrIsMulticast (const struct sockaddr *addr, socklen_t len) { switch (addr->sa_family) @@ -278,7 +289,7 @@ net_SockAddrIsMulticast (const struct sockaddr *addr, socklen_t len) { const struct sockaddr_in *v4 = (const struct sockaddr_in *)addr; if ((size_t)len < sizeof (*v4)) - return VLC_FALSE; + return false; return IN_MULTICAST (ntohl (v4->sin_addr.s_addr)) != 0; } #endif @@ -288,44 +299,16 @@ net_SockAddrIsMulticast (const struct sockaddr *addr, socklen_t len) { const struct sockaddr_in6 *v6 = (const struct sockaddr_in6 *)addr; if ((size_t)len < sizeof (*v6)) - return VLC_FALSE; + return false; return IN6_IS_ADDR_MULTICAST (&v6->sin6_addr) != 0; } #endif } - return VLC_FALSE; + return false; } - -/** - * net_AddressIsMulticast - * @return VLC_FALSE iff the psz_addr does not specify a multicast address, - * or the address is not a valid address. - */ -static inline vlc_bool_t net_AddressIsMulticast( vlc_object_t *p_object, const char *psz_addr ) -{ - struct addrinfo hints, *res; - - memset (&hints, 0, sizeof (hints)); - hints.ai_socktype = SOCK_DGRAM; /* UDP */ - hints.ai_flags = AI_NUMERICHOST; - - int i = vlc_getaddrinfo (p_object, psz_addr, 0, - &hints, &res); - if (i) - { - msg_Err (p_object, "invalid address \"%s\" for net_AddressIsMulticast (%s)", - psz_addr, vlc_gai_strerror (i)); - return VLC_FALSE; - } - - vlc_bool_t b = net_SockAddrIsMulticast (res->ai_addr, res->ai_addrlen); - vlc_freeaddrinfo (res); - return b; -} - static inline int net_GetSockAddress( int fd, char *address, int *port ) { struct sockaddr_storage addr; @@ -369,11 +352,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