christoph/wamr
1
Fork 0
Code Releases Activity

lib-socket: make getaddrinfo return EAI_ values (#4498)

Browse Source 
cf. https://github.com/bytecodealliance/wasm-micro-runtime/issues/4464
This commit is contained in:
YAMAMOTO Takashi
2025-07-21 10:21:31 +09:00
committed by GitHub
parent 952b35d11d
commit a780ffdc43
2 changed files with 36 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
core/iwasm/libraries/lib-socket/inc/wasi_socket_ext.h
View File

@ -135,6 +135,28 @@ typedef struct __wasi_addr_info_hints_t {
#define IPV6_LEAVE_GROUP 21 #define IPV6_LEAVE_GROUP 21
#define IPV6_V6ONLY 26 #define IPV6_V6ONLY 26
/* getaddrinfo error codes.
*
* we use values compatible with wasi-libc/musl netdb.h.
* https://github.com/WebAssembly/wasi-libc/blob/4ea6fdfa288e15a57c02fe31dda78e5ddc87c3c7/libc-top-half/musl/include/netdb.h#L43-L53
*
* for now, non-posix error codes are excluded:
* EAI_PROTOCOL and EAI_BADHINTS (BSDs)
* EAI_ADDRFAMILY, EAI_NODATA
* https://github.com/WebAssembly/wasi-libc/blob/4ea6fdfa288e15a57c02fe31dda78e5ddc87c3c7/libc-top-half/musl/include/netdb.h#L145-L152
*/
#define EAI_AGAIN -3
#define EAI_BADFLAGS -1
#define EAI_FAIL -4
#define EAI_FAMILY -6
#define EAI_MEMORY -10
#define EAI_NONAME -2
#define EAI_OVERFLOW -12
#define EAI_SERVICE -8
#define EAI_SOCKTYPE -7
#define EAI_SYSTEM -11
struct addrinfo { struct addrinfo {
int ai_flags; /* Input flags. */ int ai_flags; /* Input flags. */
int ai_family; /* Protocol family for socket. */ int ai_family; /* Protocol family for socket. */

21
core/iwasm/libraries/lib-socket/src/wasi/wasi_socket_ext.c
View File

@ -38,6 +38,13 @@ __errno_location(void);
return -1; \ return -1; \
} }
/* REVISIT: in many cases, EAI_SYSTEM may not be an ideal error code */
#define GAI_HANDLE_ERROR(error) \
if (error != __WASI_ERRNO_SUCCESS) { \
errno = error; \
return EAI_SYSTEM; \
}
static void static void
ipv4_addr_to_wasi_ip4_addr(uint32_t addr_num, __wasi_addr_ip4_t *out) ipv4_addr_to_wasi_ip4_addr(uint32_t addr_num, __wasi_addr_ip4_t *out)
{ {
@ -518,7 +525,7 @@ getaddrinfo(const char *node, const char *service, const struct addrinfo *hints,
struct aibuf *aibuf_res; struct aibuf *aibuf_res;
error = addrinfo_hints_to_wasi_hints(hints, &wasi_hints); error = addrinfo_hints_to_wasi_hints(hints, &wasi_hints);
HANDLE_ERROR(error) GAI_HANDLE_ERROR(error)
do { do {
if (addr_info) if (addr_info)
@ -529,7 +536,7 @@ getaddrinfo(const char *node, const char *service, const struct addrinfo *hints,
* sizeof(__wasi_addr_info_t)); * sizeof(__wasi_addr_info_t));
if (!addr_info) { if (!addr_info) {
HANDLE_ERROR(__WASI_ERRNO_NOMEM) return EAI_MEMORY;
} }
error = __wasi_sock_addr_resolve(node, service == NULL ? "" : service, error = __wasi_sock_addr_resolve(node, service == NULL ? "" : service,
@ -537,21 +544,21 @@ getaddrinfo(const char *node, const char *service, const struct addrinfo *hints,
&max_info_size); &max_info_size);
if (error != __WASI_ERRNO_SUCCESS) { if (error != __WASI_ERRNO_SUCCESS) {
free(addr_info); free(addr_info);
HANDLE_ERROR(error); GAI_HANDLE_ERROR(error);
} }
} while (max_info_size > addr_info_size); } while (max_info_size > addr_info_size);
addr_info_size = max_info_size; addr_info_size = max_info_size;
if (addr_info_size == 0) { if (addr_info_size == 0) {
free(addr_info); free(addr_info);
HANDLE_ERROR(__WASI_ERRNO_NOENT) return EAI_NONAME;
} }
aibuf_res = aibuf_res =
(struct aibuf *)calloc(1, addr_info_size * sizeof(struct aibuf)); (struct aibuf *)calloc(1, addr_info_size * sizeof(struct aibuf));
if (!aibuf_res) { if (!aibuf_res) {
free(addr_info); free(addr_info);
HANDLE_ERROR(__WASI_ERRNO_NOMEM) return EAI_MEMORY;
} }
*res = &aibuf_res[0].ai; *res = &aibuf_res[0].ai;
@ -564,14 +571,14 @@ getaddrinfo(const char *node, const char *service, const struct addrinfo *hints,
if (error != __WASI_ERRNO_SUCCESS) { if (error != __WASI_ERRNO_SUCCESS) {
free(addr_info); free(addr_info);
free(aibuf_res); free(aibuf_res);
HANDLE_ERROR(error) GAI_HANDLE_ERROR(error)
} }
ai->ai_next = i == addr_info_size - 1 ? NULL : &aibuf_res[i + 1].ai; ai->ai_next = i == addr_info_size - 1 ? NULL : &aibuf_res[i + 1].ai;
} }
free(addr_info); free(addr_info);
return __WASI_ERRNO_SUCCESS; return 0;
} }
void void