X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fnet%2Fprotocol.h;h=cd68d5148735024eaa77f9ef1ebe06a16064de72;hb=ee01d294f9078fbf17dc6a0a645ad3a342c49b1a;hp=f722a76c82a7cc73b83d4880b7ac8043f45bd889;hpb=df1b7561be0d4a57e964c783c01060c54864ec60;p=libs%2Fnet.git

diff --git a/source/net/protocol.h b/source/net/protocol.h
index f722a76..cd68d51 100644
--- a/source/net/protocol.h
+++ b/source/net/protocol.h
@@ -1,10 +1,10 @@
 #ifndef MSP_NET_PROTOCOL_H_
 #define MSP_NET_PROTOCOL_H_
 
+#include <cstdint>
 #include <map>
 #include <stdexcept>
 #include <vector>
-#include <msp/core/inttypes.h>
 #include "receiver.h"
 
 namespace Msp {
@@ -14,7 +14,6 @@ class bad_packet: public std::runtime_error
 {
 public:
 	bad_packet(const std::string &w): std::runtime_error(w) { }
-	virtual ~bad_packet() throw() { }
 };
 
 
@@ -22,14 +21,13 @@ class buffer_error: public std::runtime_error
 {
 public:
 	buffer_error(const std::string &w): std::runtime_error(w) { }
-	virtual ~buffer_error() throw() { }
 };
 
 
 class Protocol
 {
 private:
-	template<typename T, UInt8 K>
+	template<typename T, std::uint8_t K>
 	struct BasicTraits;
 
 	template<typename T>
@@ -48,10 +46,9 @@ private:
 	template<typename C, typename S>
 	struct CompoundDef: public CompoundTypeDef<C>
 	{
-		S *serializer;
+		S serializer;
 
 		CompoundDef(const S &);
-		virtual ~CompoundDef();
 
 		virtual std::string describe() const;
 		virtual char *serialize(const C &, char *, char *) const;
@@ -77,7 +74,7 @@ private:
 		typedef std::string ValueType;
 
 	private:
-		BasicSerializer<UInt16> length_serializer;
+		BasicSerializer<std::uint16_t> length_serializer;
 
 	public:
 		StringSerializer(const Protocol &);
@@ -94,7 +91,7 @@ private:
 		typedef A ValueType;
 
 	private:
-		BasicSerializer<UInt16> length_serializer;
+		BasicSerializer<std::uint16_t> length_serializer;
 		typename Traits<typename A::value_type>::Serializer element_serializer;
 
 	public:
@@ -105,6 +102,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
 	{
@@ -149,8 +163,6 @@ private:
 	protected:
 		unsigned id;
 
-		static unsigned next_class_id;
-
 		PacketDefBase(unsigned);
 	public:
 		virtual ~PacketDefBase() { }
@@ -166,21 +178,18 @@ private:
 	private:
 		CompoundTypeDef<P> *compound;
 
-		static unsigned class_id;
-
 	public:
 		PacketTypeDef(unsigned);
 		~PacketTypeDef();
 
-		static unsigned get_static_class_id() { return class_id; }
-		virtual unsigned get_class_id() const { return class_id; }
+		virtual unsigned get_class_id() const { return get_packet_class_id<P>(); }
 
 		template<typename S>
 		void set_serializer(const S &);
 
 		const CompoundTypeDef<P> &get_compound() const { return *compound; }
 
-		virtual std::string describe() const;
+		virtual std::string describe() const { return compound->describe(); }
 		char *serialize(const P &, char *, char *) const;
 		const char *deserialize(P &, const char *, const char *) const;
 		virtual const char *dispatch(ReceiverBase &, const char *, const char *) const;
@@ -203,11 +212,11 @@ private:
 
 	struct PacketHeader
 	{
-		UInt16 type;
-		UInt16 length;
+		std::uint16_t type;
+		std::uint16_t length;
 
 		PacketHeader();
-		PacketHeader(UInt16, UInt16);
+		PacketHeader(std::uint16_t, std::uint16_t);
 	};
 
 	typedef std::map<unsigned, PacketDefBase *> PacketMap;
@@ -223,9 +232,17 @@ public:
 	~Protocol();
 
 private:
+	static unsigned get_next_packet_class_id();
+
+	template<typename P>
+	static unsigned get_packet_class_id();
+
 	void add_packet(PacketDefBase *);
 
 protected:
+	template<typename P>
+	PacketDefBuilder<P, NullSerializer<P> > add(unsigned);
+
 	template<typename P>
 	PacketDefBuilder<P, NullSerializer<P> > add();
 
@@ -237,12 +254,12 @@ protected:
 
 public:
 	template<typename P>
-	unsigned serialize(const P &, char *, unsigned) const;
+	std::size_t serialize(const P &, char *, std::size_t) const;
 
-	unsigned get_packet_size(const char *, unsigned) const;
-	unsigned dispatch(ReceiverBase &, const char *, unsigned) const;
+	std::size_t get_packet_size(const char *, std::size_t) const;
+	std::size_t dispatch(ReceiverBase &, const char *, std::size_t) const;
 
-	UInt64 get_hash() const;
+	std::uint64_t get_hash() const;
 
 private:
 	template<typename T>
@@ -251,24 +268,39 @@ private:
 
 
 template<typename P>
-Protocol::PacketDefBuilder<P, Protocol::NullSerializer<P> > Protocol::add()
+unsigned Protocol::get_packet_class_id()
+{
+	static unsigned id = get_next_packet_class_id();
+	return id;
+}
+
+template<typename P>
+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
 {
-	const PacketDefBase &pdef = get_packet_by_class_id(PacketTypeDef<P>::get_static_class_id());
+	const PacketDefBase &pdef = get_packet_by_class_id(get_packet_class_id<P>());
 	return static_cast<const PacketTypeDef<P> &>(pdef);
 }
 
 template<typename P>
-unsigned Protocol::serialize(const P &pkt, char *buf, unsigned size) const
+std::size_t Protocol::serialize(const P &pkt, char *buf, std::size_t size) 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);
@@ -278,7 +310,7 @@ unsigned Protocol::serialize(const P &pkt, char *buf, unsigned size) const
 template<typename T>
 std::string Protocol::get_type_signature()
 {
-	const UInt16 sig = Traits<T>::signature;
+	const std::uint16_t sig = Traits<T>::signature;
 	std::string result;
 	result += sig&0xFF;
 	if(sig>=0x100)
@@ -287,34 +319,42 @@ std::string Protocol::get_type_signature()
 }
 
 
-template<typename T, UInt8 K>
+template<typename T, std::uint8_t K>
 struct Protocol::BasicTraits
 {
-	static const UInt16 signature = K | (sizeof(T)<<8);
+	static const std::uint16_t signature = K | (sizeof(T)<<8);
 	typedef BasicSerializer<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'> { };
-template<> struct Protocol::Traits<UInt16>: BasicTraits<UInt16, 'U'> { };
-template<> struct Protocol::Traits<Int32>: BasicTraits<Int32, 'I'> { };
-template<> struct Protocol::Traits<UInt32>: BasicTraits<UInt32, 'U'> { };
-template<> struct Protocol::Traits<Int64>: BasicTraits<Int64, 'I'> { };
-template<> struct Protocol::Traits<UInt64>: BasicTraits<UInt64, 'U'> { };
+template<typename T>
+struct Protocol::Traits
+{
+	static const std::uint16_t signature = 'C';
+	typedef CompoundSerializer<T> Serializer;
+};
+
+template<> struct Protocol::Traits<bool>: BasicTraits<bool, 'B'> { };
+template<> struct Protocol::Traits<std::int8_t>: BasicTraits<std::int8_t, 'I'> { };
+template<> struct Protocol::Traits<std::uint8_t>: BasicTraits<std::uint8_t, 'U'> { };
+template<> struct Protocol::Traits<std::int16_t>: BasicTraits<std::int16_t, 'I'> { };
+template<> struct Protocol::Traits<std::uint16_t>: BasicTraits<std::uint16_t, 'U'> { };
+template<> struct Protocol::Traits<std::int32_t>: BasicTraits<std::int32_t, 'I'> { };
+template<> struct Protocol::Traits<std::uint32_t>: BasicTraits<std::uint32_t, 'U'> { };
+template<> struct Protocol::Traits<std::int64_t>: BasicTraits<std::int64_t, 'I'> { };
+template<> struct Protocol::Traits<std::uint64_t>: BasicTraits<std::uint64_t, 'U'> { };
 template<> struct Protocol::Traits<float>: BasicTraits<float, 'F'> { };
 template<> struct Protocol::Traits<double>: BasicTraits<double, 'F'> { };
 
 template<> struct Protocol::Traits<std::string>
 {
-	static const UInt16 signature = 'S';
+	static const std::uint16_t signature = 'S';
 	typedef StringSerializer Serializer;
 };
 
 template<typename T>
 struct Protocol::Traits<std::vector<T> >
 {
-	static const UInt16 signature = 'A';
+	static const std::uint16_t signature = 'A';
 	typedef ArraySerializer<std::vector<T> > Serializer;
 };
 
@@ -322,31 +362,25 @@ struct Protocol::Traits<std::vector<T> >
 
 template<typename C, typename S>
 Protocol::CompoundDef<C, S>::CompoundDef(const S &s):
-	serializer(new S(s))
+	serializer(s)
 { }
 
-template<typename C, typename S>
-Protocol::CompoundDef<C, S>::~CompoundDef()
-{
-	delete serializer;
-}
-
 template<typename C, typename S>
 std::string Protocol::CompoundDef<C, S>::describe() const
 {
-	return "{"+serializer->describe()+"}";
+	return "{"+serializer.describe()+"}";
 }
 
 template<typename C, typename S>
 char *Protocol::CompoundDef<C, S>::serialize(const C &com, char *buf, char *end) const
 {
-	return serializer->serialize(com, buf, end);
+	return serializer.serialize(com, buf, end);
 }
 
 template<typename C, typename S>
 const char *Protocol::CompoundDef<C, S>::deserialize(C &com, const char *buf, const char *end) const
 {
-	return serializer->deserialize(com, buf, end);
+	return serializer.deserialize(com, buf, end);
 }
 
 
@@ -374,7 +408,7 @@ char *Protocol::ArraySerializer<A>::serialize(const A &array, char *buf, char *e
 template<typename A>
 const char *Protocol::ArraySerializer<A>::deserialize(A &array, const char *buf, const char *end) const
 {
-	UInt16 length;
+	std::uint16_t length;
 	buf = length_serializer.deserialize(length, buf, end);
 	array.resize(length);
 	for(unsigned i=0; i<length; ++i)
@@ -383,6 +417,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),
@@ -397,31 +449,25 @@ std::string Protocol::Serializer<P, Head, S>::describe() const
 }
 
 template<typename P, typename Head, typename S>
-char * Protocol::Serializer<P, Head, S>::serialize(const P &pkt, char *buf, char *end) const
+char *Protocol::Serializer<P, Head, S>::serialize(const P &pkt, char *buf, char *end) const
 {
 	buf = Head::serialize(pkt, buf, end);
 	return ser.serialize(pkt.*ptr, buf, end);
 }
 
 template<typename P, typename Head, typename S>
-const char * Protocol::Serializer<P, Head, S>::deserialize(P &pkt, const char *buf, const char *end) const
+const char *Protocol::Serializer<P, Head, S>::deserialize(P &pkt, const char *buf, const char *end) const
 {
 	buf = Head::deserialize(pkt, buf, end);
 	return ser.deserialize(pkt.*ptr, buf, end);
 }
 
 
-template<typename P>
-unsigned Protocol::PacketTypeDef<P>::class_id = 0;
-
 template<typename P>
 Protocol::PacketTypeDef<P>::PacketTypeDef(unsigned i):
 	PacketDefBase(i),
 	compound(new CompoundDef<P, NullSerializer<P> >(NullSerializer<P>()))
-{
-	if(!class_id)
-		class_id = next_class_id++;
-}
+{ }
 
 template<typename P>
 Protocol::PacketTypeDef<P>::~PacketTypeDef()
@@ -437,12 +483,6 @@ void Protocol::PacketTypeDef<P>::set_serializer(const S &ser)
 	compound = new CompoundDef<P, S>(ser);
 }
 
-template<typename P>
-std::string Protocol::PacketTypeDef<P>::describe() const
-{
-	return compound->describe();
-}
-
 template<typename P>
 char *Protocol::PacketTypeDef<P>::serialize(const P &pkt, char *buf, char *end) const
 {