teoncreative · irrld · Dec 24, 2025 · Dec 11, 2025 · Dec 23, 2025 · Dec 24, 2025
diff --git a/TODO b/TODO
@@ -34,4 +34,13 @@
 - [ ] Metrics
 - [ ] Graceful Disconnects (?)
 - [ ] Version Negotiation (?)
-- [ ] Feature flag Negotiation (?)
+- [ ] Feature flag Negotiation (?)
+- [ ] Automatic serialization of non-complex types
+- [ ] Fully asynchronous P2P hole punching using an event-driven I/O model.
+- [ ] Add `UDPTransportLayer` and UDP client/server backends, including UDP hole punching for P2P.
+- [ ] Enhance error events for P2P connection failures with granular, actionable reasons.
+- [ ] Check if PeerLocator's destructor automatically joins its internal thread.
+- [ ] Document thread-safety guarantees and concurrency model for all public APIs.
+- [ ] Comprehensive performance benchmarks and conduct memory usage profiling.
+- [ ] Security audit for the encryption layer
+- [x] Refactor znet.h into smaller, modular headers for specific functionalities.
diff --git a/examples/basic/client/main.cc b/examples/basic/client/main.cc
@@ -8,9 +8,16 @@
 //        http://www.apache.org/licenses/LICENSE-2.0
 //
 
-#include <iostream>
+#include "znet/packet_handler.h"
+#include "znet/peer_session.h"
+#include "znet/init.h"
+#include "znet/client_events.h"
+#include "znet/codec.h"
+#include "znet/client.h"
+
 #include "packets.h"
-#include "znet/znet.h"
+
+#include <iostream>
 
 using namespace znet;
 

diff --git a/examples/basic/common/packets.h b/examples/basic/common/packets.h
@@ -10,7 +10,7 @@
 
 #pragma once
 
-#include "znet/znet.h"
+#include "../../../znet/include/znet/packet.h"
 
 using namespace znet;
 

diff --git a/examples/basic/server/main.cc b/examples/basic/server/main.cc
@@ -8,8 +8,17 @@
 //        http://www.apache.org/licenses/LICENSE-2.0
 //
 
+#include "znet/packet_handler.h"
+#include "znet/peer_session.h"
+#include "znet/init.h"
+#include "znet/server_events.h"
+#include "znet/codec.h"
+#include "znet/server.h"
+#include "znet/signal_handler.h"
+
 #include "packets.h"
-#include "znet/znet.h"
+
+#include <iostream>
 
 using namespace znet;
 

diff --git a/examples/multiversion/client-v1/main.cc b/examples/multiversion/client-v1/main.cc
@@ -8,18 +8,18 @@
 //        http://www.apache.org/licenses/LICENSE-2.0
 //
 
-#include <iostream>
-#include "packets.h"
-#include "znet/znet.h"
-
-using namespace znet;
+#include "znet/packet_handler.h"
+#include "znet/peer_session.h"
+#include "znet/init.h"
+#include "znet/client_events.h"
+#include "znet/codec.h"
+#include "znet/client.h"
 
-
-#include <iostream>
 #include "packets.h"
-#include "znet/znet.h"
 #include "player.h"
 
+#include <iostream>
+
 using namespace znet;
 
 Codecs codecs_;

diff --git a/examples/multiversion/client-v2/main.cc b/examples/multiversion/client-v2/main.cc
@@ -8,18 +8,18 @@
 //        http://www.apache.org/licenses/LICENSE-2.0
 //
 
-#include <iostream>
-#include "packets.h"
-#include "znet/znet.h"
-
-using namespace znet;
+#include "znet/packet_handler.h"
+#include "znet/peer_session.h"
+#include "znet/init.h"
+#include "znet/client_events.h"
+#include "znet/codec.h"
+#include "znet/client.h"
 
-
-#include <iostream>
 #include "packets.h"
-#include "znet/znet.h"
 #include "player.h"
 
+#include <iostream>
+
 using namespace znet;
 
 Codecs codecs_;

diff --git a/examples/multiversion/common/packets.h b/examples/multiversion/common/packets.h
@@ -10,7 +10,9 @@
 
 #pragma once
 
-#include "znet/znet.h"
+#include "znet/codec.h"
+#include "znet/packet_handler.h"
+#include "znet/types.h"
 #include "types.h"
 
 using namespace znet;

diff --git a/examples/multiversion/server/main.cc b/examples/multiversion/server/main.cc
@@ -8,10 +8,19 @@
 //        http://www.apache.org/licenses/LICENSE-2.0
 //
 
