diff options
| author | 2025-04-17 09:52:19 -0400 | |
|---|---|---|
| committer | 2025-04-17 09:52:19 -0400 | |
| commit | 65d25cd7796a473ce669a1f61da7961b8baf479a (patch) | |
| tree | 9a523765d8e813f5be83211dfad927ca6b9a40ea /src/socket | |
| parent | de6f6090f94b14ed98dac71956ff1bede48f1d8e (diff) | |
| download | libnaunet-65d25cd7796a473ce669a1f61da7961b8baf479a.tar.gz libnaunet-65d25cd7796a473ce669a1f61da7961b8baf479a.tar.bz2 libnaunet-65d25cd7796a473ce669a1f61da7961b8baf479a.zip | |
Log changes, reject mmap() with size 0
- Add file_flush().
Signed-off-by: Andrew Opalach <andrew@akon.city>
Diffstat (limited to 'src/socket')
| -rw-r--r-- | src/socket/socket_linux.c | 20 | ||||
| -rw-r--r-- | src/socket/socket_windows.c | 14 |
2 files changed, 17 insertions, 17 deletions
diff --git a/src/socket/socket_linux.c b/src/socket/socket_linux.c index b2d76a8..c05a026 100644 --- a/src/socket/socket_linux.c +++ b/src/socket/socket_linux.c @@ -46,7 +46,7 @@ bool nn_socket_init(struct nn_socket *sock, s32 flags) } if (sock->fd < 0) { - error("socket() failed: %s (%d).", nn_strerror(errno), errno); + log_error("socket() failed: %s (%d).", nn_strerror(errno), errno); return false; } @@ -120,7 +120,7 @@ static bool parse_address(struct nn_socket *sock, str *addr, u16 port) s32 status = getaddrinfo(c_str, port_str, &hints, &sock->addrinfo); al_free(c_str); if (status != 0) { - error("Failed to parse address (%s).", gai_strerror(status)); + log_error("Failed to parse address (%s).", gai_strerror(status)); return false; } @@ -161,11 +161,11 @@ bool nn_socket_bind(struct nn_socket *sock, str *addr, u16 port) } if (bind(sock->fd, saddr, addrlen) < 0) { - error("bind(%.*s:%hu) failed: %s (%d).", nn_addr_x(addr), port, nn_strerror(errno), errno); + log_error("bind(%.*s:%hu) failed: %s (%d).", nn_addr_x(addr), port, nn_strerror(errno), errno); return false; } - info("Socket bound to %.*s:%hu.", nn_addr_x(addr), port); + log_info("Socket bound to %.*s:%hu.", nn_addr_x(addr), port); return true; } @@ -175,11 +175,11 @@ bool nn_socket_listen(struct nn_socket *sock) al_assert(sock->type == NNWT_SOCKET_TCP || sock->type == NNWT_SOCKET_UNIX); if (listen(sock->fd, SOMAXCONN) < 0) { - error("listen() failed: %s (%d).", nn_strerror(errno), errno); + log_error("listen() failed: %s (%d).", nn_strerror(errno), errno); return false; } - info("Listening."); + log_info("Listening."); return true; } @@ -192,7 +192,7 @@ bool nn_socket_accept(struct nn_socket *sock, struct nn_socket *cl, s32 flags) struct sockaddr_storage addr = { 0 }; socklen_t addrlen = sizeof(addr); if ((cl->fd = accept(sock->fd, (struct sockaddr *)&addr, &addrlen)) == -1) { - error("accept() failed: %s (%d).", nn_strerror(errno), errno); + log_error("accept() failed: %s (%d).", nn_strerror(errno), errno); return false; } @@ -213,11 +213,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)); } - info("Connection from %s:%hu.", addr_str, port); + log_info("Connection from %s:%hu.", addr_str, port); break; } case NNWT_SOCKET_UNIX: - info("Connection on UNIX socket."); + log_info("Connection on UNIX socket."); break; } @@ -245,7 +245,7 @@ bool nn_socket_connect(struct nn_socket *sock, str *addr, u16 port) al_assert_and_return(false); } if (ret != 0 && errno != EINPROGRESS) { - error("connect(%.*s:%hu) failed: %s (%d).", nn_addr_x(addr), port, nn_strerror(errno), errno); + log_error("connect(%.*s:%hu) failed: %s (%d).", nn_addr_x(addr), port, nn_strerror(errno), errno); return false; } return true; diff --git a/src/socket/socket_windows.c b/src/socket/socket_windows.c index 68a7700..544ec92 100644 --- a/src/socket/socket_windows.c +++ b/src/socket/socket_windows.c @@ -16,7 +16,7 @@ bool nn_socket_init(struct nn_socket *sock, s32 flags) } if (sock->fd == INVALID_SOCKET) { - error("socket() failed: %d.", WSAGetLastError()); + log_error("socket() failed: %d.", WSAGetLastError()); return false; } @@ -57,11 +57,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) { - error("bind(%.*s:%hu) failed: %d.", nn_addr_x(addr), port, WSAGetLastError()); + log_error("bind(%.*s:%hu) failed: %d.", nn_addr_x(addr), port, WSAGetLastError()); return false; } - info("Socket bound to %.*s:%hu.", nn_addr_x(addr), port); + log_info("Socket bound to %.*s:%hu.", nn_addr_x(addr), port); return true; } @@ -69,11 +69,11 @@ bool nn_socket_bind(struct nn_socket *sock, str *addr, u16 port) bool nn_socket_listen(struct nn_socket *sock) { if (listen(sock->fd, SOMAXCONN) == SOCKET_ERROR) { - error("listen() failed: %d.", WSAGetLastError()); + log_error("listen() failed: %d.", WSAGetLastError()); return false; } - info("Listening."); + log_info("Listening."); return true; } @@ -82,7 +82,7 @@ bool nn_socket_accept(struct nn_socket *sock, struct nn_socket *cl, s32 flags) { cl->type = sock->type; if ((cl->fd = accept(sock->fd, NULL, NULL)) == INVALID_SOCKET) { - error("accept() failed: %d.", WSAGetLastError()); + log_error("accept() failed: %d.", WSAGetLastError()); return false; } @@ -105,7 +105,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) { - error("connect() failed: %d.", WSAGetLastError()); + log_error("connect() failed: %d.", WSAGetLastError()); return false; } |