X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_network.h;h=699e8af039142eefe0523870c8c23130b0c7312a;hb=021b9f2579d69f3ca2b7b8d809836785a3f15515;hp=64fbf89954f48666736cd450cfd0510f1ae37a21;hpb=ff96809b407550ba64b949b24c7c143ab72961ca;p=vlc diff --git a/include/vlc_network.h b/include/vlc_network.h index 64fbf89954..699e8af039 100644 --- a/include/vlc_network.h +++ b/include/vlc_network.h @@ -1,7 +1,7 @@ /***************************************************************************** * vlc_network.h: interface to communicate with network plug-ins ***************************************************************************** - * Copyright (C) 2002-2005 the VideoLAN team + * Copyright (C) 2002-2005 VLC authors and VideoLAN * Copyright © 2006-2007 Rémi Denis-Courmont * $Id$ * @@ -9,19 +9,19 @@ * Laurent Aimar * Rémi Denis-Courmont * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ #ifndef VLC_NETWORK_H @@ -33,13 +33,10 @@ */ #if defined( WIN32 ) -# if !defined(UNDER_CE) -# define _NO_OLDNAMES 1 -# include -# endif +# define _NO_OLDNAMES 1 +# include # include # include -# define ENETUNREACH WSAENETUNREACH # define net_errno (WSAGetLastError()) extern const char *net_strerror( int val ); @@ -64,6 +61,8 @@ struct msghdr # define IPV6_V6ONLY 27 # endif #else +# include +# include # include # include # include @@ -80,7 +79,7 @@ struct msghdr # undef IPV6_JOIN_GROUP #endif -int vlc_socket (int, int, int, bool nonblock) VLC_USED; +VLC_API int vlc_socket (int, int, int, bool nonblock) VLC_USED; struct sockaddr; VLC_API int vlc_accept( int, struct sockaddr *, socklen_t *, bool ) VLC_USED; @@ -158,10 +157,6 @@ VLC_API ssize_t net_Printf( vlc_object_t *p_this, int fd, const v_socket_t *, co VLC_API ssize_t net_vaPrintf( vlc_object_t *p_this, int fd, const v_socket_t *, const char *psz_fmt, va_list args ); #define net_vaPrintf(a,b,c,d,e) net_vaPrintf(VLC_OBJECT(a),b,c,d,e) -struct pollfd; -VLC_API int vlc_poll(struct pollfd *fds, unsigned nfds, int timeout); - - #ifdef WIN32 /* Microsoft: same semantic, same value, different name... go figure */ # define SHUT_RD SD_RECEIVE @@ -227,10 +222,76 @@ VLC_API int vlc_poll(struct pollfd *fds, unsigned nfds, int timeout); #ifndef AI_NUMERICSERV # define AI_NUMERICSERV 0 #endif +#ifndef AI_IDN +# define AI_IDN 0 /* GNU/libc extension */ +#endif + +#ifdef WIN32 +# undef gai_strerror +# define gai_strerror gai_strerrorA +#endif + +#ifdef __OS2__ +# ifndef NI_NUMERICHOST +# define NI_NUMERICHOST 0x01 +# define NI_NUMERICSERV 0x02 +# define NI_NOFQDN 0x04 +# define NI_NAMEREQD 0x08 +# define NI_DGRAM 0x10 +# endif + +struct addrinfo +{ + int ai_flags; + int ai_family; + int ai_socktype; + int ai_protocol; + size_t ai_addrlen; + struct sockaddr *ai_addr; + char *ai_canonname; + struct addrinfo *ai_next; +}; + +# define AI_PASSIVE 1 +# define AI_CANONNAME 2 +# define AI_NUMERICHOST 4 + +VLC_API const char *gai_strerror( int errnum ); + +VLC_API int getaddrinfo ( const char *, const char *, + const struct addrinfo *, struct addrinfo ** ); +VLC_API void freeaddrinfo( struct addrinfo * ); +VLC_API int getnameinfo ( const struct sockaddr *, socklen_t, + char *, int, char *, int, int ); +#endif VLC_API int vlc_getnameinfo( const struct sockaddr *, int, char *, int, int *, int ); -VLC_API int vlc_getaddrinfo( vlc_object_t *, const char *, int, const struct addrinfo *, struct addrinfo ** ); +VLC_API int vlc_getaddrinfo (const char *, unsigned, + const struct addrinfo *, struct addrinfo **); + + +#ifdef __OS2__ +/* OS/2 does not support IPv6, yet. But declare these only for compilation */ +struct in6_addr +{ + uint8_t s6_addr[16]; +}; + +struct sockaddr_in6 +{ + uint8_t sin6_len; + uint8_t sin6_family; + uint16_t sin6_port; + uint32_t sin6_flowinfo; + struct in6_addr sin6_addr; + uint32_t sin6_scope_id; +}; + +# define IN6_IS_ADDR_MULTICAST(a) (((__const uint8_t *) (a))[0] == 0xff) +static const struct in6_addr in6addr_any = + { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }; +#endif static inline bool net_SockAddrIsMulticast (const struct sockaddr *addr, socklen_t len)