X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fnet%2Fprotocol.h;h=aca3ca8c1acba8698becd5bd637da570530d7e67;hb=d11d422d06ca0277dff4860a0bf71b1844c94b8a;hp=05ea60e2f13232305a0ca18c9b50850db25e013c;hpb=8248f2912454229f4ded72b8fb4db3e76ea3ad15;p=libs%2Fnet.git

diff --git a/source/net/protocol.h b/source/net/protocol.h
index 05ea60e..aca3ca8 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>
@@ -38,7 +36,7 @@ private:
 	template<typename C>
 	struct CompoundTypeDef
 	{
-		virtual ~CompoundTypeDef() { }
+		virtual ~CompoundTypeDef() = default;
 
 		virtual std::string describe() const = 0;
 		virtual char *serialize(const C &, char *, char *) const = 0;
@@ -76,7 +74,7 @@ private:
 		typedef std::string ValueType;
 
 	private:
-		BasicSerializer<UInt16> length_serializer;
+		BasicSerializer<std::uint16_t> length_serializer;
 
 	public:
 		StringSerializer(const Protocol &);
@@ -93,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:
@@ -165,11 +163,10 @@ 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;
@@ -182,14 +179,11 @@ 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 &);
@@ -219,11 +213,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;
@@ -239,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:
@@ -256,12 +255,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>
@@ -269,6 +268,13 @@ private:
 };
 
 
+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)
 {
@@ -286,14 +292,16 @@ 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);
 }
 
 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);
@@ -303,7 +311,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)
@@ -312,41 +320,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<typename T>
 struct Protocol::Traits
 {
-	static const UInt16 signature = 'C';
+	static const std::uint16_t 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'> { };
-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<> 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;
 };
 
@@ -400,7 +409,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)
@@ -459,10 +468,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()