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

Simplify net_htonx()

Browse source
This commit is contained in:
Manuel Pégourié-Gonnard 2015-04-03 17:10:22 +02:00
parent 932e3934bd
commit df791a51f6
1 changed files with 30 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
library/net.c
View file

@ -76,20 +76,6 @@ static int wsa_init_done = 0;
#include <netdb.h> #include <netdb.h>
#include <errno.h> #include <errno.h>
#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || \
defined(__DragonFly__)
#include <sys/endian.h>
#elif defined(__APPLE__) || defined(HAVE_MACHINE_ENDIAN_H) || \
defined(EFIX64) || defined(EFI32)
#include <machine/endian.h>
#elif defined(sun)
#include <sys/isa_defs.h>
#elif defined(_AIX) || defined(HAVE_ARPA_NAMESER_COMPAT_H)
#include <arpa/nameser_compat.h>
#else
#include <endian.h>
#endif
#endif /* ( _WIN32 || _WIN32_WCE ) && !EFIX64 && !EFI32 */ #endif /* ( _WIN32 || _WIN32_WCE ) && !EFIX64 && !EFI32 */
#include <stdlib.h> #include <stdlib.h>
@ -111,6 +97,21 @@ typedef UINT32 uint32_t;
#include <inttypes.h> #include <inttypes.h>
#endif #endif
#if !defined(POLARSSL_HAVE_IPV6)
#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || \
defined(__DragonFly__)
#include <sys/endian.h>
#elif defined(__APPLE__) || defined(HAVE_MACHINE_ENDIAN_H) || \
defined(EFIX64) || defined(EFI32)
#include <machine/endian.h>
#elif defined(sun)
#include <sys/isa_defs.h>
#elif defined(_AIX) || defined(HAVE_ARPA_NAMESER_COMPAT_H)
#include <arpa/nameser_compat.h>
#else
#include <endian.h>
#endif
/* /*
* htons() is not always available. * htons() is not always available.
* By default go for LITTLE_ENDIAN variant. Otherwise hope for _BYTE_ORDER and * By default go for LITTLE_ENDIAN variant. Otherwise hope for _BYTE_ORDER and
@ -118,16 +119,23 @@ typedef UINT32 uint32_t;
*/ */
#if defined(__BYTE_ORDER) && defined(__BIG_ENDIAN) && \ #if defined(__BYTE_ORDER) && defined(__BIG_ENDIAN) && \
__BYTE_ORDER == __BIG_ENDIAN __BYTE_ORDER == __BIG_ENDIAN
#define POLARSSL_HTONS(n) (n) static unsigned short net_htons( unsigned short n ) { return( n ); }
#define POLARSSL_HTONL(n) (n) static unsigned long net_htonl( unsigned long n ) { return( n ); }
#else #else
#define POLARSSL_HTONS(n) ((((unsigned short)(n) & 0xFF ) << 8 ) | \ static unsigned short net_htons( unsigned short n )
(((unsigned short)(n) & 0xFF00 ) >> 8 )) {
#define POLARSSL_HTONL(n) ((((unsigned long )(n) & 0xFF ) << 24) | \ return( (((unsigned short) n & 0xFF ) << 8 ) |
(((unsigned long )(n) & 0xFF00 ) << 8 ) | \ (((unsigned short) n & 0xFF00 ) >> 8 ) );
(((unsigned long )(n) & 0xFF0000 ) >> 8 ) | \ }
(((unsigned long )(n) & 0xFF000000) >> 24)) static unsigned long net_htonl( unsigned long n )
{
return( (((unsigned long ) n & 0xFF ) << 24) |
(((unsigned long ) n & 0xFF00 ) << 8 ) |
(((unsigned long ) n & 0xFF0000 ) >> 8 ) |
(((unsigned long ) n & 0xFF000000) >> 24) );
}
#endif #endif
#endif /* !POLARSSL_HAVE_IPV6 */
#if defined(POLARSSL_PLATFORM_C) #if defined(POLARSSL_PLATFORM_C)
#include "mbedtls/platform.h" #include "mbedtls/platform.h"
@ -135,11 +143,6 @@ typedef UINT32 uint32_t;
#define polarssl_snprintf snprintf #define polarssl_snprintf snprintf
#endif #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)
/* /*
* Prepare for using the sockets interface * Prepare for using the sockets interface
*/ */