From: Mikko Rasa <tdb@tdb.fi>
Date: Sun, 9 Oct 2016 17:30:03 +0000 (+0300)
Subject: Support compound types in network packets
X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=c2d202f9b482be7b439436970d6366c369837107;p=libs%2Fnet.git

Support compound types in network packets
---

diff --git a/source/net/protocol.cpp b/source/net/protocol.cpp
index 4d3f962..b24cef1 100644
--- a/source/net/protocol.cpp
+++ b/source/net/protocol.cpp
@@ -29,9 +29,13 @@ void Protocol::add_packet(PacketDefBase *pdef)
 {
 	PacketDefBase *&ptr = packet_class_defs[pdef->get_class_id()];
 	if(ptr)
+	{
+		packet_id_defs.erase(ptr->get_id());
 		delete ptr;
+	}
 	ptr = pdef;
-	packet_id_defs[pdef->get_id()] = pdef;
+	if(unsigned id = pdef->get_id())
+		packet_id_defs[id] = pdef;
 }
 
 const Protocol::PacketDefBase &Protocol::get_packet_by_class_id(unsigned id) const
diff --git a/source/net/protocol.h b/source/net/protocol.h
index f722a76..0a8110c 100644
--- a/source/net/protocol.h
+++ b/source/net/protocol.h
@@ -105,6 +105,23 @@ private:
 		const char *deserialize(A &, const char *, const char *) const;
 	};
 
+	template<typename C>
+	class CompoundSerializer
+	{
+	public:
+		typedef C ValueType;
+
+	private:
+		const CompoundTypeDef<C> &def;
+
+	public:
+		CompoundSerializer(const Protocol &);
+
+		std::string describe() const { return def.describe(); }
+		char *serialize(const C &, char *, char *) const;
+		const char *deserialize(C &, const char *, const char *) const;
+	};
+
 	template<typename P, typename Head, typename S>
 	class Serializer: public Head
 	{
@@ -226,6 +243,9 @@ private:
 	void add_packet(PacketDefBase *);
 
 protected:
+	template<typename P>
+	PacketDefBuilder<P, NullSerializer<P> > add(unsigned);
+
 	template<typename P>
 	PacketDefBuilder<P, NullSerializer<P> > add();
 
@@ -251,13 +271,19 @@ private:
 
 
 template<typename P>
-Protocol::PacketDefBuilder<P, Protocol::NullSerializer<P> > Protocol::add()
+Protocol::PacketDefBuilder<P, Protocol::NullSerializer<P> > Protocol::add(unsigned id)
 {
-	PacketTypeDef<P> *pdef = new PacketTypeDef<P>(next_packet_id++);
+	PacketTypeDef<P> *pdef = new PacketTypeDef<P>(id);
 	add_packet(pdef);
 	return PacketDefBuilder<P, NullSerializer<P> >(*this, *pdef, NullSerializer<P>());
 }
 
+template<typename P>
+Protocol::PacketDefBuilder<P, Protocol::NullSerializer<P> > Protocol::add()
+{
+	return add<P>(next_packet_id++);
+}
+
 template<typename P>
 const Protocol::PacketTypeDef<P> &Protocol::get_packet_by_class() const
 {
@@ -294,6 +320,13 @@ struct Protocol::BasicTraits
 	typedef BasicSerializer<T> Serializer;
 };
 
+template<typename T>
+struct Protocol::Traits
+{
+	static const UInt16 signature = 'C';
+	typedef CompoundSerializer<T> Serializer;
+};
+
 template<> struct Protocol::Traits<Int8>: BasicTraits<Int8, 'I'> { };
 template<> struct Protocol::Traits<UInt8>: BasicTraits<UInt8, 'U'> { };
 template<> struct Protocol::Traits<Int16>: BasicTraits<Int16, 'I'> { };
@@ -383,6 +416,24 @@ const char *Protocol::ArraySerializer<A>::deserialize(A &array, const char *buf,
 }
 
 
+template<typename C>
+Protocol::CompoundSerializer<C>::CompoundSerializer(const Protocol &proto):
+	def(proto.get_packet_by_class<C>().get_compound())
+{ }
+
+template<typename C>
+char *Protocol::CompoundSerializer<C>::serialize(const C &com, char *buf, char *end) const
+{
+	return def.serialize(com, buf, end);
+}
+
+template<typename C>
+const char *Protocol::CompoundSerializer<C>::deserialize(C &com, const char *buf, const char *end) const
+{
+	return def.deserialize(com, buf, end);
+}
+
+
 template<typename P, typename Head, typename S>
 Protocol::Serializer<P, Head, S>::Serializer(const Head &h, Pointer p, const Protocol &proto):
 	Head(h),