*
* 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., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
#ifndef __VLC_NETWORK_H
# if defined(UNDER_CE) && defined(sockaddr_storage)
# undef sockaddr_storage
# endif
+# if defined(UNDER_CE)
+# define HAVE_STRUCT_ADDRINFO
+# else
+# include <io.h>
+# endif
# include <winsock2.h>
# include <ws2tcpip.h>
+# define ENETUNREACH WSAENETUNREACH
#else
# if HAVE_SYS_SOCKET_H
# include <sys/socket.h>
# include <netdb.h>
#endif
+# ifdef __cplusplus
+extern "C" {
+# endif
/*****************************************************************************
* network_socket_t: structure passed to a network plug-in to define the
char *psz_path;
char *psz_option;
-
+
char *psz_buffer; /* to be freed */
} vlc_url_t;
url->i_port = 0;
url->psz_path = NULL;
url->psz_option = NULL;
-
+
if( psz_url == NULL )
{
url->psz_buffer = NULL;
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:
+ * vlc_UrlEncode:
*****************************************************************************
* perform URL encoding
* (you do NOT want to do URL decoding - it is not reversible - do NOT do it)
*****************************************************************************/
static inline char *vlc_b64_encode( char *src )
{
- static const char b64[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-
- char *dst = (char *)malloc( strlen( src ) * 4 / 3 + 12 );
- char *ret = dst;
- unsigned i_bits = 0;
- unsigned i_shift = 0;
-
- for( ;; )
+ static const char b64[] =
+ "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+ size_t len = strlen( src );
+
+ char *ret;
+ char *dst = (char *)malloc( ( len + 4 ) * 4 / 3 );
+ if( dst == NULL )
+ return NULL;
+
+ ret = dst;
+
+ while( len > 0 )
{
- if( *src )
- {
- i_bits = ( i_bits << 8 )|( *src++ );
- i_shift += 8;
- }
- else if( i_shift > 0 )
+ /* pops (up to) 3 bytes of input */
+ uint32_t v = *src++ << 24;
+
+ if( len >= 2 )
{
- i_bits <<= 6 - i_shift;
- i_shift = 6;
+ v |= *src++ << 16;
+ if( len >= 3 )
+ v |= *src++ << 8;
}
- else
+
+ /* pushes (up to) 4 bytes of output */
+ while( v )
{
- *dst++ = '=';
- break;
+ *dst++ = b64[v >> 26];
+ v = v << 6;
}
-
- while( i_shift >= 6 )
+
+ switch( len )
{
- i_shift -= 6;
- *dst++ = b64[(i_bits >> i_shift)&0x3f];
+ case 1:
+ *dst++ = '=';
+ *dst++ = '=';
+ len--;
+ break;
+
+ case 2:
+ *dst++ = '=';
+ len -= 2;
+ break;
+
+ default:
+ len -= 3;
}
}
-
- *dst++ = '\0';
-
+
+ *dst = '\0';
+
return ret;
}
/* Portable networking layer communication */
-#define net_OpenTCP(a, b, c) __net_OpenTCP(VLC_OBJECT(a), b, c)
-VLC_EXPORT( int, __net_OpenTCP, ( vlc_object_t *p_this, const char *psz_host, int i_port ) );
+#define net_ConnectTCP(a, b, c) __net_ConnectTCP(VLC_OBJECT(a), b, c)
+#define net_OpenTCP(a, b, c) __net_ConnectTCP(VLC_OBJECT(a), b, c)
+VLC_EXPORT( int, __net_ConnectTCP, ( vlc_object_t *p_this, const char *psz_host, int i_port ) );
#define net_ListenTCP(a, b, c) __net_ListenTCP(VLC_OBJECT(a), b, c)
VLC_EXPORT( int *, __net_ListenTCP, ( vlc_object_t *, const char *, int ) );
#define net_Accept(a, b, c) __net_Accept(VLC_OBJECT(a), b, c)
VLC_EXPORT( int, __net_Accept, ( vlc_object_t *, int *, mtime_t ) );
+#define net_ConnectUDP(a, b, c, d ) __net_ConnectUDP(VLC_OBJECT(a), b, c, d)
+VLC_EXPORT( int, __net_ConnectUDP, ( vlc_object_t *p_this, const char *psz_host, int i_port, int hlim ) );
+
#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, const char *psz_bind, int i_bind, const char *psz_server, int i_server ) );
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_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 AI_NUMERICHOST 4
# endif /* if !HAVE_STRUCT_ADDRINFO */
-/*** libidn support ***/
-# ifndef AI_IDN
-# define AI_IDN 0
-# define AI_CANONIDN 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 ** ) );
psz_addr, vlc_gai_strerror( i ) );
return VLC_FALSE;
}
-
+
if( res->ai_family == AF_INET )
{
#if !defined( SYS_BEOS )
&& ( 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_GETADDRINFO )
struct sockaddr_in6 *v6 = (struct sockaddr_in6 *)res->ai_addr;
b_multicast = IN6_IS_ADDR_MULTICAST( &v6->sin6_addr );
-#endif
}
-
+#endif
+
vlc_freeaddrinfo( res );
return b_multicast;
}
struct sockaddr_storage addr;
socklen_t addrlen = sizeof( addr );
- return getpeername( fd, (struct sockaddr *)&addr, &addrlen )
+ return getsockname( fd, (struct sockaddr *)&addr, &addrlen )
|| vlc_getnameinfo( (struct sockaddr *)&addr, addrlen, address,
NI_MAXNUMERICHOST, port, NI_NUMERICHOST )
? VLC_EGENERIC : 0;
? VLC_EGENERIC : 0;
}
+# ifdef __cplusplus
+}
+# endif
+
#endif
projects / vlc / blobdiff