X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fnet%2Fprotocol.h;h=fa90e6d250d87531fdc01069a90fe0cab6a90352;hb=6df110603b3a1248f52741e9d68d0bd032171b60;hp=05ea60e2f13232305a0ca18c9b50850db25e013c;hpb=8248f2912454229f4ded72b8fb4db3e76ea3ad15;p=libs%2Fnet.git diff --git a/source/net/protocol.h b/source/net/protocol.h index 05ea60e..fa90e6d 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 #include #include #include -#include #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 + template struct BasicTraits; template @@ -76,7 +74,7 @@ private: typedef std::string ValueType; private: - BasicSerializer length_serializer; + BasicSerializer length_serializer; public: StringSerializer(const Protocol &); @@ -93,7 +91,7 @@ private: typedef A ValueType; private: - BasicSerializer length_serializer; + BasicSerializer length_serializer; typename Traits::Serializer element_serializer; public: @@ -219,11 +217,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 PacketMap; @@ -256,12 +254,12 @@ protected: public: template - 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 @@ -291,9 +289,11 @@ const Protocol::PacketTypeDef

&Protocol::get_packet_by_class() const } template -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

&pdef = get_packet_by_class

(); + 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 +303,7 @@ unsigned Protocol::serialize(const P &pkt, char *buf, unsigned size) const template std::string Protocol::get_type_signature() { - const UInt16 sig = Traits::signature; + const std::uint16_t sig = Traits::signature; std::string result; result += sig&0xFF; if(sig>=0x100) @@ -312,41 +312,42 @@ std::string Protocol::get_type_signature() } -template +template struct Protocol::BasicTraits { - static const UInt16 signature = K | (sizeof(T)<<8); + static const std::uint16_t signature = K | (sizeof(T)<<8); typedef BasicSerializer Serializer; }; template struct Protocol::Traits { - static const UInt16 signature = 'C'; + static const std::uint16_t signature = 'C'; typedef CompoundSerializer Serializer; }; -template<> struct Protocol::Traits: BasicTraits { }; -template<> struct Protocol::Traits: BasicTraits { }; -template<> struct Protocol::Traits: BasicTraits { }; -template<> struct Protocol::Traits: BasicTraits { }; -template<> struct Protocol::Traits: BasicTraits { }; -template<> struct Protocol::Traits: BasicTraits { }; -template<> struct Protocol::Traits: BasicTraits { }; -template<> struct Protocol::Traits: BasicTraits { }; +template<> struct Protocol::Traits: BasicTraits { }; +template<> struct Protocol::Traits: BasicTraits { }; +template<> struct Protocol::Traits: BasicTraits { }; +template<> struct Protocol::Traits: BasicTraits { }; +template<> struct Protocol::Traits: BasicTraits { }; +template<> struct Protocol::Traits: BasicTraits { }; +template<> struct Protocol::Traits: BasicTraits { }; +template<> struct Protocol::Traits: BasicTraits { }; +template<> struct Protocol::Traits: BasicTraits { }; template<> struct Protocol::Traits: BasicTraits { }; template<> struct Protocol::Traits: BasicTraits { }; template<> struct Protocol::Traits { - static const UInt16 signature = 'S'; + static const std::uint16_t signature = 'S'; typedef StringSerializer Serializer; }; template struct Protocol::Traits > { - static const UInt16 signature = 'A'; + static const std::uint16_t signature = 'A'; typedef ArraySerializer > Serializer; }; @@ -400,7 +401,7 @@ char *Protocol::ArraySerializer::serialize(const A &array, char *buf, char *e template const char *Protocol::ArraySerializer::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