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

diff --git a/source/net/protocol.cpp b/source/net/protocol.cpp
index c611292..5e82a80 100644
--- a/source/net/protocol.cpp
+++ b/source/net/protocol.cpp
@@ -10,9 +10,8 @@ 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>())
 		.fields(&PacketHeader::type, &PacketHeader::length);
@@ -44,6 +43,13 @@ const Protocol::PacketDefBase &Protocol::get_packet_by_id(unsigned id) const
 	return *get_item(packet_id_defs, id);
 }
 
+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;
@@ -51,17 +57,29 @@ size_t Protocol::dispatch(ReceiverBase &rcv, const char *buf, size_t size, unsig
 	if(header.length>size)
 		throw bad_packet("truncated");
 	const PacketDefBase &pdef = get_packet_by_id(header.type-base_id);
-	ptr = pdef.dispatch(rcv, ptr, ptr+header.length);
+	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