-#include <algorithm>
-#include <unordered_map>
+
+#include "znet/client.h"
+#include "znet/codec.h"
+#include "znet/init.h"
+#include "znet/packet_handler.h"
+#include "znet/peer_session.h"
+#include "znet/server_events.h"
+#include "znet/server.h"
+#include "znet/signal_handler.h"
+
 #include "packets.h"
-#include "znet/znet.h"
+
+#include <algorithm>
 
 using namespace znet;
 

diff --git a/examples/p2p/main.cc b/examples/p2p/main.cc
@@ -8,12 +8,14 @@
 //        http://www.apache.org/licenses/LICENSE-2.0
 //
 
-#include <utility>
+#include "znet/p2p.h"
+#include "znet/packet_handler.h"
+#include "znet/peer_session.h"
+#include "znet/init.h"
 
+#include <utility>
 #include <deque>
 #include "cxxopts.h"
-#include "znet/znet.h"
-#include "znet/base/inet_addr.h"
 
 using namespace znet;
 

diff --git a/rendezvous-server/main.cc b/rendezvous-server/main.cc
@@ -8,13 +8,18 @@
 //        http://www.apache.org/licenses/LICENSE-2.0
 //
 
-#include <utility>
+#include "znet/p2p.h"
+#include "znet/p2p/rendezvous.h"
+#include "znet/packet_handler.h"
+#include "znet/peer_session.h"
+#include "znet/server_events.h"
+#include "znet/init.h"
+
+#include "cxxopts.h"
 
+#include <utility>
 #include <deque>
 #include <random>
