From b5f272778e5a36a6ca80a40c1cdaa6f7366b673a Mon Sep 17 00:00:00 2001 From: Paul Bakker Date: Mon, 11 Mar 2013 16:53:25 +0100 Subject: [PATCH] Fixed net_bind() for specified IP addresses on little endian systems (cherry picked from commit 37286a573bd36b7d80fd101b54bd25bb04979b4e) Conflicts: ChangeLog library/net.c --- ChangeLog | 3 +++ library/net.c | 16 ++++++++++++---- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index ef245367a3..ea2c7512d6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,9 @@ PolarSSL ChangeLog = Branch 1.1 +Bugfix + * Fixed net_bind() for specified IP addresses on little endian systems + Changes * Allow enabling of dummy error_strerror() to support some use-cases * Debug messages about padding errors during SSL message decryption are diff --git a/library/net.c b/library/net.c index 9724c07d7f..7059fd29f6 100644 --- a/library/net.c +++ b/library/net.c @@ -80,12 +80,20 @@ static int wsa_init_done = 0; */ #if defined(__BYTE_ORDER) && defined(__BIG_ENDIAN) && __BYTE_ORDER == __BIG_ENDIAN #define POLARSSL_HTONS(n) (n) +#define POLARSSL_HTONL(n) (n) #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 unsigned short net_htons(unsigned short n); +unsigned long net_htonl(unsigned long n); #define net_htons(n) POLARSSL_HTONS(n) +#define net_htonl(n) POLARSSL_HTONL(n) /* * 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, (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_port = net_htons( port ); @@ -175,11 +183,11 @@ int net_bind( int *fd, const char *bind_ip, int port ) break; 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[1] << 16 ) | ( (unsigned long) c[2] << 8 ) | - ( (unsigned long) c[3] ); + ( (unsigned long) c[3] ) ); } if( bind( *fd, (struct sockaddr *) &server_addr,