X-Git-Url: http://git.tdb.fi/?p=libs%2Fnet.git;a=blobdiff_plain;f=source%2Fnet%2Fprotocol.cpp;h=52678af2d9009cf9279d88ce3e1856d0fee1be9b;hp=cee18367b7cb254abf220e33eaad1f76958679f0;hb=HEAD;hpb=9cc2493cd87e2419d3cfb432844a2bf45ec3178f

diff --git a/source/net/protocol.cpp b/source/net/protocol.cpp
index cee1836..5e82a80 100644
--- a/source/net/protocol.cpp
+++ b/source/net/protocol.cpp
@@ -1,27 +1,20 @@
+#include "protocol.h"
 #include <cstring>
 #include <string>
 #include <msp/core/maputils.h>
 #include <msp/strings/format.h>
 #include <msp/strings/lexicalcast.h>
-#include "protocol.h"
 
 using namespace std;
 
 namespace Msp {
 namespace Net {
 
-Protocol::Protocol(unsigned npi):
-	header_def(0),
-	next_packet_id(npi)
+Protocol::Protocol():
+	header_def(0)
 {
 	PacketDefBuilder<PacketHeader, Serializer<PacketHeader>>(*this, header_def, Serializer<PacketHeader>())
-		(&PacketHeader::type)(&PacketHeader::length);
-}
-
-Protocol::~Protocol()
-{
-	for(auto &kvp: packet_class_defs)
-		delete kvp.second;
+		.fields(&PacketHeader::type, &PacketHeader::length);
 }
 
 unsigned Protocol::get_next_packet_class_id()
@@ -30,17 +23,14 @@ unsigned Protocol::get_next_packet_class_id()
 	return next_id++;
 }
 
-void Protocol::add_packet(PacketDefBase *pdef)
+void Protocol::add_packet(unique_ptr<PacketDefBase> pdef)
 {
-	PacketDefBase *&ptr = packet_class_defs[pdef->get_class_id()];
+	unique_ptr<PacketDefBase> &ptr = packet_class_defs[pdef->get_class_id()];
 	if(ptr)
-	{
 		packet_id_defs.erase(ptr->get_id());
-		delete ptr;
-	}
-	ptr = pdef;
-	if(unsigned id = pdef->get_id())
-		packet_id_defs[id] = pdef;
+	ptr = move(pdef);
+	if(unsigned id = ptr->get_id())
+		packet_id_defs[id] = ptr.get();
 }
 
 const Protocol::PacketDefBase &Protocol::get_packet_by_class_id(unsigned id) const
@@ -53,24 +43,43 @@ const Protocol::PacketDefBase &Protocol::get_packet_by_id(unsigned id) const
 	return *get_item(packet_id_defs, id);
 }
 
-size_t Protocol::dispatch(ReceiverBase &rcv, const char *buf, size_t size) const
+unsigned Protocol::get_max_packet_id() const
+{
+	if(packet_id_defs.empty())
+		return 0;
+	return prev(packet_id_defs.end())->first;
+}
+
+size_t Protocol::dispatch(ReceiverBase &rcv, const char *buf, size_t size, unsigned base_id) const
 {
 	PacketHeader header;
-	buf = header_def.deserialize(header, buf, buf+size);
+	const char *ptr = header_def.deserialize(header, buf, buf+size);
 	if(header.length>size)
 		throw bad_packet("truncated");
-	const PacketDefBase &pdef = get_packet_by_id(header.type);
-	const char *ptr = pdef.dispatch(rcv, buf, buf+header.length);
+	const PacketDefBase &pdef = get_packet_by_id(header.type-base_id);
+	if(DynamicReceiver *drcv = dynamic_cast<DynamicReceiver *>(&rcv))
+	{
+		Variant pkt;
+		ptr = pdef.deserialize(pkt, ptr, ptr+header.length);
+		drcv->receive(pdef.get_id(), pkt);
+	}
+	else
+		ptr = pdef.dispatch(rcv, ptr, ptr+header.length);
 	return ptr-buf;
 }
 
-size_t Protocol::get_packet_size(const char *buf, size_t size) const
+bool Protocol::get_packet_header(PacketHeader &header, const char *buf, size_t size) const
 {
 	if(size<4)
-		return 0;
-	PacketHeader header;
+		return false;
 	header_def.deserialize(header, buf, buf+size);
-	return header.length;
+	return true;
+}
+
+size_t Protocol::get_packet_size(const char *buf, size_t size) const
+{
+	PacketHeader header;
+	return (get_packet_header(header, buf, size) ? header.length : 0);
 }
 
 uint64_t Protocol::get_hash() const