#ifndef __VLC_NETWORK_H
# define __VLC_NETWORK_H
-#if defined( UNDER_CE )
-# include <winsock.h>
-#elif defined( WIN32 )
+#if defined( WIN32 )
+# if defined(UNDER_CE) && defined(sockaddr_storage)
+# undef sockaddr_storage
+# endif
# include <winsock2.h>
# include <ws2tcpip.h>
#else
+# if HAVE_SYS_SOCKET_H
+# include <sys/socket.h>
+# endif
+# if HAVE_NETINET_IN_H
+# include <netinet/in.h>
+# endif
+# if HAVE_ARPA_INET_H
+# include <arpa/inet.h>
+# elif defined( SYS_BEOS )
+# include <net/netdb.h>
+# endif
# include <netdb.h>
-#if HAVE_SYS_SOCKET_H
-# include <sys/socket.h>
-#endif
#endif
+# ifdef __cplusplus
+extern "C" {
+# endif
/*****************************************************************************
* network_socket_t: structure passed to a network plug-in to define the
*****************************************************************************/
struct network_socket_t
{
- char * psz_bind_addr;
+ const char *psz_bind_addr;
int i_bind_port;
- char * psz_server_addr;
+ const char *psz_server_addr;
int i_server_port;
int i_ttl;
+ int v6only;
+
/* Return values */
int i_handle;
size_t i_mtu;
url->psz_buffer = NULL;
}
+static inline int isurlsafe( int c )
+{
+ return ( (unsigned char)( c - 'a' ) < 26 )
+ || ( (unsigned char)( c - 'A' ) < 26 )
+ || ( (unsigned char)( c - '0' ) < 10 )
+ /* Hmm, we should not encode character that are allowed in URLs
+ * (even if they are not URL-safe), nor URL-safe characters.
+ * We still encode some of them because of Microsoft's crap browser.
+ */
+ || ( strchr( "-_.", c ) != NULL );
+}
+
/*****************************************************************************
* vlc_UrlEncode:
*****************************************************************************
static inline char *vlc_UrlEncode( const char *psz_url )
{
char *psz_enc, *out;
- const char *in;
+ const unsigned char *in;
psz_enc = (char *)malloc( 3 * strlen( psz_url ) + 1 );
if( psz_enc == NULL )
return NULL;
out = psz_enc;
- for( in = psz_url; *in; in++ )
+ for( in = (const unsigned char *)psz_url; *in; in++ )
{
- char c = *in;
+ unsigned char c = *in;
- if( ( c <= 32 ) || ( c == '%' ) || ( c == '?' ) || ( c == '&' )
- || ( c == '+' ) )
+ if( isurlsafe( c ) )
+ *out++ = (char)c;
+ else
{
- *out++ = '%';
+ *out++ = '%';
*out++ = ( ( c >> 4 ) >= 0xA ) ? 'A' + ( c >> 4 ) - 0xA
: '0' + ( c >> 4 );
*out++ = ( ( c & 0xf ) >= 0xA ) ? 'A' + ( c & 0xf ) - 0xA
: '0' + ( c & 0xf );
}
- else
- *out++ = c;
}
*out++ = '\0';
ptr += 2;
}
else
- if( c == ' ' )
+ if( !isurlsafe( c ) )
return 1;
}
return 0; /* looks fine - but maybe it is not encoded */
}
-
+
/*****************************************************************************
* vlc_b64_encode:
*****************************************************************************
VLC_EXPORT( int, __net_Accept, ( vlc_object_t *, int *, mtime_t ) );
#define net_OpenUDP(a, b, c, d, e ) __net_OpenUDP(VLC_OBJECT(a), b, c, d, e)
-VLC_EXPORT( int, __net_OpenUDP, ( vlc_object_t *p_this, char *psz_bind, int i_bind, char *psz_server, int i_server ) );
+VLC_EXPORT( int, __net_OpenUDP, ( vlc_object_t *p_this, const char *psz_bind, int i_bind, const char *psz_server, int i_server ) );
VLC_EXPORT( void, net_Close, ( int fd ) );
VLC_EXPORT( void, net_ListenClose, ( int *fd ) );
VLC_EXPORT( int, __net_Select, ( vlc_object_t *p_this, int *pi_fd, v_socket_t **, int i_fd, uint8_t *p_data, int i_data, mtime_t i_wait ) );
#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, v_socket_t *, uint8_t *p_data, int i_data ) );
+VLC_EXPORT( int, __net_Write, ( vlc_object_t *p_this, int fd, v_socket_t *, const uint8_t *p_data, int 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, v_socket_t * ) );
#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, v_socket_t *, const char *psz_fmt, va_list args ) );
-#define net_GetSockAddress(a,b,c,d) __net_GetAddress(VLC_OBJECT(a),VLC_FALSE,b,c,d)
-#define net_GetPeerAddress(a,b,c,d) __net_GetAddress(VLC_OBJECT(a),VLC_TRUE,b,c,d)
-VLC_EXPORT( int, __net_GetAddress, ( vlc_object_t *p_this, vlc_bool_t peer, int fd, char *address, int *port ) );
+
+#if !HAVE_INET_PTON
+/* only in core, so no need for C++ extern "C" */
+int inet_pton(int af, const char *src, void *dst);
+#endif
+
/*****************************************************************************
* net_StopRecv/Send
# define net_StopSend( fd ) (void)shutdown( fd, SD_SEND )
# define net_StopRecv( fd ) (void)shutdown( fd, SD_RECEIVE )
#else
-# warning FIXME: implement shutdown on your platform!
+# 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
#endif
# define NI_MAXHOST 1025
# define NI_MAXSERV 32
# endif
-# define NI_MAXNUMERICHOST 48
+# define NI_MAXNUMERICHOST 64
# ifndef NI_NUMERICHOST
# define NI_NUMERICHOST 0x01
/*****************************************************************************
* net_AddressIsMulticast: This function returns VLC_FALSE if the psz_addr does
* not specify a multicast address or if the address is not a valid address.
- * FIXME: Only the first returned address is checked. This might be problematic.
*****************************************************************************/
-static inline vlc_bool_t net_AddressIsMulticast( vlc_object_t *p_object, char *psz_addr )
+static inline vlc_bool_t net_AddressIsMulticast( vlc_object_t *p_object, const char *psz_addr )
{
struct addrinfo hints, *res;
vlc_bool_t b_multicast = VLC_FALSE;
int i;
- if( psz_addr == NULL )
- {
- msg_Err( p_object, "*FIXME* Unexpected NULL URI for net_AddressIsMulticast" );
- msg_Err( p_object, "This should not happen. VLC needs fixing." );
- return VLC_FALSE;
- }
-
memset( &hints, 0, sizeof( hints ) );
hints.ai_socktype = SOCK_DGRAM; /* UDP */
hints.ai_flags = AI_NUMERICHOST;
i = vlc_getaddrinfo( p_object, psz_addr, 0,
&hints, &res );
- /*if( i == 0 )
- i = vlc_getnameinfo( res->ai_addr, res->ai_addrlen, psz_buf,
- sizeof( psz_buf ), NULL, NI_NUMERICHOST );*/
if( i )
{
msg_Err( p_object, "Invalid node for net_AddressIsMulticast: %s : %s",
psz_addr, vlc_gai_strerror( i ) );
- return b_multicast;
+ return VLC_FALSE;
}
if( res->ai_family == AF_INET )
{
#if !defined( SYS_BEOS )
struct sockaddr_in *v4 = (struct sockaddr_in *) res->ai_addr;
- b_multicast = ( ntohl( v4->sin_addr.s_addr ) > 0xe1000000 && ntohl( v4->sin_addr.s_addr ) <= 0xEFFFFFFF );
+ b_multicast = ( ntohl( v4->sin_addr.s_addr ) >= 0xe0000000 )
+ && ( ntohl( v4->sin_addr.s_addr ) <= 0xefffffff );
#endif
}
+#if defined( WIN32 ) || defined( HAVE_GETADDRINFO )
else if( res->ai_family == AF_INET6 )
{
-#if defined( WIN32 ) || defined( HAVE_IF_NAMETOINDEX )
- struct sockaddr_in6 *v6 = (struct sockaddr_in6 *) res->ai_addr;
- b_multicast = IN6_IS_ADDR_MULTICAST( &v6->sin6_addr);
-#endif
+ struct sockaddr_in6 *v6 = (struct sockaddr_in6 *)res->ai_addr;
+ b_multicast = IN6_IS_ADDR_MULTICAST( &v6->sin6_addr );
}
+#endif
vlc_freeaddrinfo( res );
return b_multicast;
}
+static inline int net_GetSockAddress( int fd, char *address, int *port )
+{
+ struct sockaddr_storage addr;
+ socklen_t addrlen = sizeof( addr );
+
+ return getpeername( fd, (struct sockaddr *)&addr, &addrlen )
+ || vlc_getnameinfo( (struct sockaddr *)&addr, addrlen, address,
+ NI_MAXNUMERICHOST, port, NI_NUMERICHOST )
+ ? VLC_EGENERIC : 0;
+}
+
+static inline int net_GetPeerAddress( int fd, char *address, int *port )
+{
+ struct sockaddr_storage addr;
+ socklen_t addrlen = sizeof( addr );
+
+ return getpeername( fd, (struct sockaddr *)&addr, &addrlen )
+ || vlc_getnameinfo( (struct sockaddr *)&addr, addrlen, address,
+ NI_MAXNUMERICHOST, port, NI_NUMERICHOST )
+ ? VLC_EGENERIC : 0;
+}
+
+# ifdef __cplusplus
+}
+# endif
+
#endif
projects / vlc / blobdiff