From a27216c145b1b13ad863e49e5400778ad608640f Mon Sep 17 00:00:00 2001 From: Andrew Opalach Date: Sat, 5 Sep 2026 19:18:44 -0400 Subject: Fix Windows locale and error messages Signed-off-by: Andrew Opalach --- src/socket/socket_linux.c | 6 +++--- src/socket/socket_windows.c | 5 ++++- 2 files changed, 7 insertions(+), 4 deletions(-) (limited to 'src/socket') diff --git a/src/socket/socket_linux.c b/src/socket/socket_linux.c index e6947c3..2634fc2 100644 --- a/src/socket/socket_linux.c +++ b/src/socket/socket_linux.c @@ -223,11 +223,11 @@ bool nn_socket_accept(struct nn_socket *sock, struct nn_socket *cl, s32 flags) port = ntohs(saddr->sin6_port); inet_ntop(AF_INET6, &saddr->sin6_addr, addr_str, sizeof(addr_str)); } - log_info("Connection from %s:%hu.", addr_str, port); + log_debug("Connection from %s:%hu.", addr_str, port); break; } case NNWT_SOCKET_UNIX: - log_info("Connection on UNIX socket."); + log_debug("Connection on UNIX socket."); break; } @@ -285,7 +285,7 @@ ssize_t nn_socket_recvfrom(struct nn_socket *sock, void *buf, size_t size) bool nn_socket_check_error(ssize_t ret) { if (ret < 0) { - log_debug("Socket error: %s (%d).", nn_strerror(errno), errno); + log_debug("Error description: %s (%d).", nn_strerror(errno), errno); return true; } return false; diff --git a/src/socket/socket_windows.c b/src/socket/socket_windows.c index 9baa312..5e3386c 100644 --- a/src/socket/socket_windows.c +++ b/src/socket/socket_windows.c @@ -114,6 +114,7 @@ bool nn_socket_connect(struct nn_socket *sock, str *addr, u16 port) s32 ret = connect(sock->fd, (SOCKADDR *)&sock->addr_in, sizeof(sock->addr_in)); if (ret == SOCKET_ERROR && WSAGetLastError() != WSAEWOULDBLOCK) { log_error("connect(%.*s:%hu) failed: %d.", nn_addr_x(addr), port, WSAGetLastError()); + nn_socket_check_error(ret); return false; } @@ -156,7 +157,9 @@ bool nn_socket_check_error(ssize_t ret) if (ret == SOCKET_ERROR) { s32 err = WSAGetLastError(); char *strerror = nn_win32_error_message(err); - log_debug("Socket error: %s (%d).", strerror ? strerror : "(None)", err); + if (strerror) { + log_error("Error description: %s (%d).", strerror, err); + } return true; } return false; -- cgit v1.2.3-101-g0448