X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fnet%2Fprotocol.h;h=e867c0a167af9e6c58441788eea3961a0d8b7679;hb=92e8064d9f43ca3e28ce9832cfe475034ab98704;hp=fa90e6d250d87531fdc01069a90fe0cab6a90352;hpb=6df110603b3a1248f52741e9d68d0bd032171b60;p=libs%2Fnet.git

diff --git a/source/net/protocol.h b/source/net/protocol.h
index fa90e6d..e867c0a 100644
--- a/source/net/protocol.h
+++ b/source/net/protocol.h
@@ -5,6 +5,7 @@
 #include <map>
 #include <stdexcept>
 #include <vector>
+#include <msp/core/hash.h>
 #include "receiver.h"
 
 namespace Msp {
@@ -36,9 +37,9 @@ private:
 	template<typename C>
 	struct CompoundTypeDef
 	{
-		virtual ~CompoundTypeDef() { }
+		virtual ~CompoundTypeDef() = default;
 
-		virtual std::string describe() const = 0;
+		virtual std::uint64_t get_hash() const = 0;
 		virtual char *serialize(const C &, char *, char *) const = 0;
 		virtual const char *deserialize(C &, const char *, const char *) const = 0;
 	};
@@ -50,9 +51,9 @@ private:
 
 		CompoundDef(const S &);
 
-		virtual std::string describe() const;
-		virtual char *serialize(const C &, char *, char *) const;
-		virtual const char *deserialize(C &, const char *, const char *) const;
+		std::uint64_t get_hash() const override;
+		char *serialize(const C &, char *, char *) const override;
+		const char *deserialize(C &, const char *, const char *) const override;
 	};
 
 	template<typename T>
@@ -63,7 +64,7 @@ private:
 
 		BasicSerializer(const Protocol &) { }
 
-		std::string describe() const { return get_type_signature<T>(); }
+		std::uint64_t get_hash() const { return Traits<T>::signature; }
 		char *serialize(const T &, char *, char *) const;
 		const char *deserialize(T &, const char *, const char *) const;
 	};
@@ -79,7 +80,7 @@ private:
 	public:
 		StringSerializer(const Protocol &);
 
-		std::string describe() const { return get_type_signature<std::string>(); }
+		std::uint64_t get_hash() const;
 		char *serialize(const std::string &, char *, char *) const;
 		const char *deserialize(std::string &, const char *, const char *) const;
 	};
@@ -97,7 +98,7 @@ private:
 	public:
 		ArraySerializer(const Protocol &);
 
-		std::string describe() const;
+		std::uint64_t get_hash() const;
 		char *serialize(const A &, char *, char *) const;
 		const char *deserialize(A &, const char *, const char *) const;
 	};
@@ -114,7 +115,6 @@ private:
 	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;
 	};
@@ -138,7 +138,7 @@ private:
 	public:
 		Serializer(const Head &, Pointer, const Protocol &);
 
-		std::string describe() const;
+		std::uint64_t get_hash() const;
 		char *serialize(const P &, char *, char *) const;
 		const char *deserialize(P &, const char *, const char *) const;
 	};
@@ -153,7 +153,7 @@ private:
 			typedef Serializer<P, NullSerializer, typename Traits<N>::Serializer> Type;
 		};
 
-		std::string describe() const { return std::string(); }
+		std::uint64_t get_hash() const { return 0; }
 		char *serialize(const P &, char *b, char *) const { return b; }
 		const char *deserialize(P &, const char *b, const char *) const { return b; }
 	};
@@ -163,14 +163,13 @@ private:
 	protected:
 		unsigned id;
 
-		static unsigned next_class_id;
-
 		PacketDefBase(unsigned);
 	public:
-		virtual ~PacketDefBase() { }
+		virtual ~PacketDefBase() = default;
+
 		virtual unsigned get_class_id() const = 0;
 		unsigned get_id() const { return id; }
-		virtual std::string describe() const = 0;
+		virtual std::uint64_t get_hash() const = 0;
 		virtual const char *dispatch(ReceiverBase &, const char *, const char *) const = 0;
 	};
 
