Draft: Implementation of network handler

include/FlameIDE/Handler/Network/Handler.hpp

@@ -135,14 +135,14 @@ class Handler::ServerHandle
 	/// @brief getSessionHandle
 	/// @return
 	///
-	Handler::SessionHandle getSessionHandle() noexcept;
+	Handler::ExpectedSessionHandle getSessionHandle() noexcept;
 
 private:
 	friend class Handler::Internal;
 	friend class Handler::Udp;
 	friend class Handler::Tcp;
 
-	using CallbackGetSessionHandle = Handler::SessionHandle (*)(void *);
+	using CallbackGetSessionHandle = Handler::ExpectedSessionHandle (*)(void *);
 
 private:
 	void *data = nullptr;
@@ -195,13 +195,13 @@ class Handler::SessionHandle
 private:
 	static constexpr Types::size_t OBJECT_SIZE = 64;
 
-	using Object = templates::Object<OBJECT_SIZE>;
-	using CallbackBytesToRead = Types::ssize_t (*)(const Object *);
-	using CallbackReceive = Types::ssize_t (*)(
-			Object *, flame_ide::templates::Range<byte_t *>
+	using Object = ::flame_ide::templates::Object<OBJECT_SIZE>;
+	using CallbackBytesToRead = ::flame_ide::Types::ssize_t (*)(const Object *);
+	using CallbackReceive = ::flame_ide::Types::ssize_t (*)(
+			Object *, ::flame_ide::templates::Range<byte_t *>
 	);
-	using CallbackSend = Types::ssize_t (*)(
-			Object *, flame_ide::templates::Range<const byte_t *>
+	using CallbackSend = ::flame_ide::Types::ssize_t (*)(
+			Object *, ::flame_ide::templates::Range<const byte_t *>
 	);
 
 private:

src/Handler/Network/Headers.cmake

@@ -1,5 +1,7 @@
 set (HEADER_LIST
 	${CMAKE_CURRENT_SOURCE_DIR}/Functions.hpp
 	${CMAKE_CURRENT_SOURCE_DIR}/Internal.hpp
+	${CMAKE_CURRENT_SOURCE_DIR}/Tcp.hpp
+	${CMAKE_CURRENT_SOURCE_DIR}/Udp.hpp
 	${CMAKE_CURRENT_SOURCE_DIR}/Worker.hpp
 )

src/Handler/Network/Internal.cpp

@@ -10,76 +10,10 @@ namespace flame_ide
 {namespace network
 {
 
-// Hanler::Udp
-
-Handler::ExpectedServerHandle Handler::Udp::push(os::network::UdpServer &&server) noexcept
-{
-	flame_ide::unused(server);
-
-	udp::Server *udpServer = udp.push(move(server));
-	flame_ide::unused(udpServer);
-	return { os::STATUS_FAILED };
-}
-
-Handler::ExpectedSessionHandle Handler::Udp::push(os::network::UdpClient &&client) noexcept
-{
-	flame_ide::unused(client);
-
-	udp::Client *udpClient = udp.push(move(client));
-	flame_ide::unused(udpClient);
-	return { os::STATUS_FAILED };
-}
-
-Handler::ExpectedUdpServer Handler::Udp::pop(Handler::ServerHandle &handle)
-{
-	flame_ide::unused(handle);
-	return { os::STATUS_FAILED };
-}
-
-Handler::ExpectedUdpClient Handler::Udp::pop(Handler::SessionHandle &handle)
-{
-	flame_ide::unused(handle);
-	return { os::STATUS_FAILED };
-}
-
-// Handler::Tcp
-
-Handler::ExpectedServerHandle Handler::Tcp::push(os::network::TcpServer &&server) noexcept
-{
-	flame_ide::unused(server);
-	return { os::STATUS_FAILED };
-}
-
-Handler::ExpectedSessionHandle Handler::Tcp::push(os::network::TcpClient &&client) noexcept
-{
-	flame_ide::unused(client);
-	return { os::STATUS_FAILED };
-}
-
-Handler::ExpectedTcpServer Handler::Tcp::pop(Handler::ServerHandle &handle)
-{
-	flame_ide::unused(handle);
-	return { os::STATUS_FAILED };
-}
-
-Handler::ExpectedTcpClient Handler::Tcp::pop(Handler::SessionHandle &handle)
-{
-	flame_ide::unused(handle);
-	return { os::STATUS_FAILED };
-}
-
-}}} // namespace flame_ide::handler::network
-
-// Handler::Internal implementation
-namespace flame_ide
-{namespace handler
-{namespace network
-{
-
 Handler::Internal::Internal() noexcept
 {}
 
-Handler::Internal::~Internal() = default;
+Handler::Internal::~Internal() noexcept = default;
 
 Handler::Udp &Handler::Internal::udp() noexcept
 {

src/Handler/Network/Internal.hpp

@@ -6,65 +6,14 @@
 #include <FlameIDE/Templates/Pointers.hpp>
 #include <FlameIDE/Os/Async/Network/Registrar.hpp>
 
-#include <FlameIDE/../../src/Handler/Network/Udp/Udp.hpp>
-#include <FlameIDE/../../src/Handler/Network/Tcp/Tcp.hpp>
+#include <FlameIDE/../../src/Handler/Network/Udp.hpp>
+#include <FlameIDE/../../src/Handler/Network/Tcp.hpp>
 #include <FlameIDE/../../src/Handler/Network/Worker.hpp>
 
 namespace flame_ide
 {namespace handler
 {namespace network
 {
-
-class Handler::Udp
-{
-public:
-	using CallbackGetSessionHandle = Handler::ServerHandle::CallbackGetSessionHandle;
-
-public:
-	// TODO
-	Handler::ExpectedServerHandle push(os::network::UdpServer &&server) noexcept;
-	// TODO
-	Handler::ExpectedSessionHandle push(os::network::UdpClient &&client) noexcept;
-
-	// TODO
-	Handler::ExpectedUdpServer pop(Handler::ServerHandle &handle);
-	// TODO
-	Handler::ExpectedUdpClient pop(Handler::SessionHandle &handle);
-
-	/// @brief serverHandleCallback
-	/// @return
-	// TODO
-	CallbackGetSessionHandle serverHandleCallback() const noexcept;
-
-private:
-	udp::Udp udp;
-};
-
-class Handler::Tcp
-{
-public:
-	using CallbackGetSessionHandle = Handler::ServerHandle::CallbackGetSessionHandle;
-
-public:
-	// TODO
-	Handler::ExpectedServerHandle push(os::network::TcpServer &&server) noexcept;
-	// TODO
-	Handler::ExpectedSessionHandle push(os::network::TcpClient &&client) noexcept;
-
-	// TODO
-	Handler::ExpectedTcpServer pop(Handler::ServerHandle &handle);
-	// TODO
-	Handler::ExpectedTcpClient pop(Handler::SessionHandle &handle);
-
-	/// @brief serverHandleCallback
-	/// @return
-	// TODO
-	CallbackGetSessionHandle serverHandleCallback() const noexcept;
-
-private:
-	tcp::Tcp tcp;
-};
-
 }}} // namespace flame_ide::handler::network
 
 namespace flame_ide
@@ -94,12 +43,10 @@ class Handler::Internal
 
 	/// @brief start
 	/// @return
-	// TODO
 	os::Status start() noexcept;
 
 	/// @brief stop
 	/// @return
-	// TODO
 	os::Status stop() noexcept;
 
 private:

src/Handler/Network/ServerHandle.cpp

@@ -10,7 +10,7 @@ Handler::ServerHandle::operator bool() const noexcept
 	return data && callbackGetSessionHandle;
 }
 
-Handler::SessionHandle Handler::ServerHandle::getSessionHandle() noexcept
+Handler::ExpectedSessionHandle Handler::ServerHandle::getSessionHandle() noexcept
 {
 	return callbackGetSessionHandle(data);
 }

src/Handler/Network/Sources.cmake

@@ -3,5 +3,7 @@ set (SOURCE_LIST
 	${CMAKE_CURRENT_SOURCE_DIR}/Handler.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/Internal.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/ServerHandle.cpp
+	${CMAKE_CURRENT_SOURCE_DIR}/Tcp.cpp
+	${CMAKE_CURRENT_SOURCE_DIR}/Udp.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/Worker.cpp
 )

src/Handler/Network/Tcp.cpp

@@ -0,0 +1,32 @@
+#include <FlameIDE/../../src/Handler/Network/Tcp.hpp>
+
+namespace flame_ide
+{namespace handler
+{namespace network
+{
+
+Handler::ExpectedServerHandle Handler::Tcp::push(os::network::TcpServer &&server) noexcept
+{
+	flame_ide::unused(server);
+	return { os::STATUS_FAILED };
+}
+
+Handler::ExpectedSessionHandle Handler::Tcp::push(os::network::TcpClient &&client) noexcept
+{
+	flame_ide::unused(client);
+	return { os::STATUS_FAILED };
+}
+
+Handler::ExpectedTcpServer Handler::Tcp::pop(Handler::ServerHandle &handle)
+{
+	flame_ide::unused(handle);
+	return { os::STATUS_FAILED };
+}
+
+Handler::ExpectedTcpClient Handler::Tcp::pop(Handler::SessionHandle &handle)
+{
+	flame_ide::unused(handle);
+	return { os::STATUS_FAILED };
+}
+
+}}} // namespace flame_ide::handler::network

src/Handler/Network/Tcp.hpp

@@ -0,0 +1,40 @@
+#ifndef HANDLERINTERNALTCP_HPP
+#define HANDLERINTERNALTCP_HPP
+
+#include <FlameIDE/Handler/Network/Handler.hpp>
+
+#include <FlameIDE/../../src/Handler/Network/Tcp/Tcp.hpp>
+
+namespace flame_ide
+{namespace handler
+{namespace network
+{
+
+class Handler::Tcp
+{
+public:
+	using CallbackGetSessionHandle = Handler::ServerHandle::CallbackGetSessionHandle;
+
+public:
+	// TODO
+	Handler::ExpectedServerHandle push(os::network::TcpServer &&server) noexcept;
+	// TODO
+	Handler::ExpectedSessionHandle push(os::network::TcpClient &&client) noexcept;
+
+	// TODO
+	Handler::ExpectedTcpServer pop(Handler::ServerHandle &handle);
+	// TODO
+	Handler::ExpectedTcpClient pop(Handler::SessionHandle &handle);
+
+	/// @brief serverHandleCallback
+	/// @return
+	// TODO
+	CallbackGetSessionHandle serverHandleCallback() const noexcept;
+
+private:
+	tcp::Tcp tcp;
+};
+
+}}} // namespace flame_ide::handler::network
+
+#endif // HANDLERINTERNALTCP_HPP

src/Handler/Network/Tcp/InternalData.cpp

@@ -10,39 +10,39 @@ namespace flame_ide
 // client
 
 // TODO
-Types::ssize_t clientBytesToRead(void */*data*/) noexcept
+Types::ssize_t clientBytesToRead(void * /* data */) noexcept
 {
 	return os::STATUS_FAILED;
 }
 
 // TODO
-Types::ssize_t clientReceive(void */*data*/, templates::Range<byte_t *>) noexcept
+Types::ssize_t clientReceive(void * /* data */, templates::Range<byte_t *>) noexcept
 {
 	return os::STATUS_FAILED;
 }
 
 // TODO
-Types::ssize_t clientSend(void */*data*/, templates::Range<const byte_t *>) noexcept
+Types::ssize_t clientSend(void * /* data */, templates::Range<const byte_t *>) noexcept
 {
 	return os::STATUS_FAILED;
 }
 
 // server
 
 // TODO
-Types::ssize_t serverBytesToRead(void */*data*/) noexcept
+Types::ssize_t serverBytesToRead(void * /* data */) noexcept
 {
 	return os::STATUS_FAILED;
 }
 
 // TODO
-Types::ssize_t serverReceive(void */*data*/, templates::Range<byte_t *>) noexcept
+Types::ssize_t serverReceive(void * /* data */, templates::Range<byte_t *>) noexcept
 {
 	return os::STATUS_FAILED;
 }
 
 // TODO
-Types::ssize_t serverSend(void */*data*/, templates::Range<const byte_t *>) noexcept
+Types::ssize_t serverSend(void * /* data */, templates::Range<const byte_t *>) noexcept
 {
 	return os::STATUS_FAILED;
 }

src/Handler/Network/Tcp/Tcp.hpp

@@ -1,5 +1,5 @@
-#ifndef HANDLERINTERNALTCP_HPP
-#define HANDLERINTERNALTCP_HPP
+#ifndef HANDLERINTERNALTCPTCP_HPP
+#define HANDLERINTERNALTCPTCP_HPP
 
 #include <FlameIDE/Common/Traits/Functional.hpp>
 #include <FlameIDE/Os/Threads/Spin.hpp>
@@ -70,4 +70,4 @@ struct Tcp
 
 }}}} // namespace flame_ide::handler::network::tcp
 
-#endif // HANDLERINTERNALTCP_HPP
+#endif // HANDLERINTERNALTCPTCP_HPP