From 4add299ee6c53d0c3f1a9a937386c2ca1207e3df Mon Sep 17 00:00:00 2001
From: Egor <egor@patchysicp.xyz>
Date: Fri, 13 Jun 2025 03:15:00 +0300
Subject: [PATCH] just use perror and close

---
 src/main.cpp    | 18 +++++++++---------
 src/net.cpp     |  2 +-
 src/netpoll.cpp |  2 +-
 src/netsock.h   |  2 --
 4 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index b7fb208..d9e116a 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -53,15 +53,15 @@ static listener create_listen_sock(const char *ip, const char *port, struct tls
 
 	uv_os_sock_t fd = socket(ai.ai_family, ai.ai_socktype | SOCK_CLOEXEC | SOCK_NONBLOCK, ai.ai_protocol);
 	if(fd == -1)
-		net_perror("socket"), exit(1);
+		perror("socket"), exit(1);
 	if (setsockint(fd, SOL_SOCKET, SO_REUSEADDR, 1) == -1)
-		net_perror("setsockopt(SO_REUSEADDR)"), exit(1);
+		perror("setsockopt(SO_REUSEADDR)"), exit(1);
 	if (ai.ai_family == AF_INET6 && setsockint(fd, IPPROTO_IPV6, IPV6_V6ONLY, 1) == -1)
-		net_perror("setsockopt(IPV6_V6ONLY)"), exit(1);
+		perror("setsockopt(IPV6_V6ONLY)"), exit(1);
 	if (bind(fd, ai.ai_addr, ai.ai_addrlen) == -1)
-		net_perror("bind"), exit(1);
+		perror("bind"), exit(1);
 	if (listen(fd, SOMAXCONN) == -1)
-		net_perror("listen"), exit(1);
+		perror("listen"), exit(1);
 	return listener{fd, ctx};
 }
 
@@ -73,7 +73,7 @@ static void accept_from_sock(struct listener *listener)
 		uv_os_sock_t fd = accept4(listener->fd, (struct sockaddr *)&addr, &len, SOCK_CLOEXEC | SOCK_NONBLOCK);
 		if (fd == -1) {
 			if (!net_wouldblock())
-				net_perror("accept4");
+				perror("accept4");
 			break;
 		}
 
@@ -97,7 +97,7 @@ static void accept_from_sock(struct listener *listener)
 			struct sockaddr_storage sockname;
 			socklen_t socknamelen = sizeof(sockname);
 			if (getsockname(fd, (struct sockaddr *)&sockname, &socknamelen) == -1)
-				net_perror("getsockname"), abortf("getsockname failure during accept");
+				perror("getsockname"), abortf("getsockname failure during accept");
 			if (sockname.ss_family == AF_INET) {
 				struct in_addr *ia = &((struct sockaddr_in *)&sockname)->sin_addr;
 				// onion if connecting to 127.0.0.2
@@ -136,7 +136,7 @@ static void accept_from_sock(struct listener *listener)
 		if (listener->ctx) {
 #ifdef HAVE_LIBTLS
 			if (tls_accept_socket(listener->ctx, &cctx, fd) == -1) {
-				closesocket(fd);
+				close(fd);
 				fprintf(stderr, "tls_accept_socket: %s\n", tls_error(listener->ctx));
 				continue;
 			}
@@ -175,7 +175,7 @@ static void determine_hostname(void)
 	static char buf[256];
 	if (!hostname) {
 		if (gethostname(buf, 255) == -1) {
-			net_perror("gethostname");
+			perror("gethostname");
 			hostname = "localhost";
 		} else {
 			hostname = buf;
diff --git a/src/net.cpp b/src/net.cpp
index 1b97a44..162ea0c 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -188,7 +188,7 @@ void recvProc(struct client_data *cl) {
 				// Error
 				case -1:
 					if(!net_wouldblock()){
-						net_perror("recv");
+						perror("recv");
 						killConnection(cl, 0);
 					} else {
 						update_poll_reg(cl);
diff --git a/src/netpoll.cpp b/src/netpoll.cpp
index 2f03008..721bff2 100644
--- a/src/netpoll.cpp
+++ b/src/netpoll.cpp
@@ -104,7 +104,7 @@ void del_and_close(uv_os_sock_t fd)
 	pollfd *pfd = *it;
 	uv_close((uv_handle_t *)&pfd->handle, [](uv_handle_t *handle){
 		pollfd *pfd = container_of(handle, pollfd, handle);
-		closesocket(pfd->fd);
+		close(pfd->fd);
 		delete pfd;
 	});
 
diff --git a/src/netsock.h b/src/netsock.h
index bb5aa00..1966477 100644
--- a/src/netsock.h
+++ b/src/netsock.h
@@ -46,7 +46,5 @@
 #include <fcntl.h>
 #include <signal.h>
 #define PRISocket "d"
-#define net_perror(p) (perror((p)))
 #define net_wouldblock() (errno == EAGAIN || errno == EWOULDBLOCK)
-#define closesocket close
 #endif
-- 
2.56.0