From cef6cabce7ae97e9edfb6821ce4393d714579866 Mon Sep 17 00:00:00 2001 From: Andrew Opalach Date: Fri, 17 Jan 2025 11:28:50 -0500 Subject: Incorporate libalabaster changes, Windows fixes Signed-off-by: Andrew Opalach --- src/socket/socket_internal.h | 6 +++--- src/socket/socket_linux.c | 10 +++++----- src/socket/socket_windows.c | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) (limited to 'src/socket') diff --git a/src/socket/socket_internal.h b/src/socket/socket_internal.h index 193fa43..b79e888 100644 --- a/src/socket/socket_internal.h +++ b/src/socket/socket_internal.h @@ -4,13 +4,13 @@ #include "socket.h" -static str *ipany = al_str_c("0.0.0.0"); +static str ipany = al_str_c("0.0.0.0"); static inline str *nn_socket_display_addr(str *addr) { - return addr ? addr : ipany; + return addr ? addr : &ipany; } -#define nn_socket_printf_addr(addr) AL_STR_PRINTF(nn_socket_display_addr(addr)) +#define nn_socket_fmt_addr(addr) al_str_fmt(nn_socket_display_addr(addr)) static inline void nn_socket_apply_flags(struct nn_socket *sock, s32 flags) { diff --git a/src/socket/socket_linux.c b/src/socket/socket_linux.c index 0dadfbe..2d032f3 100644 --- a/src/socket/socket_linux.c +++ b/src/socket/socket_linux.c @@ -159,11 +159,11 @@ bool nn_socket_bind(struct nn_socket *sock, str *addr, u16 port) if (bind(sock->fd, saddr, addrlen) < 0) { al_log_error("socket", "bind(%.*s:%hu) failed: %s (%d).", - nn_socket_printf_addr(addr), port, nn_strerror(errno), errno); + nn_socket_fmt_addr(addr), port, nn_strerror(errno), errno); return false; } - al_log_info("socket", "Socket bound to %.*s:%hu.", nn_socket_printf_addr(addr), port); + al_log_info("socket", "Socket bound to %.*s:%hu.", nn_socket_fmt_addr(addr), port); return true; } @@ -235,8 +235,8 @@ bool nn_socket_connect(struct nn_socket *sock, str *addr, u16 port) break; case NNWT_SOCKET_UNIX: sock->addr_un.sun_family = AF_UNIX; - al_memcpy(sock->addr_un.sun_path, addr->data, addr->len); - sock->addr_un.sun_path[addr->len] = '\0'; + al_memcpy(sock->addr_un.sun_path, addr->data, addr->length); + sock->addr_un.sun_path[addr->length] = '\0'; ret = connect(sock->fd, (struct sockaddr *)&sock->addr_un, sizeof(sock->addr_un)); break; default: @@ -245,7 +245,7 @@ bool nn_socket_connect(struct nn_socket *sock, str *addr, u16 port) if (ret != 0 && errno != EINPROGRESS) { al_log_error("socket", "connect(%.*s:%hu) failed: %s (%d).", - nn_socket_printf_addr(addr), port, nn_strerror(errno), errno); + nn_socket_fmt_addr(addr), port, nn_strerror(errno), errno); return false; } diff --git a/src/socket/socket_windows.c b/src/socket/socket_windows.c index 28e6dc5..ef7f3bd 100644 --- a/src/socket/socket_windows.c +++ b/src/socket/socket_windows.c @@ -56,11 +56,11 @@ bool nn_socket_bind(struct nn_socket *sock, str *addr, u16 port) s32 ret = bind(sock->fd, (SOCKADDR *)&sock->addr_in, sizeof(sock->addr_in)); if (ret == SOCKET_ERROR) { al_log_error("socket", "bind(%.*s:%hu) failed: %d.", - nn_socket_printf_addr(addr), port, WSAGetLastError()); + nn_socket_fmt_addr(addr), port, WSAGetLastError()); return false; } - al_log_info("socket", "Socket bound to %.*s:%hu.", nn_socket_printf_addr(addr), port); + al_log_info("socket", "Socket bound to %.*s:%hu.", nn_socket_fmt_addr(addr), port); return true; } -- cgit v1.2.3-101-g0448