mirrors/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity.git synced 2025-01-23 18:02:05 -05:00
Code Issues Projects Releases Packages Wiki Activity

LibC: Make <netinet/in.h> more POSIX compliant

Browse source 
1. Move htonl() etc. from <arpa/inet.h> to <netinet/in.h> (which
   <arpa/inet.h> includes).

   The htonl(), htons(), ntohl(), and ntohs() functions shall be
   available as described in <arpa/inet.h>.  Inclusion of the
   <netinet/in.h> header may also make visible all symbols from
   <arpa/inet.h>.

   - POSIX

2. Define IN6_IS_ADDR_LOOPBACK() and IN6_IS_ADDR_V4MAPPED()
This commit is contained in:
Peter Elliott 2021-07-23 16:07:46 -06:00 • committed by Andreas Kling
parent f16aba405f
commit db92e66902
2 changed files with 35 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
Userland/Libraries/LibC/arpa/inet.h
View file

@ -6,7 +6,6 @@
#pragma once
#include <endian.h>
#include <inttypes.h>
#include <netinet/in.h>
#include <sys/cdefs.h>
@ -27,32 +26,4 @@ static inline int inet_aton(const char* cp, struct in_addr* inp)
char* inet_ntoa(struct in_addr);
static inline uint16_t htons(uint16_t value)
{
#if __BYTE_ORDER == __LITTLE_ENDIAN
return __builtin_bswap16(value);
#else
return value;
#endif
}
static inline uint16_t ntohs(uint16_t value)
{
return htons(value);
}
static inline uint32_t htonl(uint32_t value)
{
#if __BYTE_ORDER == __LITTLE_ENDIAN
return __builtin_bswap32(value);
#else
return value;
#endif
}
static inline uint32_t ntohl(uint32_t value)
{
return htonl(value);
}
__END_DECLS

35
Userland/Libraries/LibC/netinet/in.h
View file

@ -7,9 +7,44 @@
#pragma once
#include <Kernel/API/POSIX/netinet/in.h>
#include <endian.h>
__BEGIN_DECLS
in_addr_t inet_addr(char const*);
static inline uint16_t htons(uint16_t value)
{
#if __BYTE_ORDER == __LITTLE_ENDIAN
return __builtin_bswap16(value);
#else
return value;
#endif
}
static inline uint16_t ntohs(uint16_t value)
{
return htons(value);
}
static inline uint32_t htonl(uint32_t value)
{
#if __BYTE_ORDER == __LITTLE_ENDIAN
return __builtin_bswap32(value);
#else
return value;
#endif
}
static inline uint32_t ntohl(uint32_t value)
{
return htonl(value);
}
#define IN6_IS_ADDR_LOOPBACK(addr) \
(addr->s6_addr[0] == 0 && addr->s6_addr[1] == 0 && addr->s6_addr[2] == 0 && addr->s6_addr[3] == 0 && addr->s6_addr[4] == 0 && addr->s6_addr[5] == 0 && addr->s6_addr[6] == 0 && addr->s6_addr[7] == 0 && addr->s6_addr[8] == 0 && addr->s6_addr[9] == 0 && addr->s6_addr[10] == 0 && addr->s6_addr[11] == 0 && addr->s6_addr[12] == 0 && addr->s6_addr[13] == 0 && addr->s6_addr[14] == 0 && addr->s6_addr[15] == 1)
#define IN6_IS_ADDR_V4MAPPED(addr) \
(addr->s6_addr[0] == 0 && addr->s6_addr[1] == 0 && addr->s6_addr[2] == 0 && addr->s6_addr[3] == 0 && addr->s6_addr[4] == 0 && addr->s6_addr[5] == 0 && addr->s6_addr[6] == 0 && addr->s6_addr[7] == 0 && addr->s6_addr[8] == 0xff && addr->s6_addr[9] == 0xff && addr->s6_addr[10] == 0xff && addr->s6_addr[11] == 0xff)
__END_DECLS