1 files changed, 10 insertions, 7 deletions
diff --git a/network-handler/networkhandler.hpp b/network-handler/networkhandler.hpp
index d0eab6f..c4930ca 100644
--- a/network-handler/networkhandler.hpp
+++ b/network-handler/networkhandler.hpp
@@ -1,7 +1,10 @@
 #pragma once
 
+#include "acceptor.hpp"
+#include "client.hpp"
+
 #include <boost/asio/io_service.hpp>
-#include <boost/asio.hpp>
+#include <boost/asio/streambuf.hpp>
 
 #include <string>
 #include <cstdint>
@@ -20,12 +23,12 @@ class NetworkHandler
 	ListenSettings const& listen_settings;
 	
 	boost::asio::io_service io_service;
-	boost::asio::ip::tcp::acceptor v4_acceptor;
-	boost::asio::ip::tcp::acceptor v6_acceptor;
-	boost::asio::ip::tcp::endpoint v4_endpoint;
-	boost::asio::ip::tcp::endpoint v6_endpoint;
-	
-	std::list<boost::asio::ip::tcp::socket> accepted_connections;
+	Acceptor v4_acceptor;
+	Acceptor v6_acceptor;
+
+	boost::asio::streambuf stdin_buffer;
+
+	std::list<Client> clients;
 
 public:
 	NetworkHandler(ListenSettings const& listen_settings);