RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 05:37:34 +00:00
Code Issues Activity Actions

LibC: Add IPv6 support to inet_ntop and inet_pton

Browse source
This commit is contained in:
Tom 2022-02-18 21:48:06 -07:00 • committed by Linus Groh
parent 2f0e3da142
commit d124889698
1 changed files with 57 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

46
Userland/Libraries/LibC/arpa/inet.cpp
View file

@ -4,6 +4,7 @@
* SPDX-License-Identifier: BSD-2-Clause * SPDX-License-Identifier: BSD-2-Clause
*/ */
#include <AK/IPv6Address.h>
#include <arpa/inet.h> #include <arpa/inet.h>
#include <errno.h> #include <errno.h>
#include <netinet/in.h> #include <netinet/in.h>
@ -13,29 +14,35 @@ extern "C" {
const char* inet_ntop(int af, const void* src, char* dst, socklen_t len) const char* inet_ntop(int af, const void* src, char* dst, socklen_t len)
{ {
if (af != AF_INET) { if (af == AF_INET) {
errno = EAFNOSUPPORT; if (len < INET_ADDRSTRLEN) {
return nullptr;
}
if (len < 4) {
errno = ENOSPC; errno = ENOSPC;
return nullptr; return nullptr;
} }
auto* bytes = (const unsigned char*)src; auto* bytes = (const unsigned char*)src;
snprintf(dst, len, "%u.%u.%u.%u", bytes[0], bytes[1], bytes[2], bytes[3]); snprintf(dst, len, "%u.%u.%u.%u", bytes[0], bytes[1], bytes[2], bytes[3]);
return (const char*)dst; return (const char*)dst;
} else if (af == AF_INET6) {
if (len < INET6_ADDRSTRLEN) {
errno = ENOSPC;
return nullptr;
}
auto str = IPv6Address(((in6_addr const*)src)->s6_addr).to_string();
if (!str.copy_characters_to_buffer(dst, len)) {
errno = ENOSPC;
return nullptr;
}
return (const char*)dst;
}
errno = EAFNOSUPPORT;
return nullptr;
} }
int inet_pton(int af, const char* src, void* dst) int inet_pton(int af, const char* src, void* dst)
{ {
if (af != AF_INET) { if (af == AF_INET) {
errno = EAFNOSUPPORT; unsigned a, b, c, d;
return -1;
}
unsigned a;
unsigned b;
unsigned c;
unsigned d;
int count = sscanf(src, "%u.%u.%u.%u", &a, &b, &c, &d); int count = sscanf(src, "%u.%u.%u.%u", &a, &b, &c, &d);
if (count != 4) { if (count != 4) {
errno = EINVAL; errno = EINVAL;
@ -56,6 +63,19 @@ int inet_pton(int af, const char* src, void* dst)
u.d = d; u.d = d;
*(uint32_t*)dst = u.l; *(uint32_t*)dst = u.l;
return 1; return 1;
} else if (af == AF_INET6) {
auto addr = IPv6Address::from_string(src);
if (!addr.has_value()) {
errno = EINVAL;
return 0;
}
memcpy(dst, addr->to_in6_addr_t(), sizeof(in6_addr));
return 1;
}
errno = EAFNOSUPPORT;
return -1;
} }
in_addr_t inet_addr(const char* str) in_addr_t inet_addr(const char* str)