X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fnet%2Fprotocol.cpp;h=95ba175932722a7e92c55ebdc603ff7494ce860e;hb=1c300cbe77a7084951a080020361fc45bd190253;hp=bcad032b4cb4fcc86a9de9702312806bf640b3b3;hpb=6625cf0e574406425c35d33110f8d99617e902df;p=libs%2Fnet.git

diff --git a/source/net/protocol.cpp b/source/net/protocol.cpp
index bcad032..95ba175 100644
--- a/source/net/protocol.cpp
+++ b/source/net/protocol.cpp
@@ -14,7 +14,7 @@ Protocol::Protocol(unsigned npi):
 	header_def(0),
 	next_packet_id(npi)
 {
-	PacketDefBuilder<PacketHeader, NullSerializer<PacketHeader> >(*this, header_def, NullSerializer<PacketHeader>())
+	PacketDefBuilder<PacketHeader, Serializer<PacketHeader>>(*this, header_def, Serializer<PacketHeader>())
 		(&PacketHeader::type)(&PacketHeader::length);
 }
 
@@ -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;
 }