X-Git-Url: http://git.tdb.fi/?p=libs%2Fnet.git;a=blobdiff_plain;f=source%2Fnet%2Fprotocol.h;h=5051338f3911558c8e2ee19fe2d0665c0e10eec3;hp=f9a2f37035891729a0b0af9153b52a396385badf;hb=HEAD;hpb=9cc2493cd87e2419d3cfb432844a2bf45ec3178f

diff --git a/source/net/protocol.h b/source/net/protocol.h
index f9a2f37..5051338 100644
--- a/source/net/protocol.h
+++ b/source/net/protocol.h
@@ -3,30 +3,42 @@
 
 #include <cstdint>
 #include <map>
+#include <memory>
 #include <stdexcept>
 #include <vector>
 #include <msp/core/hash.h>
+#include "mspnet_api.h"
 #include "receiver.h"
 
 namespace Msp {
 namespace Net {
 
-class bad_packet: public std::runtime_error
+class MSPNET_API bad_packet: public std::runtime_error
 {
 public:
 	bad_packet(const std::string &w): std::runtime_error(w) { }
 };
 
 
-class buffer_error: public std::runtime_error
+class MSPNET_API buffer_error: public std::runtime_error
 {
 public:
 	buffer_error(const std::string &w): std::runtime_error(w) { }
 };
 
 
-class Protocol
+class MSPNET_API Protocol
 {
+public:
+	struct PacketHeader
+	{
+		std::uint16_t type = 0;
+		std::uint16_t length = 0;
+
+		PacketHeader() = default;
+		PacketHeader(std::uint16_t, std::uint16_t);
+	};
+
 private:
 	template<typename T, std::uint8_t K>
 	struct BasicTraits;
@@ -41,8 +53,6 @@ private:
 	class BasicSerializer
 	{
 	public:
-		typedef T ValueType;
-
 		BasicSerializer(const Protocol &) { }
 
 		std::uint64_t get_hash() const { return Traits<T>::signature; }
@@ -52,9 +62,6 @@ private:
 
 	class StringSerializer
 	{
-	public:
-		typedef std::string ValueType;
-
 	private:
 		BasicSerializer<std::uint16_t> length_serializer;
 
@@ -69,9 +76,6 @@ private:
 	template<typename A>
 	class ArraySerializer
 	{
-	public:
-		typedef A ValueType;
-
 	private:
 		BasicSerializer<std::uint16_t> length_serializer;
 		typename Traits<typename A::value_type>::Serializer element_serializer;
@@ -87,9 +91,6 @@ private:
 	template<typename C>
 	class CompoundSerializer
 	{
-	public:
-		typedef C ValueType;
-
 	private:
 		const Serializer<C> &serializer;
 
@@ -101,24 +102,19 @@ private:
 		const char *deserialize(C &, const char *, const char *) const;
 	};
 
-	template<typename C, typename Head, typename S>
+	template<typename C, typename Head, typename T>
 	class FieldSerializer: public Head
 	{
 	public:
 		template<typename N>
-		struct Next
-		{
-			typedef FieldSerializer<C, FieldSerializer<C, Head, S>, typename Traits<N>::Serializer> Type;
-		};
+		using Next = FieldSerializer<C, FieldSerializer<C, Head, T>, N>;
 
 	private:
-		typedef typename S::ValueType C::*Pointer;
-
-		Pointer ptr;
-		S ser;
+		T C::*ptr;
+		typename Traits<T>::Serializer ser;
 
 	public:
-		FieldSerializer(const Head &, Pointer, const Protocol &);
+		FieldSerializer(const Head &, T C::*, const Protocol &);
 
 		std::uint64_t get_hash() const;
 		char *serialize(const C &, char *, char *) const;
@@ -130,10 +126,7 @@ private:
 	{
 	public:
 		template<typename N>
-		struct Next
-		{
-			typedef FieldSerializer<C, Serializer<C>, typename Traits<N>::Serializer> Type;
-		};
+		using Next = FieldSerializer<C, Serializer<C>, N>;
 
 		virtual ~Serializer() = default;
 
@@ -154,6 +147,7 @@ private:
 		virtual unsigned get_class_id() const = 0;
 		unsigned get_id() const { return id; }
 		virtual std::uint64_t get_hash() const = 0;
+		virtual const char *deserialize(Variant &, const char *, const char *) const = 0;
 		virtual const char *dispatch(ReceiverBase &, const char *, const char *) const = 0;
 	};
 
@@ -161,11 +155,10 @@ private:
 	class PacketTypeDef: public PacketDefBase
 	{
 	private:
-		Serializer<P> *serializer;
+		std::unique_ptr<Serializer<P>> serializer;
 
 	public:
 		PacketTypeDef(unsigned);
-		~PacketTypeDef();
 
 		unsigned get_class_id() const override { return get_packet_class_id<P>(); }
 
@@ -177,6 +170,7 @@ private:
 		std::uint64_t get_hash() const override { return serializer->get_hash(); }
 		char *serialize(const P &, char *, char *) const;
 		const char *deserialize(P &, const char *, const char *) const;
+		const char *deserialize(Variant &, const char *, const char *) const override;
 		const char *dispatch(ReceiverBase &, const char *, const char *) const override;
 	};
 
@@ -190,31 +184,21 @@ private:
 
 	public:
 		PacketDefBuilder(const Protocol &, PacketTypeDef<P> &, const S &);
-		
-		template<typename T>
-		PacketDefBuilder<P, typename S::template Next<T>::Type> operator()(T P::*);
-	};
 
-	struct PacketHeader
-	{
-		std::uint16_t type = 0;
-		std::uint16_t length = 0;
+		template<typename T>
+		PacketDefBuilder<P, typename S::template Next<T>> fields(T P::*);
 
-		PacketHeader() = default;
-		PacketHeader(std::uint16_t, std::uint16_t);
+		template<typename T1, typename T2, typename... Rest>
+		auto fields(T1 P::*first, T2 P::*second, Rest P::*...rest) { return fields(first).fields(second, rest...); }
 	};
 
-	typedef std::map<unsigned, PacketDefBase *> PacketMap;
-
 	PacketTypeDef<PacketHeader> header_def;
-	unsigned next_packet_id;
-	PacketMap packet_class_defs;
-	PacketMap packet_id_defs;
+	unsigned next_packet_id = 1;
+	std::map<unsigned, std::unique_ptr<PacketDefBase>> packet_class_defs;
+	std::map<unsigned, PacketDefBase *> packet_id_defs;
 
 protected:
-	Protocol(unsigned = 1);
-public:
-	~Protocol();
+	Protocol();
 
 private:
 	static unsigned get_next_packet_class_id();
@@ -222,15 +206,15 @@ private:
 	template<typename P>
 	static unsigned get_packet_class_id();
 
-	void add_packet(PacketDefBase *);
+	void add_packet(std::unique_ptr<PacketDefBase>);
 
 protected:
-	template<typename P>
-	PacketDefBuilder<P, Serializer<P>> add(unsigned);
-
 	template<typename P>
 	PacketDefBuilder<P, Serializer<P>> add();
 
+	template<typename P, typename T, typename... Rest>
+	auto add(T P::*field, Rest P::*...rest) { return add<P>().fields(field, rest...); }
+
 	const PacketDefBase &get_packet_by_class_id(unsigned) const;
 	const PacketDefBase &get_packet_by_id(unsigned) const;
 
@@ -239,10 +223,19 @@ protected:
 
 public:
 	template<typename P>
-	std::size_t serialize(const P &, char *, std::size_t) const;
+	bool has_packet() const { return packet_class_defs.count(get_packet_class_id<P>()); }
 
+	template<typename P>
+	unsigned get_packet_id() const { return get_item(packet_class_defs, get_packet_class_id<P>())->get_id(); }
+
+	unsigned get_max_packet_id() const;
+
+	template<typename P>
+	std::size_t serialize(const P &, char *, std::size_t, unsigned = 0) const;
+
+	bool get_packet_header(PacketHeader &, const char *, std::size_t) const;
 	std::size_t get_packet_size(const char *, std::size_t) const;
-	std::size_t dispatch(ReceiverBase &, const char *, std::size_t) const;
+	std::size_t dispatch(ReceiverBase &, const char *, std::size_t, unsigned = 0) const;
 
 	std::uint64_t get_hash() const;
 };
@@ -255,18 +248,13 @@ unsigned Protocol::get_packet_class_id()
 	return id;
 }
 
-template<typename P>
-Protocol::PacketDefBuilder<P, Protocol::Serializer<P>> Protocol::add(unsigned id)
-{
-	PacketTypeDef<P> *pdef = new PacketTypeDef<P>(id);
-	add_packet(pdef);
-	return PacketDefBuilder<P, Serializer<P>>(*this, *pdef, Serializer<P>());
-}
-
 template<typename P>
 Protocol::PacketDefBuilder<P, Protocol::Serializer<P>> Protocol::add()
 {
-	return add<P>(next_packet_id++);
+	std::unique_ptr<PacketTypeDef<P>> pdef = std::make_unique<PacketTypeDef<P>>(next_packet_id++);
+	PacketDefBuilder<P, Serializer<P>> next(*this, *pdef, Serializer<P>());
+	add_packet(move(pdef));
+	return next;
 }
 
 template<typename P>
@@ -277,14 +265,14 @@ const Protocol::PacketTypeDef<P> &Protocol::get_packet_by_class() const
 }
 
 template<typename P>
-std::size_t Protocol::serialize(const P &pkt, char *buf, std::size_t size) const
+std::size_t Protocol::serialize(const P &pkt, char *buf, std::size_t size, unsigned base_id) const
 {
 	const PacketTypeDef<P> &pdef = get_packet_by_class<P>();
 	if(!pdef.get_id())
 		throw std::invalid_argument("no packet id");
 	char *ptr = pdef.serialize(pkt, buf+4, buf+size);
 	size = ptr-buf;
-	header_def.serialize(PacketHeader(pdef.get_id(), size), buf, buf+4);
+	header_def.serialize(PacketHeader(base_id+pdef.get_id(), size), buf, buf+4);
 	return size;
 }
 
@@ -392,52 +380,45 @@ const char *Protocol::CompoundSerializer<C>::deserialize(C &com, const char *buf
 }
 
 
-template<typename P, typename Head, typename S>
-Protocol::FieldSerializer<P, Head, S>::FieldSerializer(const Head &h, Pointer p, const Protocol &proto):
+template<typename C, typename Head, typename T>
+Protocol::FieldSerializer<C, Head, T>::FieldSerializer(const Head &h, T C::*p, const Protocol &proto):
 	Head(h),
 	ptr(p),
 	ser(proto)
 { }
 
-template<typename P, typename Head, typename S>
-std::uint64_t Protocol::FieldSerializer<P, Head, S>::get_hash() const
+template<typename C, typename Head, typename T>
+std::uint64_t Protocol::FieldSerializer<C, Head, T>::get_hash() const
 {
 	return hash_update<64>(Head::get_hash(), ser.get_hash());
 }
 
-template<typename P, typename Head, typename S>
-char *Protocol::FieldSerializer<P, Head, S>::serialize(const P &pkt, char *buf, char *end) const
+template<typename C, typename Head, typename T>
+char *Protocol::FieldSerializer<C, Head, T>::serialize(const C &com, char *buf, char *end) const
 {
-	buf = Head::serialize(pkt, buf, end);
-	return ser.serialize(pkt.*ptr, buf, end);
+	buf = Head::serialize(com, buf, end);
+	return ser.serialize(com.*ptr, buf, end);
 }
 
-template<typename P, typename Head, typename S>
-const char *Protocol::FieldSerializer<P, Head, S>::deserialize(P &pkt, const char *buf, const char *end) const
+template<typename C, typename Head, typename T>
+const char *Protocol::FieldSerializer<C, Head, T>::deserialize(C &com, const char *buf, const char *end) const
 {
-	buf = Head::deserialize(pkt, buf, end);
-	return ser.deserialize(pkt.*ptr, buf, end);
+	buf = Head::deserialize(com, buf, end);
+	return ser.deserialize(com.*ptr, buf, end);
 }
 
 
 template<typename P>
 Protocol::PacketTypeDef<P>::PacketTypeDef(unsigned i):
 	PacketDefBase(i),
-	serializer(new Serializer<P>)
+	serializer(std::make_unique<Serializer<P>>())
 { }
 
-template<typename P>
-Protocol::PacketTypeDef<P>::~PacketTypeDef()
-{
-	delete serializer;
-}
-
 template<typename P>
 template<typename S>
 void Protocol::PacketTypeDef<P>::set_serializer(const S &ser)
 {
-	delete serializer;
-	serializer = new S(ser);
+	serializer = std::make_unique<S>(ser);
 }
 
 template<typename P>
@@ -452,6 +433,15 @@ const char *Protocol::PacketTypeDef<P>::deserialize(P &pkt, const char *buf, con
 	return serializer->deserialize(pkt, buf, end);
 }
 
+template<typename P>
+const char *Protocol::PacketTypeDef<P>::deserialize(Variant &var_pkt, const char *buf, const char *end) const
+{
+	P pkt;
+	const char *ptr = serializer->deserialize(pkt, buf, end);
+	var_pkt = std::move(pkt);
+	return ptr;
+}
+
 template<typename P>
 const char *Protocol::PacketTypeDef<P>::dispatch(ReceiverBase &rcv, const char *buf, const char *end) const
 {
@@ -474,11 +464,11 @@ Protocol::PacketDefBuilder<P, S>::PacketDefBuilder(const Protocol &p, PacketType
 
 template<typename P, typename S>
 template<typename T>
-Protocol::PacketDefBuilder<P, typename S::template Next<T>::Type> Protocol::PacketDefBuilder<P, S>::operator()(T P::*ptr)
+Protocol::PacketDefBuilder<P, typename S::template Next<T>> Protocol::PacketDefBuilder<P, S>::fields(T P::*ptr)
 {
-	typename S::template Next<T>::Type next_ser(serializer, ptr, protocol);
+	typename S::template Next<T> next_ser(serializer, ptr, protocol);
 	pktdef.set_serializer(next_ser);
-	return PacketDefBuilder<P, typename S::template Next<T>::Type>(protocol, pktdef, next_ser);
+	return PacketDefBuilder<P, typename S::template Next<T>>(protocol, pktdef, next_ser);
 }
 
 } // namespace Net