From 5bac5321fa5ab128cee2f0b8c549945bd6a1ccfc Mon Sep 17 00:00:00 2001 From: Dennis Brentjes Date: Tue, 30 Aug 2016 16:06:04 +0200 Subject: Split NetworkHandler in a server component and a to reuse Server. Also switched from an inheritance system to composition based system for the server based classes. --- network-handler/CMakeLists.txt | 4 ++- network-handler/networkhandler.cpp | 57 +++++++++++--------------------------- network-handler/networkhandler.hpp | 23 ++++----------- network-handler/node.cpp | 21 ++++++++++++++ network-handler/node.hpp | 21 ++++++++++++++ network-handler/nodemanager.cpp | 4 +-- network-handler/server.cpp | 31 +++++++++++++++++++++ network-handler/server.hpp | 29 +++++++++++++++++++ 8 files changed, 127 insertions(+), 63 deletions(-) create mode 100644 network-handler/node.cpp create mode 100644 network-handler/node.hpp create mode 100644 network-handler/server.cpp create mode 100644 network-handler/server.hpp diff --git a/network-handler/CMakeLists.txt b/network-handler/CMakeLists.txt index dd80f6b..b4aef97 100644 --- a/network-handler/CMakeLists.txt +++ b/network-handler/CMakeLists.txt @@ -3,8 +3,10 @@ find_package(Boost COMPONENTS system program_options REQUIRED) add_executable(network-handler main.cpp - networkhandler.hpp networkhandler.cpp acceptor.hpp acceptor.cpp + server.hpp server.cpp + networkhandler.hpp networkhandler.cpp + node.hpp node.cpp client.hpp client.cpp userclient.hpp userclient.cpp nodeclient.hpp nodeclient.cpp diff --git a/network-handler/networkhandler.cpp b/network-handler/networkhandler.cpp index 874e152..916f0f2 100644 --- a/network-handler/networkhandler.cpp +++ b/network-handler/networkhandler.cpp @@ -6,53 +6,28 @@ #include #include -using namespace boost::asio::ip; -using namespace boost::asio; - NetworkHandler::NetworkHandler(const ListenSettings& listen_settings) -: listen_settings(listen_settings) -, io_service() -, v4_acceptor(io_service, address_v4::from_string(listen_settings.ipv4_inaddr), listen_settings.port) -, v6_acceptor(io_service, address_v6::from_string(listen_settings.ipv6_inaddr), listen_settings.port) +: io_service() +, server(io_service, listen_settings, [this](boost::asio::ip::tcp::socket&& socket){accept_handler(std::move(socket));}) , clients() +{} + +void NetworkHandler::accept_handler(boost::asio::ip::tcp::socket&& socket) { - auto accept_handler = [this](tcp::socket&& socket) { - clients.emplace_back(std::move(socket)); - - auto it = --clients.end(); - - clients.back().on_done( - [this, it]() { - clients.erase(it); - } - ); - - clients.back().receive(); - }; - - /* - * We can't bind both a v4 and v6 socket to both inaddr4_any and inaddr6_any. - * So in case both ipv4 and ipv6 are enabled and both want to bind to their - * respective inaddr_any we need to bind to v6 any and disable ipv6 only on - * the acceptor socket, else we can just bind to the interfaces normally. - */ - bool bind_v4_any = v4_acceptor.get_address().to_v4() == address_v4::any() && listen_settings.enable_ipv4; - bool bind_v6_any = v6_acceptor.get_address().to_v6() == address_v6::any() && listen_settings.enable_ipv6; - if(bind_v4_any && bind_v6_any) { - v6_acceptor.bind_v6_and_v4_any(accept_handler); - } else if(bind_v4_any || bind_v6_any) { - throw std::runtime_error("Cannot bind an INADDR_ANY and a non INADDR_ANY address on ipv4 and ipv6"); - } else { - if(listen_settings.enable_ipv4) { - v4_acceptor.setup_listen_socket(accept_handler); - } - if(listen_settings.enable_ipv6) { - v6_acceptor.setup_listen_socket(accept_handler); + clients.emplace_back(std::move(socket)); + + auto it = --clients.end(); + clients.back().on_done( + [this, it]() { + clients.erase(it); } - } + ); + + clients.back().receive(); } -void NetworkHandler::run() { +void NetworkHandler::run() +{ io_service.run(); } diff --git a/network-handler/networkhandler.hpp b/network-handler/networkhandler.hpp index 058f6a9..dfa31f1 100644 --- a/network-handler/networkhandler.hpp +++ b/network-handler/networkhandler.hpp @@ -1,35 +1,22 @@ #pragma once -#include "acceptor.hpp" +#include "server.hpp" #include "userclient.hpp" #include -#include -#include -#include #include -struct ListenSettings { - bool enable_ipv4; - std::string ipv4_inaddr; - bool enable_ipv6; - std::string ipv6_inaddr; - uint16_t port; -}; - class NetworkHandler { - ListenSettings const& listen_settings; - boost::asio::io_service io_service; - Acceptor v4_acceptor; - Acceptor v6_acceptor; - + Server server; std::list clients; + void accept_handler(boost::asio::ip::tcp::socket&& socket); + public: NetworkHandler(ListenSettings const& listen_settings); - + void run(); }; diff --git a/network-handler/node.cpp b/network-handler/node.cpp new file mode 100644 index 0000000..497a920 --- /dev/null +++ b/network-handler/node.cpp @@ -0,0 +1,21 @@ +#include "node.hpp" + +Node::Node(ListenSettings const& listen_settings) +: io_service() +, server(io_service, listen_settings, [this](boost::asio::ip::tcp::socket&& socket){accept_handler(std::move(socket));}) +, clients() +{} + +void Node::accept_handler(boost::asio::ip::tcp::socket&& socket) +{ + clients.emplace_back(std::move(socket)); + + auto it = --clients.end(); + clients.back().on_done( + [this, it]() { + clients.erase(it); + } + ); + + clients.back().receive(); +} diff --git a/network-handler/node.hpp b/network-handler/node.hpp new file mode 100644 index 0000000..7d30188 --- /dev/null +++ b/network-handler/node.hpp @@ -0,0 +1,21 @@ +#pragma once + +#include "server.hpp" +#include "nodeclient.hpp" + +#include + +#include + +class Node +{ + boost::asio::io_service io_service; + Server server; + std::list clients; + + void accept_handler(boost::asio::ip::tcp::socket&& socket); + +public: + Node(ListenSettings const& listen_settings); +}; + diff --git a/network-handler/nodemanager.cpp b/network-handler/nodemanager.cpp index 198a459..f345b72 100644 --- a/network-handler/nodemanager.cpp +++ b/network-handler/nodemanager.cpp @@ -1,6 +1,4 @@ #include "nodemanager.hpp" NodeManager::NodeManager() -{ - -} +{} diff --git a/network-handler/server.cpp b/network-handler/server.cpp new file mode 100644 index 0000000..cb2bd34 --- /dev/null +++ b/network-handler/server.cpp @@ -0,0 +1,31 @@ +#include "server.hpp" + +using namespace boost::asio::ip; +using namespace boost::asio; + +Server::Server(io_service& io_service, const ListenSettings& listen_settings, AcceptHandler accept_handler) +: listen_settings(listen_settings) +, v4_acceptor(io_service, address_v4::from_string(listen_settings.ipv4_inaddr), listen_settings.port) +, v6_acceptor(io_service, address_v6::from_string(listen_settings.ipv6_inaddr), listen_settings.port) +{ + /* + * We can't bind both a v4 and v6 socket to both inaddr4_any and inaddr6_any. + * So in case both ipv4 and ipv6 are enabled and both want to bind to their + * respective inaddr_any we need to bind to v6 any and disable ipv6 only on + * the acceptor socket, else we can just bind to the interfaces normally. + */ + bool bind_v4_any = v4_acceptor.get_address().to_v4() == address_v4::any() && listen_settings.enable_ipv4; + bool bind_v6_any = v6_acceptor.get_address().to_v6() == address_v6::any() && listen_settings.enable_ipv6; + if(bind_v4_any && bind_v6_any) { + v6_acceptor.bind_v6_and_v4_any(accept_handler); + } else if(bind_v4_any || bind_v6_any) { + throw std::runtime_error("Cannot bind an INADDR_ANY and a non INADDR_ANY address on ipv4 and ipv6"); + } else { + if(listen_settings.enable_ipv4) { + v4_acceptor.setup_listen_socket(accept_handler); + } + if(listen_settings.enable_ipv6) { + v6_acceptor.setup_listen_socket(accept_handler); + } + } +} \ No newline at end of file diff --git a/network-handler/server.hpp b/network-handler/server.hpp new file mode 100644 index 0000000..942cb14 --- /dev/null +++ b/network-handler/server.hpp @@ -0,0 +1,29 @@ +#pragma once + +#include + +#include "acceptor.hpp" + +struct ListenSettings { + bool enable_ipv4; + std::string ipv4_inaddr; + bool enable_ipv6; + std::string ipv6_inaddr; + uint16_t port; +}; + +class Server +{ +public: + typedef std::function AcceptHandler; + +private: + ListenSettings const& listen_settings; + + Acceptor v4_acceptor; + Acceptor v6_acceptor; + +public: + Server(boost::asio::io_service& io_service, ListenSettings const& listen_settings, AcceptHandler accept_handler); + +}; -- cgit v1.2.3-70-g09d2