yuzu-emu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2024-11-26 05:25:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed net_bind() for specified IP addresses on little endian systems

Browse Source 
(cherry picked from commit 37286a573b)

Conflicts:
	ChangeLog
	library/net.c
This commit is contained in:
Paul Bakker 2013-03-11 16:53:25 +01:00
parent e73a77f656
commit b5f272778e
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,6 +1,9 @@
PolarSSL ChangeLog PolarSSL ChangeLog
= Branch 1.1 = Branch 1.1
Bugfix
* Fixed net_bind() for specified IP addresses on little endian systems
Changes Changes
* Allow enabling of dummy error_strerror() to support some use-cases * Allow enabling of dummy error_strerror() to support some use-cases
* Debug messages about padding errors during SSL message decryption are * Debug messages about padding errors during SSL message decryption are

16
library/net.c
View File

@ -80,12 +80,20 @@ static int wsa_init_done = 0;
*/ */
#if defined(__BYTE_ORDER) && defined(__BIG_ENDIAN) && __BYTE_ORDER == __BIG_ENDIAN #if defined(__BYTE_ORDER) && defined(__BIG_ENDIAN) && __BYTE_ORDER == __BIG_ENDIAN
#define POLARSSL_HTONS(n) (n) #define POLARSSL_HTONS(n) (n)
#define POLARSSL_HTONL(n) (n)
#else #else
#define POLARSSL_HTONS(n) (((((unsigned short)(n) & 0xFF)) << 8) | (((unsigned short)(n) & 0xFF00) >> 8)) #define POLARSSL_HTONS(n) ((((unsigned short)(n) & 0xFF ) << 8 ) | \
(((unsigned short)(n) & 0xFF00 ) >> 8 ))
#define POLARSSL_HTONL(n) ((((unsigned long )(n) & 0xFF ) << 24) | \
(((unsigned long )(n) & 0xFF00 ) << 8 ) | \
(((unsigned long )(n) & 0xFF0000 ) >> 8 ) | \
(((unsigned long )(n) & 0xFF000000) >> 24))
#endif #endif
unsigned short net_htons(unsigned short n); unsigned short net_htons(unsigned short n);
unsigned long net_htonl(unsigned long n);
#define net_htons(n) POLARSSL_HTONS(n) #define net_htons(n) POLARSSL_HTONS(n)
#define net_htonl(n) POLARSSL_HTONL(n)
/* /*
* Initiate a TCP connection with host:port * Initiate a TCP connection with host:port
@ -161,7 +169,7 @@ int net_bind( int *fd, const char *bind_ip, int port )
setsockopt( *fd, SOL_SOCKET, SO_REUSEADDR, setsockopt( *fd, SOL_SOCKET, SO_REUSEADDR,
(const char *) &n, sizeof( n ) ); (const char *) &n, sizeof( n ) );
server_addr.sin_addr.s_addr = INADDR_ANY; server_addr.sin_addr.s_addr = net_htonl( INADDR_ANY );
server_addr.sin_family = AF_INET; server_addr.sin_family = AF_INET;
server_addr.sin_port = net_htons( port ); server_addr.sin_port = net_htons( port );
@ -175,11 +183,11 @@ int net_bind( int *fd, const char *bind_ip, int port )
break; break;
if( n == 4 ) if( n == 4 )
server_addr.sin_addr.s_addr = server_addr.sin_addr.s_addr = net_htonl(
( (unsigned long) c[0] << 24 ) | ( (unsigned long) c[0] << 24 ) |
( (unsigned long) c[1] << 16 ) | ( (unsigned long) c[1] << 16 ) |
( (unsigned long) c[2] << 8 ) | ( (unsigned long) c[2] << 8 ) |
( (unsigned long) c[3] ); ( (unsigned long) c[3] ) );
} }
if( bind( *fd, (struct sockaddr *) &server_addr, if( bind( *fd, (struct sockaddr *) &server_addr,