@@ -180,24 +179,21 @@ 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; }
+		unsigned get_class_id() const override { 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 { return compound->describe(); }
+		std::uint64_t get_hash() const override { return compound->get_hash(); }
 		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;
+		const char *dispatch(ReceiverBase &, const char *, const char *) const override;
 	};
 
 	template<typename P, typename S>
@@ -237,6 +233,11 @@ public:
 	~Protocol();
 
 private:
+	static unsigned get_next_packet_class_id();
+
+	template<typename P>
+	static unsigned get_packet_class_id();
+
 	void add_packet(PacketDefBase *);
 
 protected:
@@ -260,13 +261,16 @@ public:
 	std::size_t dispatch(ReceiverBase &, const char *, std::size_t) const;
 
 	std::uint64_t get_hash() const;
-
-private:
-	template<typename T>
-	static std::string get_type_signature();
 };
 
 
+template<typename P>
+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)
 {
@@ -284,7 +288,7 @@ Protocol::PacketDefBuilder<P, Protocol::NullSerializer<P> > Protocol::add()
 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);
 }
 
@@ -300,17 +304,6 @@ std::size_t Protocol::serialize(const P &pkt, char *buf, std::size_t size) const
 	return size;
 }
 
-template<typename T>
-std::string Protocol::get_type_signature()
-{
-	const std::uint16_t sig = Traits<T>::signature;
-	std::string result;
-	result += sig&0xFF;
-	if(sig>=0x100)
-		result += '0'+(sig>>8);
-	return result;
-}
-
 
 template<typename T, std::uint8_t K>
 struct Protocol::BasicTraits
@@ -359,9 +352,9 @@ Protocol::CompoundDef<C, S>::CompoundDef(const S &s):
 { }
 
 template<typename C, typename S>
-std::string Protocol::CompoundDef<C, S>::describe() const
+std::uint64_t Protocol::CompoundDef<C, S>::get_hash() const
 {
-	return "{"+serializer.describe()+"}";
+	return hash_round<64>(serializer.get_hash(), 'C');
 }
 
 template<typename C, typename S>
@@ -377,6 +370,12 @@ const char *Protocol::CompoundDef<C, S>::deserialize(C &com, const char *buf, co
 }
 
 
+inline std::uint64_t Protocol::StringSerializer::get_hash() const
+{
+	return Traits<std::string>::signature;
+}
+
+
 template<typename A>
 Protocol::ArraySerializer<A>::ArraySerializer(const Protocol &proto):
 	length_serializer(proto),
@@ -384,17 +383,17 @@ Protocol::ArraySerializer<A>::ArraySerializer(const Protocol &proto):
 { }
 
 template<typename A>
-std::string Protocol::ArraySerializer<A>::describe() const
+std::uint64_t Protocol::ArraySerializer<A>::get_hash() const
 {
-	return "["+element_serializer.describe()+"]";
+	return hash_round<64>(element_serializer.get_hash(), 'A');
 }
 
 template<typename A>
 char *Protocol::ArraySerializer<A>::serialize(const A &array, char *buf, char *end) const
 {
 	buf = length_serializer.serialize(array.size(), buf, end);
-	for(typename A::const_iterator i=array.begin(); i!=array.end(); ++i)
-		buf = element_serializer.serialize(*i, buf, end);
+	for(const auto &e: array)
+		buf = element_serializer.serialize(e, buf, end);
 	return buf;
 }
 
@@ -436,9 +435,9 @@ Protocol::Serializer<P, Head, S>::Serializer(const Head &h, Pointer p, const Pro
 { }
 
 template<typename P, typename Head, typename S>
-std::string Protocol::Serializer<P, Head, S>::describe() const
+std::uint64_t Protocol::Serializer<P, Head, S>::get_hash() const
 {
-	return Head::describe()+ser.describe();
+	return hash_update<64>(Head::get_hash(), ser.get_hash());
 }
 
 template<typename P, typename Head, typename S>
@@ -460,10 +459,7 @@ 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()