mirrors-yuzu-emu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls synced 2024-11-24 19:28:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

net_is_block() renamed to net_would_block() and corrected behaviour on

Browse source 
non-blocking sockets

net_would_block() now does not return 1 if the socket is blocking.
This commit is contained in:
Paul Bakker 2014-01-23 20:59:49 +01:00
parent c2024f4592
commit 80025417eb
1 changed files with 29 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
library/net.c
View file

@ -357,15 +357,31 @@ int net_bind( int *fd, const char *bind_ip, int port )
#endif /* POLARSSL_HAVE_IPV6 */ #endif /* POLARSSL_HAVE_IPV6 */
} }
/*
* Check if the current operation is blocking
*/
static int net_is_blocking( void )
{
#if ( defined(_WIN32) || defined(_WIN32_WCE) ) && !defined(EFIX64) && \ #if ( defined(_WIN32) || defined(_WIN32_WCE) ) && !defined(EFIX64) && \
!defined(EFI32) !defined(EFI32)
/*
* Check if the requested operation would be blocking on a non-blocking socket
* and thus 'failed' with a negative return value.
*/
static int net_would_block( int fd )
{
return( WSAGetLastError() == WSAEWOULDBLOCK ); return( WSAGetLastError() == WSAEWOULDBLOCK );
}
#else #else
/*
* Check if the requested operation would be blocking on a non-blocking socket
* and thus 'failed' with a negative return value.
*
* Note: on a blocking socket this function always returns 0!
*/
static int net_would_block( int fd )
{
/*
* Never return 'WOULD BLOCK' on a non-blocking socket
*/
if( ( fcntl( fd, F_GETFL ) & O_NONBLOCK ) != O_NONBLOCK )
return( 0 );
switch( errno ) switch( errno )
{ {
#if defined EAGAIN #if defined EAGAIN
@ -377,8 +393,8 @@ static int net_is_blocking( void )
return( 1 ); return( 1 );
} }
return( 0 ); return( 0 );
#endif
} }
#endif
/* /*
* Accept a connection from a remote client * Accept a connection from a remote client
@ -403,7 +419,7 @@ int net_accept( int bind_fd, int *client_fd, void *client_ip )
if( *client_fd < 0 ) if( *client_fd < 0 )
{ {
if( net_is_blocking() != 0 ) if( net_would_block( *client_fd ) != 0 )
return( POLARSSL_ERR_NET_WANT_READ ); return( POLARSSL_ERR_NET_WANT_READ );
return( POLARSSL_ERR_NET_ACCEPT_FAILED ); return( POLARSSL_ERR_NET_ACCEPT_FAILED );
@ -476,11 +492,12 @@ void net_usleep( unsigned long usec )
*/ */
int net_recv( void *ctx, unsigned char *buf, size_t len ) int net_recv( void *ctx, unsigned char *buf, size_t len )
{ {
int ret = read( *((int *) ctx), buf, len ); int fd = *((int *) ctx);
int ret = read( fd, buf, len );
if( ret < 0 ) if( ret < 0 )
{ {
if( net_is_blocking() != 0 ) if( net_would_block( fd ) != 0 )
return( POLARSSL_ERR_NET_WANT_READ ); return( POLARSSL_ERR_NET_WANT_READ );
#if ( defined(_WIN32) || defined(_WIN32_WCE) ) && !defined(EFIX64) && \ #if ( defined(_WIN32) || defined(_WIN32_WCE) ) && !defined(EFIX64) && \
@ -506,11 +523,12 @@ int net_recv( void *ctx, unsigned char *buf, size_t len )
*/ */
int net_send( void *ctx, const unsigned char *buf, size_t len ) int net_send( void *ctx, const unsigned char *buf, size_t len )
{ {
int ret = write( *((int *) ctx), buf, len ); int fd = *((int *) ctx);
int ret = write( fd, buf, len );
if( ret < 0 ) if( ret < 0 )
{ {
if( net_is_blocking() != 0 ) if( net_would_block( fd ) != 0 )
return( POLARSSL_ERR_NET_WANT_WRITE ); return( POLARSSL_ERR_NET_WANT_WRITE );
#if ( defined(_WIN32) || defined(_WIN32_WCE) ) && !defined(EFIX64) && \ #if ( defined(_WIN32) || defined(_WIN32_WCE) ) && !defined(EFIX64) && \