Skip to content

Commit 3d56c81

Browse files
authored
Fix NuttX build error after dev/socket was merged (#1517)
1 parent 3693cbe commit 3d56c81

File tree

2 files changed

+13
-2
lines changed

2 files changed

+13
-2
lines changed

core/shared/platform/common/posix/posix_socket.c

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -426,7 +426,7 @@ os_socket_getbooloption(bh_socket_t socket, int level, int optname,
426426
assert(is_enabled);
427427

428428
int optval;
429-
int optval_size = sizeof(optval);
429+
socklen_t optval_size = sizeof(optval);
430430
if (getsockopt(socket, level, optname, &optval, &optval_size) != 0) {
431431
return BHT_ERROR;
432432
}
@@ -523,15 +523,25 @@ os_socket_get_reuse_addr(bh_socket_t socket, bool *is_enabled)
523523
int
524524
os_socket_set_reuse_port(bh_socket_t socket, bool is_enabled)
525525
{
526+
#if defined(SO_REUSEPORT) /* NuttX doesn't have SO_REUSEPORT */
526527
return os_socket_setbooloption(socket, SOL_SOCKET, SO_REUSEPORT,
527528
is_enabled);
529+
#else
530+
errno = ENOTSUP;
531+
return BHT_ERROR;
532+
#endif /* defined(SO_REUSEPORT) */
528533
}
529534

530535
int
531536
os_socket_get_reuse_port(bh_socket_t socket, bool *is_enabled)
532537
{
538+
#if defined(SO_REUSEPORT) /* NuttX doesn't have SO_REUSEPORT */
533539
return os_socket_getbooloption(socket, SOL_SOCKET, SO_REUSEPORT,
534540
is_enabled);
541+
#else
542+
errno = ENOTSUP;
543+
return BHT_ERROR;
544+
#endif /* defined(SO_REUSEPORT) */
535545
}
536546

537547
int
@@ -967,4 +977,4 @@ os_socket_addr_remote(bh_socket_t socket, bh_sockaddr_t *sockaddr)
967977

968978
return sockaddr_to_bh_sockaddr((struct sockaddr *)&addr_storage, addr_len,
969979
sockaddr);
970-
}
980+
}

core/shared/platform/nuttx/platform_internal.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
#include <unistd.h>
2323
#include <math.h>
2424
#include <sys/ioctl.h>
25+
#include <sys/socket.h>
2526
#include <sys/stat.h>
2627
#include <sys/time.h>
2728
#include <sys/mman.h>

0 commit comments

Comments
 (0)