Add TCP support (#12)

Reviewed-on: #12
Co-authored-by: Persson-dev <sim16.prib@gmail.com>
Co-committed-by: Persson-dev <sim16.prib@gmail.com>

include/sp/protocol/MessageDispatcher.h

@@ -17,7 +17,7 @@ namespace sp {
 template <typename MessageIdType, typename MessageBase, typename MessageHandler>
 class MessageDispatcher {
   private:
-	std::map<MessageIdType, std::vector<std::weak_ptr<MessageHandler>>> m_Handlers;
+	std::map<MessageIdType, std::vector<MessageHandler*>> m_Handlers;
 
   public:
 	using MessageBaseType = MessageBase;
@@ -38,20 +38,20 @@ class MessageDispatcher {
 	 * \param type The packet type
 	 * \param handler The packet handler
 	 */
-	void RegisterHandler(MessageIdType a_MessageType, const std::weak_ptr<MessageHandler>& a_Handler);
+	void RegisterHandler(MessageIdType a_MessageType, MessageHandler* a_Handler);
 	
 	/**
 	 * \brief Unregister a packet handler
 	 * \param type The packet type
 	 * \param handler The packet handler
 	 */
-	void UnregisterHandler(MessageIdType a_MessageType, const std::weak_ptr<MessageHandler>& a_Handler);
+	void UnregisterHandler(MessageIdType a_MessageType, MessageHandler* a_Handler);
 	
 	/**
 	 * \brief Unregister a packet handler
 	 * \param handler The packet handler
 	 */
-	void UnregisterHandler(const std::weak_ptr<MessageHandler>& a_Handler);
+	void UnregisterHandler(MessageHandler* a_Handler);
 };
 
 #include <sp/protocol/message/MessageDispatcherImpl.inl>

include/sp/protocol/message/MessageDispatcherImpl.inl

@@ -1,38 +1,29 @@
 #pragma once
 
 template <typename MessageIdType, typename MessageBase, typename MessageHandler>
-void MessageDispatcher<MessageIdType, MessageBase, MessageHandler>::RegisterHandler(MessageIdType a_MessageType, const std::weak_ptr<MessageHandler>& a_Handler) {
+void MessageDispatcher<MessageIdType, MessageBase, MessageHandler>::RegisterHandler(MessageIdType a_MessageType, MessageHandler* a_Handler) {
-	auto found = std::find_if(m_Handlers[a_MessageType].begin(), m_Handlers[a_MessageType].end(), [&a_Handler](const std::weak_ptr<MessageHandler>& handler){
+	assert(a_Handler);
-		return a_Handler.lock() == handler.lock();
+	auto found = std::find(m_Handlers[a_MessageType].begin(), m_Handlers[a_MessageType].end(), a_Handler);
-	});
 	if (found == m_Handlers[a_MessageType].end())
 		m_Handlers[a_MessageType].push_back(a_Handler);
 }
 
 template <typename MessageIdType, typename MessageBase, typename MessageHandler>
-void MessageDispatcher<MessageIdType, MessageBase, MessageHandler>::UnregisterHandler(MessageIdType a_MessageType, const std::weak_ptr<MessageHandler>& a_Handler) {
+void MessageDispatcher<MessageIdType, MessageBase, MessageHandler>::UnregisterHandler(MessageIdType a_MessageType, MessageHandler* a_Handler) {
-	auto found = std::find_if(m_Handlers[a_MessageType].begin(), m_Handlers[a_MessageType].end(), [&a_Handler](const std::weak_ptr<MessageHandler>& handler){
+	auto found = std::find(m_Handlers[a_MessageType].begin(), m_Handlers[a_MessageType].end(), a_Handler);
-		return a_Handler.lock() == handler.lock();
-	});
 	if (found != m_Handlers[a_MessageType].end())
 		m_Handlers[a_MessageType].erase(found);
 }
 
 template <typename MessageIdType, typename MessageBase, typename MessageHandler>
-void MessageDispatcher<MessageIdType, MessageBase, MessageHandler>::UnregisterHandler(const std::weak_ptr<MessageHandler>& a_Handler) {
+void MessageDispatcher<MessageIdType, MessageBase, MessageHandler>::UnregisterHandler(MessageHandler* a_Handler) {
 	for (auto& pair : m_Handlers) {
 		if (pair.second.empty())
 			continue;
 
 		MessageIdType type = pair.first;
 
-		auto it = std::find_if(pair.second.begin(), pair.second.end(), [&a_Handler](const std::weak_ptr<MessageHandler>& handler){
+		pair.second.erase(std::remove(pair.second.begin(), pair.second.end(), a_Handler), pair.second.end());
-			return handler.lock() == a_Handler.lock();
-		});
-
-		if (it != pair.second.end()) 
-			pair.second.erase(it);
-
 	}
 }
 
@@ -40,7 +31,6 @@ template <typename MessageIdType, typename MessageBase, typename MessageHandler>
 void MessageDispatcher<MessageIdType, MessageBase, MessageHandler>::Dispatch(const MessageBase& a_Message) {
 	MessageIdType type = a_Message.GetId();
 	for (auto& handler : m_Handlers[type]) {
-		if (!handler.expired())
+		a_Message.Dispatch(*handler);
-			a_Message.Dispatch(*handler.lock());
 	}
 }

src/sp/extensions/TcpSocket.cpp

@@ -44,7 +44,10 @@ TcpSocket::IOInterface(const std::string& a_Host, std::uint16_t a_Port) : IOInte
 	Connect(a_Host, a_Port);
 }
 
-TcpSocket::IOInterface(IOInterface&& a_Other) {}
+TcpSocket::IOInterface(IOInterface&& a_Other) {
+	std::swap(m_Handle, a_Other.m_Handle);
+	std::swap(m_Status, a_Other.m_Status);
+}
 
 TcpSocket::~IOInterface() {}
 
@@ -120,7 +123,7 @@ void TcpSocket::Write(const sp::DataBuffer& a_Data) {
 	std::size_t sent = 0;
 
 	while (sent < a_Data.GetSize()) {
-		int cur = send(m_Handle, reinterpret_cast<const char*>(a_Data.GetSize() + sent), static_cast<int>(a_Data.GetSize() - sent), 0);
+		int cur = send(m_Handle, reinterpret_cast<const char*>(a_Data.data() + sent), static_cast<int>(a_Data.GetSize() - sent), 0);
 
 		if (cur <= 0) {
 			Disconnect();
@@ -154,6 +157,7 @@ void TcpSocket::Disconnect() {
 TcpSocket& TcpSocket::operator=(IOInterface&& a_Other) {
 	std::swap(m_Handle, a_Other.m_Handle);
 	std::swap(m_Status, a_Other.m_Status);
+	return *this;
 }
 
 }  // namespace io

test/test_file.cpp

@@ -23,8 +23,8 @@ int main() {
 	auto handler = std::make_shared<CustomPacketHandler>();
 
 	FileStream stream(sp::io::File{"test.txt", sp::io::FileTag::In | sp::io::FileTag::Out}, {});
-	stream.GetDispatcher().RegisterHandler(PacketId::Disconnect, handler);
+	stream.GetDispatcher().RegisterHandler(PacketId::Disconnect, handler.get());
-	stream.GetDispatcher().RegisterHandler(PacketId::KeepAlive, handler);
+	stream.GetDispatcher().RegisterHandler(PacketId::KeepAlive, handler.get());
 
 	stream.SendMessage(KeepAlivePacket{96});
 	stream.SendMessage(KeepAlivePacket{69});

test/test_io.cpp

@@ -23,13 +23,13 @@ int main() {
 	auto handler = std::make_shared<CustomPacketHandler>();
 
 	DataBufferStream stream;
-	stream.GetDispatcher().RegisterHandler(PacketId::Disconnect, handler);
+	stream.GetDispatcher().RegisterHandler(PacketId::Disconnect, handler.get());
 
 	// this should not be dispatched
 	stream.SendMessage(KeepAlivePacket{96});
 	stream.RecieveMessages();
 
-	stream.GetDispatcher().RegisterHandler(PacketId::KeepAlive, handler);
+	stream.GetDispatcher().RegisterHandler(PacketId::KeepAlive, handler.get());
 
 	stream.SendMessage(KeepAlivePacket{69});
 	stream.RecieveMessages();

test/test_packets.cpp

@@ -48,10 +48,10 @@ int main() {
 	packet->Dispatch(*handler);
 
 	sp::PacketDispatcher dispatcher;
-	dispatcher.RegisterHandler(PacketId::KeepAlive, handler);
+	dispatcher.RegisterHandler(PacketId::KeepAlive, handler.get());
 	dispatcher.Dispatch(*packet);
-	dispatcher.UnregisterHandler(PacketId::KeepAlive, handler);
+	dispatcher.UnregisterHandler(PacketId::KeepAlive, handler.get());
-	dispatcher.UnregisterHandler(handler);
+	dispatcher.UnregisterHandler(handler.get());
 
 	return 0;
 }