yuzu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2025-03-24 22:25:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adapt net_connect() for IPv6

Browse source
This commit is contained in:
Manuel Pégourié-Gonnard 2013-12-13 12:54:09 +01:00
parent 2e5c3163db
commit 10934de1ca
2 changed files with 63 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
include/polarssl/config.h
View file

@ -101,6 +101,16 @@
* Comment if your system does not support time functions * Comment if your system does not support time functions
*/ */
#define POLARSSL_HAVE_TIME #define POLARSSL_HAVE_TIME
/**
* \def POLARSSL_HAVE_IPV6
*
* System supports the basic socket interface for IPv6 (RFC 3493),
* specifically getaddrinfo().
*
* Comment if your system does not support the IPv6 socket interface
*/
#define POLARSSL_HAVE_IPV6
/* \} name SECTION: System support */ /* \} name SECTION: System support */
/** /**

53
library/net.c
View file

@ -81,6 +81,11 @@ static int wsa_init_done = 0;
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
#if defined(_MSC_VER) && !defined snprintf && !defined(EFIX64) && \
!defined(EFI32)
#define snprintf _snprintf
#endif
#if defined(POLARSSL_HAVE_TIME) #if defined(POLARSSL_HAVE_TIME)
#include <time.h> #include <time.h>
#endif #endif
@ -142,6 +147,53 @@ static void net_prepare( void )
*/ */
int net_connect( int *fd, const char *host, int port ) int net_connect( int *fd, const char *host, int port )
{ {
#if defined(POLARSSL_HAVE_IPV6)
int ret = POLARSSL_ERR_NET_UNKNOWN_HOST;
struct addrinfo hints, *addr_list, *cur;
char port_str[6];
net_prepare();
/* getaddrinfo expects port as a string */
memset( port_str, 0, sizeof( port_str ) );
snprintf( port_str, sizeof( port_str ), "%d", port );
/* Do name resolution with both IPv6 and IPv4, but only TCP */
memset( &hints, 0, sizeof( hints ) );
hints.ai_family = AF_UNSPEC;
hints.ai_socktype = SOCK_STREAM;
hints.ai_protocol = IPPROTO_TCP;
if( getaddrinfo( host, port_str, &hints, &addr_list ) != 0 )
return( POLARSSL_ERR_NET_UNKNOWN_HOST );
/* Try the sockaddrs until a connection succeeds */
for( cur = addr_list; cur != NULL; cur = cur->ai_next )
{
*fd = socket( cur->ai_family, cur->ai_socktype, cur->ai_protocol );
if( *fd < 0 )
{
ret = POLARSSL_ERR_NET_SOCKET_FAILED;
continue;
}
if( connect( *fd, cur->ai_addr, cur->ai_addrlen ) == 0 )
{
ret = 0;
break;
}
close( *fd );
ret = POLARSSL_ERR_NET_CONNECT_FAILED;
}
freeaddrinfo( addr_list );
return( ret );
#else
/* Legacy IPv4-only version */
struct sockaddr_in server_addr; struct sockaddr_in server_addr;
struct hostent *server_host; struct hostent *server_host;
@ -168,6 +220,7 @@ int net_connect( int *fd, const char *host, int port )
} }
return( 0 ); return( 0 );
#endif /* POLARSSL_HAVE_IPV6 */
} }
/* /*