From 72a5e557e0de4f67df9e6ed9f719e81f4381bb9f Mon Sep 17 00:00:00 2001 From: Jacob Nilsson <166003882+jacnils@users.noreply.github.com> Date: Wed, 6 May 2026 21:19:28 +0200 Subject: [PATCH 1/5] lower cmake version requirement --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d4954f0..0a1d690 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.30) +cmake_minimum_required(VERSION 3.28) project(netkit LANGUAGES C CXX) option(NETKIT_ENABLE_OPENSSL "Enable OpenSSL support in netkit" ON) @@ -226,4 +226,4 @@ if (NETKIT_ENABLE_C_BINDINGS) endif() else() message(STATUS "C bindings disabled") -endif() \ No newline at end of file +endif() From ff6466d099e466c71dec9ce6e7b3f026813e4429 Mon Sep 17 00:00:00 2001 From: Jacob Nilsson <166003882+jacnils@users.noreply.github.com> Date: Wed, 6 May 2026 21:20:15 +0200 Subject: [PATCH 2/5] Rename SOCK_UNIX to SOCK_UDS in sock_types.h --- include/netkit-c/sock/sock_types.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/netkit-c/sock/sock_types.h b/include/netkit-c/sock/sock_types.h index 7569f48..d7220b4 100644 --- a/include/netkit-c/sock/sock_types.h +++ b/include/netkit-c/sock/sock_types.h @@ -17,7 +17,7 @@ typedef enum netkit_sock_type { SOCK_NONE, SOCK_TCP, SOCK_UDP, - SOCK_UNIX + SOCK_UDS } netkit_sock_type_t; typedef enum netkit_sock_status { @@ -52,4 +52,4 @@ typedef struct netkit_recv_result { } #endif #endif -#endif \ No newline at end of file +#endif From 3dfd233458ac9b42b5ed3b0f3cc17028e9b33622 Mon Sep 17 00:00:00 2001 From: Jacob Nilsson <166003882+jacnils@users.noreply.github.com> Date: Wed, 6 May 2026 21:21:51 +0200 Subject: [PATCH 3/5] Rename SOCK_UNIX to SOCK_UDS in get_type function --- src/c/sock/sync_sock.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/c/sock/sync_sock.cpp b/src/c/sock/sync_sock.cpp index 59b0b29..07d7c5f 100644 --- a/src/c/sock/sync_sock.cpp +++ b/src/c/sock/sync_sock.cpp @@ -12,8 +12,8 @@ struct netkit_sync_sock { switch (type) { case SOCK_UDP: return netkit::sock::type::udp; - case SOCK_UNIX: - return netkit::sock::type::unix; + case SOCK_UDS: + return netkit::sock::type::uds; default: return netkit::sock::type::tcp; } @@ -356,4 +356,4 @@ extern "C" NETKIT_C_API netkit_sock_addr_t* netkit_sync_sock_get_peer(netkit_syn } catch (...) { return nullptr; } -} \ No newline at end of file +} From f1d9120df0a6744574d1e38a643769cabe049008 Mon Sep 17 00:00:00 2001 From: Jacob Nilsson <166003882+jacnils@users.noreply.github.com> Date: Wed, 6 May 2026 21:22:30 +0200 Subject: [PATCH 4/5] Rename enum value 'unix' to 'uds' --- include/netkit/sock/addr_type.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/netkit/sock/addr_type.hpp b/include/netkit/sock/addr_type.hpp index 455c8c2..ffb77cb 100644 --- a/include/netkit/sock/addr_type.hpp +++ b/include/netkit/sock/addr_type.hpp @@ -44,7 +44,7 @@ namespace netkit::sock { enum class type { tcp, /* TCP socket */ udp, /* UDP socket */ - unix, /* UNIX domain socket */ + uds, /* UNIX domain socket */ }; /** * @brief Socket options. @@ -89,4 +89,4 @@ namespace netkit::sock { using T = std::underlying_type_t; return static_cast(lhs) & static_cast(rhs); } -} \ No newline at end of file +} From a9fec1021a8ea00b16772472472fddb77e90dfde Mon Sep 17 00:00:00 2001 From: Jacob Nilsson <166003882+jacnils@users.noreply.github.com> Date: Wed, 6 May 2026 21:23:38 +0200 Subject: [PATCH 5/5] Rename socket type from 'unix' to 'uds' --- src/sock/sync_sock.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/sock/sync_sock.cpp b/src/sock/sync_sock.cpp index 3f2bf35..ac9715c 100644 --- a/src/sock/sync_sock.cpp +++ b/src/sock/sync_sock.cpp @@ -186,7 +186,7 @@ netkit::sock::sync_sock::sync_sock(const sock::addr& addr, sock::type t, opt opt } } - if (t != type::unix) { + if (t != type::uds) { this->sockfd = ::socket(addr.is_ipv6() ? AF_INET6 : AF_INET, t == type::tcp ? SOCK_STREAM : SOCK_DGRAM, 0); } else { @@ -230,7 +230,7 @@ netkit::sock::sync_sock::sync_sock(const sock::addr& in_addr, sock::type t, opt int sock_type = SOCK_STREAM; int protocol = 0; - if (t != type::unix) { + if (t != type::uds) { domain = this->addr_.is_ipv6() ? AF_INET6 : AF_INET; sock_type = (t == type::tcp) ? SOCK_STREAM : SOCK_DGRAM; protocol = (t == type::tcp) ? IPPROTO_TCP : IPPROTO_UDP; @@ -365,7 +365,7 @@ std::unique_ptr netkit::sock::sync_sock::accept() throw socket_error("failed to accept connection: " + std::string(strerror(errno))); } - if (this->type_ == type::unix) { + if (this->type_ == type::uds) { return std::make_unique(client_sockfd, sock::addr(reinterpret_cast(&client_addr)->sun_path), this->type_); }