christoph/wamr
1
Fork 0
Code Releases Activity

Implement sock_addr_remote syscall (#1360)

Browse Source 
Slightly changed the interface sock_addr_remote - since we already
have a `__wasi_addr_t` structure which is an union, there's no need
for passing length around - the address buffer will always have the
right length (i.e. max of all address families).
This commit is contained in:
Marcin Kolny
2022-08-08 11:11:28 +02:00
committed by GitHub
parent 3e77b053c3
commit 45136bcc8a
10 changed files with 142 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
core/shared/platform/common/posix/posix_socket.c
View File

@ -273,28 +273,18 @@ os_socket_addr_resolve(const char *host, const char *service,
return BHT_OK;
}
int
os_socket_addr_local(bh_socket_t socket, uint8_t *buf, size_t buflen,
uint16_t *port, uint8_t *is_ipv4)
static int
os_socket_convert_sockaddr(struct sockaddr *addr, uint8_t *buf, size_t buflen,
uint16_t *port, uint8_t *is_ipv4)
{
struct sockaddr_storage addr_storage = { 0 };
socklen_t addr_len = sizeof(addr_storage);
int ret;
assert(buf);
assert(is_ipv4);
assert(port);
ret = getsockname(socket, (struct sockaddr *)&addr_storage, &addr_len);
if (ret != BHT_OK) {
return BHT_ERROR;
}
switch (addr_storage.ss_family) {
switch (addr->sa_family) {
case AF_INET:
{
struct sockaddr_in *addr_in = (struct sockaddr_in *)&addr_storage;
struct sockaddr_in *addr_in = (struct sockaddr_in *)addr;
assert(buflen >= sizeof(addr_in->sin_addr));
*port = ntohs(addr_in->sin_port);
@ -304,7 +294,7 @@ os_socket_addr_local(bh_socket_t socket, uint8_t *buf, size_t buflen,
}
case AF_INET6:
{
struct sockaddr_in6 *addr_in = (struct sockaddr_in6 *)&addr_storage;
struct sockaddr_in6 *addr_in = (struct sockaddr_in6 *)addr;
assert(buflen >= sizeof(addr_in->sin6_addr));
*port = ntohs(addr_in->sin6_port);
@ -320,4 +310,40 @@ os_socket_addr_local(bh_socket_t socket, uint8_t *buf, size_t buflen,
}
return BHT_OK;
}
int
os_socket_addr_local(bh_socket_t socket, uint8_t *buf, size_t buflen,
uint16_t *port, uint8_t *is_ipv4)
{
struct sockaddr_storage addr_storage = { 0 };
socklen_t addr_len = sizeof(addr_storage);
int ret;
ret = getsockname(socket, (struct sockaddr *)&addr_storage, &addr_len);
if (ret != BHT_OK) {
return BHT_ERROR;
}
return os_socket_convert_sockaddr((struct sockaddr *)&addr_storage, buf,
buflen, port, is_ipv4);
}
int
os_socket_addr_remote(bh_socket_t socket, uint8_t *buf, size_t buflen,
uint16_t *port, uint8_t *is_ipv4)
{
struct sockaddr_storage addr_storage = { 0 };
socklen_t addr_len = sizeof(addr_storage);
int ret;
ret = getpeername(socket, (struct sockaddr *)&addr_storage, &addr_len);
if (ret != BHT_OK) {
return BHT_ERROR;
}
return os_socket_convert_sockaddr((struct sockaddr *)&addr_storage, buf,
buflen, port, is_ipv4);
}