-#include "cxxopts.h"
-#include "znet/p2p/rendezvous.h"
-#include "znet/znet.h"
 
 struct UserData {
   std::shared_ptr<znet::PeerSession> session_;

diff --git a/tests/buffer.cc b/tests/buffer.cc
@@ -9,8 +9,8 @@
 //
 
 #define ZNET_BUFFER_COUNT_MEMORY_ALLOCATIONS
-#include "znet/znet.h"
 
+#include "znet/buffer.h"
 #include "gtest/gtest.h"
 
 using namespace znet;

diff --git a/znet/include/znet/backends/tcp.h b/znet/include/znet/backends/tcp.h
@@ -27,7 +27,7 @@ namespace backends {
 class TCPTransportLayer : public TransportLayer {
  public:
   TCPTransportLayer(SocketHandle socket);
-  ~TCPTransportLayer();
+  ~TCPTransportLayer() override;
 
   std::shared_ptr<Buffer> Receive() override;
   bool Send(std::shared_ptr<Buffer> buffer, SendOptions options = {}) override;

diff --git a/znet/include/znet/buffer.h b/znet/include/znet/buffer.h
@@ -10,11 +10,12 @@
 
 #pragma once
 
-#include "znet/precompiled.h"
-#include "znet/base/types.h"
+#include "znet/inet_addr.h"
+#include "znet/types.h"
+#include "znet/util.h"
 #include "znet/logger.h"
-#include "znet/base/util.h"
-#include "znet/base/inet_addr.h"
+#include "znet/precompiled.h"
+
 #include <bitset>
 
 namespace znet {

diff --git a/znet/include/znet/client.h b/znet/include/znet/client.h
@@ -10,7 +10,7 @@
 
 #pragma once
 
-#include <znet/backends/backend.h>
+#include "znet/backends/backend.h"
 #include "znet/interface.h"
 #include "znet/peer_session.h"
 #include "znet/precompiled.h"
@@ -34,8 +34,7 @@ class Client : public Interface {
  public:
   Client(const ClientConfig& config);
   Client(const Client&) = delete;
-
-  ~Client();
+  ~Client() override;
 
   /**
    * @brief Binds client to configured IP address and port. This function is not thread-safe.

diff --git a/znet/include/znet/client_events.h b/znet/include/znet/client_events.h
@@ -13,7 +13,7 @@
 
 #include "znet/precompiled.h"
 #include "znet/peer_session.h"
-#include "znet/base/event.h"
+#include "znet/event.h"
 
 namespace znet {
 

diff --git a/znet/include/znet/close_options.h b/znet/include/znet/close_options.h
@@ -15,7 +15,6 @@
 #ifndef ZNET_PARENT_CLOSE_OPTIONS_H
 #define ZNET_PARENT_CLOSE_OPTIONS_H
 
-
 #include "znet/precompiled.h"
 #include <cstdint>
 #include <type_traits>

diff --git a/znet/include/znet/codec.h b/znet/include/znet/codec.h
@@ -12,10 +12,10 @@
 #define ZNET_PARENT_CODEC_H
 
 #include "znet/precompiled.h"
-#include "znet/base/packet.h"
-#include "znet/packet_serializer.h"
-#include "znet/packet_handler.h"
+#include "znet/packet.h"
 #include "znet/buffer.h"
+#include "znet/packet_handler.h"
+#include "znet/packet_serializer.h"
 
 namespace znet {
 

diff --git a/znet/include/znet/encryption.h b/znet/include/znet/encryption.h
@@ -10,10 +10,9 @@
 
 #pragma once
 
-#include "znet/precompiled.h"
-#include "znet/base/packet.h"
-#include "znet/logger.h"
+#include "znet/packet.h"
 #include "znet/packet_handler.h"
+#include "znet/precompiled.h"
 
 #include <openssl/dh.h>
 #include <openssl/engine.h>

diff --git a/znet/include/znet/error.h b/znet/include/znet/error.h
@@ -1,5 +1,5 @@
 //
-//    Copyright 2024 Metehan Gezer
+//    Copyright 2025 Metehan Gezer
 //
 //    Licensed under the Apache License, Version 2.0 (the "License");
 //    you may not use this file except in compliance with the License.
@@ -8,8 +8,12 @@
 //        http://www.apache.org/licenses/LICENSE-2.0
 //
 
-#pragma once
+#ifndef ZNET_PARENT_ERROR_H
+#define ZNET_PARENT_ERROR_H
 
 #include "znet/precompiled.h"
 
-std::string GetLastErrorInfo();
+std::string GetLastErrorInfo();
+
+#endif
+
diff --git a/znet/include/znet/base/event.h → znet/include/znet/event.h b/znet/include/znet/base/event.h → znet/include/znet/event.h
diff --git a/znet/include/znet/base/inet_addr.h → znet/include/znet/inet_addr.h b/znet/include/znet/base/inet_addr.h → znet/include/znet/inet_addr.h
@@ -1,5 +1,5 @@
 //
-//    Copyright 2023 Metehan Gezer
+//    Copyright 2025 Metehan Gezer
 //
 //    Licensed under the Apache License, Version 2.0 (the "License");
 //    you may not use this file except in compliance with the License.
@@ -11,7 +11,7 @@
 #pragma once
 
 #include "znet/precompiled.h"
-#include "znet/base/types.h"
+#include "znet/types.h"
 
 namespace znet {
 

diff --git a/znet/include/znet/init.h b/znet/include/znet/init.h
@@ -16,7 +16,7 @@
 #define ZNET_PARENT_SOCKET_GUARD_H
 
 #include "znet/precompiled.h"
-#include "znet/base/types.h"
+#include "znet/types.h"
 
 namespace znet {
 

diff --git a/znet/include/znet/interface.h b/znet/include/znet/interface.h
@@ -10,11 +10,11 @@
 
 #pragma once
 
-#include <utility>
-
-#include "znet/precompiled.h"
-#include "znet/base/event.h"
+#include "znet/event.h"
 #include "znet/packet_handler.h"
+#include "znet/precompiled.h"
+
+#include <utility>
 
 namespace znet {
 

diff --git a/znet/include/znet/p2p.h b/znet/include/znet/p2p.h
@@ -0,0 +1,21 @@
+//
+//    Copyright 2025 Metehan Gezer
+//
+//    Licensed under the Apache License, Version 2.0 (the "License");
+//    you may not use this file except in compliance with the License.
+//    You may obtain a copy of the License at
+//
+//        http://www.apache.org/licenses/LICENSE-2.0
+//
+
+//
+// Created by Metehan Gezer on 22.12.2025.
+//
+
+#ifndef ZNET_PARENT_P2P_H
+#define ZNET_PARENT_P2P_H
+
+#include "znet/p2p/dialer.h"
+#include "znet/p2p/locator.h"
+
+#endif  //ZNET_PARENT_P2P_H
diff --git a/znet/include/znet/p2p/dialer.h b/znet/include/znet/p2p/dialer.h
@@ -15,10 +15,9 @@
 #ifndef ZNET_PARENT_PUNCH_H
 #define ZNET_PARENT_PUNCH_H
 
-#include "znet/base/inet_addr.h"
+#include "znet/inet_addr.h"
 #include "znet/peer_session.h"
 #include "znet/precompiled.h"
-#include "znet/error.h"
 
 namespace znet {
 namespace p2p {

diff --git a/znet/include/znet/p2p/locator.h b/znet/include/znet/p2p/locator.h
@@ -15,7 +15,7 @@
 #ifndef ZNET_PARENT_LOCATOR_H
 #define ZNET_PARENT_LOCATOR_H
 
-#include "znet/base/event.h"
+#include "znet/event.h"
 #include "znet/client.h"
 #include "znet/client_events.h"
 #include "znet/precompiled.h"