fix uds sockets (#8)

Author: jacnils

.idea/editor.xml

@@ -0,0 +1 @@
+*build*

examples/cpp/uds_server/.gitignore

@@ -0,0 +1,15 @@
+cmake_minimum_required(VERSION 3.11)
+
+project(netkit-example LANGUAGES CXX)
+set(CMAKE_CXX_STANDARD 23)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_CXX_EXTENSIONS OFF)
+set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
+
+find_package(netkit)
+
+add_executable(
+        netkit-example
+        main.cpp
+)
+target_link_libraries(netkit-example PRIVATE netkit::netkit)

examples/cpp/uds_server/CMakeLists.txt

@@ -0,0 +1,20 @@
+#include <iostream>
+#include <fstream>
+#include <string_view>
+#include <netkit/netkit.hpp>
+
+int main() {
+    netkit::sock::addr addr("/tmp/test.sock");
+    netkit::sock::sync_sock sock(addr, netkit::sock::type::unix);
+
+    sock.bind();
+    sock.listen();
+    
+    while (true) {
+    	auto rec = sock.accept();
+	auto buffer = rec->recv().data;
+	std::cout << buffer << "\n";
+    }
+
+    return 0;
+}

examples/cpp/uds_server/main.cpp

@@ -423,6 +423,9 @@ namespace netkit::http::server {
                 }
 
                 for (const auto& it : response.headers) {
+                    if (it.name == "Content-Length") {
+                        continue;
+                    }
                     net_response << it.name << ": " << it.data << "\r\n";
                 }
 

include/netkit/http/request_handler.hpp

@@ -39,9 +39,9 @@ netkit::sock::addr netkit::sock::get_peer(fd_t sockfd) {
         inet_ntop(AF_INET, &(addr_in->sin_addr), ip_str, sizeof(ip_str));
         port = ntohs(addr_in->sin_port);
     } else if (addr_storage.ss_family == AF_INET6) {
-        auto* addr_in6 = reinterpret_cast<sockaddr_in6*>(&addr_storage);
-        inet_ntop(AF_INET6, &(addr_in6->sin6_addr), ip_str, sizeof(ip_str));
-        port = ntohs(addr_in6->sin6_port);
+	    auto* addr_in6 = reinterpret_cast<sockaddr_in6*>(&addr_storage);
+    	inet_ntop(AF_INET6, &(addr_in6->sin6_addr), ip_str, sizeof(ip_str));
+    	port = ntohs(addr_in6->sin6_port);
     } else {
         throw ip_error("unsupported address family");
     }

src/sock/sock_peer.cpp

@@ -180,9 +180,11 @@ void netkit::sock::sync_sock::set_sock_opts(opt opts) const {
 netkit::sock::sync_sock::sync_sock(const sock::addr& addr, sock::type t, opt opts) : addr_(addr), type_(t) {
     this->sockfd = -1;
 
-    if (addr.get_ip().empty() && !addr.is_file_path()) {
-        throw socket_error("IP address/file path is empty");
-    }
+	if (!addr.is_file_path()) {
+		if (addr.get_ip().empty()) {
+			throw socket_error("IP address/file path is empty");
+		}
+	}
 
     if (t != type::unix) {
         this->sockfd = ::socket(addr.is_ipv6() ? AF_INET6 : AF_INET,
@@ -363,6 +365,10 @@ std::unique_ptr<netkit::sock::basic_sync_sock> netkit::sock::sync_sock::accept()
         throw socket_error("failed to accept connection: " + std::string(strerror(errno)));
     }
 
+	if (this->type_ == type::unix) {
+		return std::make_unique<sync_sock>(client_sockfd, sock::addr(reinterpret_cast<const sockaddr_un*>(&client_addr)->sun_path), this->type_);
+	}
+
     auto peer = sock::get_peer(client_sockfd);
 
     return std::make_unique<sync_sock>(client_sockfd, peer, this->type_);

src/sock/sync_sock.cpp

@@ -5,6 +5,7 @@
 #include <catch2/catch_test_macros.hpp>
 #include <set>
 #include <unordered_set>
+#include <thread>
 
 TEST_CASE("Ensure addr works", "[sock_addr]") {
 	netkit::sock::addr addr("google.com", 443, netkit::sock::addr_type::hostname);
@@ -128,4 +129,47 @@ TEST_CASE("Ensure general utility functions work", "[utility]") {
 	REQUIRE(tokens[4] == "five");
 	std::string joined = netkit::utility::join(tokens, ",");
 	REQUIRE(joined == to_split);
+}
+
+TEST_CASE("Ensure basic sockets work", "[socket]") {
+	std::thread t([]() {
+		netkit::sock::addr addr("127.0.0.1", 1337, netkit::sock::addr_type::ipv4);
+		netkit::sock::sync_sock sock(addr, netkit::sock::type::tcp);
+
+		sock.bind();
+		sock.listen();
+
+		while (true) {
+			auto result = sock.recv(-1);
+			if (result.status != netkit::sock::recv_status::success) {
+				return;
+			}
+
+			if (result.status == netkit::sock::recv_status::success) {
+				std::string data = result.data;
+				REQUIRE(data == "Hello, World!");
+				sock.send("Hello, World!");
+			}
+		}
+
+		sock.unbind();
+	});
+	t.detach();
+
+	std::this_thread::sleep_for(std::chrono::milliseconds(1000));
+
+	netkit::sock::addr addr("127.0.0.1", 1337, netkit::sock::addr_type::ipv4);
+	netkit::sock::sync_sock sock(addr, netkit::sock::type::tcp);
+
+	sock.connect();
+	sock.send("Hello, World!");
+	auto result = sock.recv(-1);
+	if (result.status == netkit::sock::recv_status::success) {
+		std::string data = result.data;
+		REQUIRE(data == "Hello, World!");
+	} else {
+		REQUIRE(false); // fail the test if we didn't receive a response
+	}
+
+	t.join();
 }