Fix a length calculation bug in Protocol::dispatch

The packet header was not being included in the returned length.

diff --git a/source/net/protocol.cpp b/source/net/protocol.cpp
index cee18367b7cb254abf220e33eaad1f76958679f0..95ba175932722a7e92c55ebdc603ff7494ce860e 100644 (file)
--- a/source/net/protocol.cpp
+++ b/source/net/protocol.cpp
@@ -56,11 +56,11 @@ const Protocol::PacketDefBase &Protocol::get_packet_by_id(unsigned id) const
 size_t Protocol::dispatch(ReceiverBase &rcv, const char *buf, size_t size) 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);
+       ptr = pdef.dispatch(rcv, ptr, ptr+header.length);
        return ptr-buf;
 }