From 6c1a6c62bb13d09a0beb51ebb5cd5e4a69d9fe5a Mon Sep 17 00:00:00 2001
From: hovertank3d <isk@lzcnt.space>
Date: Thu, 13 Nov 2025 23:28:40 +0100
Subject: tidy up a bit

---
 include/net/client.hpp |  3 ++-
 include/net/conn.hpp   |  3 ++-
 include/net/server.hpp |  3 ++-
 include/net/types.hpp  | 14 ++++----------
 src/kill_proxy.cpp     | 22 +---------------------
 5 files changed, 11 insertions(+), 34 deletions(-)

diff --git a/include/net/client.hpp b/include/net/client.hpp
index 234ca90..23d250b 100644
--- a/include/net/client.hpp
+++ b/include/net/client.hpp
@@ -1,6 +1,5 @@
 #pragma once
 
-#include "net/conn.hpp"
 #include <cerrno>
 #include <cstdio>
 #include <cstdlib>
@@ -19,6 +18,8 @@
 #include <sys/wait.h>
 #include <unistd.h>
 
+#include "net/conn.hpp"
+
 namespace net {
 
 class client {
diff --git a/include/net/conn.hpp b/include/net/conn.hpp
index 6569973..95992ed 100644
--- a/include/net/conn.hpp
+++ b/include/net/conn.hpp
@@ -3,10 +3,11 @@
 #include <cstdint>
 #include <functional>
 #include <map>
-#include <netinet/in.h>
 #include <span>
 #include <vector>
 
+#include <netinet/in.h>
+
 #include "net/packet.hpp"
 
 namespace net {
diff --git a/include/net/server.hpp b/include/net/server.hpp
index 9a27a25..30791fc 100644
--- a/include/net/server.hpp
+++ b/include/net/server.hpp
@@ -1,6 +1,5 @@
 #pragma once
 
-#include "net/conn.hpp"
 #include <cerrno>
 #include <cstdio>
 #include <cstdlib>
@@ -19,6 +18,8 @@
 #include <sys/wait.h>
 #include <unistd.h>
 
+#include "net/conn.hpp"
+
 namespace net {
 
 class server {
diff --git a/include/net/types.hpp b/include/net/types.hpp
index 8f0e383..a4a8c3b 100644
--- a/include/net/types.hpp
+++ b/include/net/types.hpp
@@ -1,16 +1,10 @@
 #pragma once
 
-#include <array>
-#include <cassert>
-#include <concepts>
-#include <cstddef>
-#include <cstdint>
-#include <cstdio>
-#include <cstring>
-#include <span>
 #include <string>
-#include <sys/types.h>
 #include <vector>
+#include <array>
+#include <span>
+#include <cstring>
 
 #include "util/bitset.hpp"
 #include "util/endian.hpp"
@@ -25,7 +19,7 @@ template <class T>
 concept packet = requires(T x) { x.packet_id; };
 
 template <class T>
-concept compressed_packet = requires(T x) { packet<T>&& x.compressed; };
+concept compressed_packet = packet<T> && requires(T x) { x.compressed; };
 
 template <class T>
 concept netmodule = requires(T x) { x.module_id; };
diff --git a/src/kill_proxy.cpp b/src/kill_proxy.cpp
index 82723e1..e72848f 100644
--- a/src/kill_proxy.cpp
+++ b/src/kill_proxy.cpp
@@ -1,30 +1,10 @@
-#include <arpa/inet.h>
-#include <bitset>
-#include <concepts>
-#include <cstdint>
-#include <fcntl.h>
-#include <format>
-#include <iostream>
-#include <netdb.h>
-#include <netinet/in.h>
-#include <ostream>
-#include <stdlib.h>
-#include <sys/socket.h>
-#include <sys/time.h>
-#include <sys/types.h>
-#include <sys/uio.h>
-#include <sys/wait.h>
 #include <thread>
-#include <unistd.h>
-#include <utility>
 
 #include "net/client.hpp"
 #include "net/conn.hpp"
 #include "net/server.hpp"
 #include "net/types.hpp"
 
-using net::packet::operator""_ns;
-
 template <typename T, T... ints>
 void forward_packets(net::conn& dst, net::conn& src, std::integer_sequence<T, ints...> int_seq)
 {
@@ -47,7 +27,7 @@ int main(int argc, char* argv[])
 	auto proxy_conn = proxy.accept();
 
 	uint8_t slot;
-	server_conn.reg_handler<net::packet::accept>([=, &slot](auto& a) {
+	server_conn.reg_handler<net::packet::accept>([&slot](auto& a) {
 		slot = a.client_id;
 		return false;
 	});
-- 
cgit v1.2.3