Add a dynamic receiver class for more flexible packet handling

[libs/net.git] / source / net / protocol.cpp

diff --git a/source/net/protocol.cpp b/source/net/protocol.cpp
index 358966f643152804ebc0e1b68a3c193179e2a4de..5e82a80d7daaf17fb130752fd870380e2b78c329 100644 (file)
--- 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);
@@ -58,7 +57,14 @@ 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;
 }