#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 {
{
public:
bad_packet(const std::string &w): std::runtime_error(w) { }
- virtual ~bad_packet() throw() { }
};
{
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>
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;
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;
- virtual const char *deserialize(C &, const char *, const char *) const;
+ std::string describe() const override;
+ char *serialize(const C &, char *, char *) const override;
+ const char *deserialize(C &, const char *, const char *) const override;
};
template<typename T>
typedef std::string ValueType;
private:
- BasicSerializer<UInt16> length_serializer;
+ BasicSerializer<std::uint16_t> length_serializer;
public:
StringSerializer(const Protocol &);
typedef A ValueType;
private:
- BasicSerializer<UInt16> length_serializer;
+ BasicSerializer<std::uint16_t> length_serializer;
typename Traits<typename A::value_type>::Serializer element_serializer;
public:
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;
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;
+ std::string describe() const override { 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;
+ const char *dispatch(ReceiverBase &, const char *, const char *) const override;
};
template<typename P, typename S>
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;
~Protocol();
private:
+ static unsigned get_next_packet_class_id();
+
+ template<typename P>
+ static unsigned get_packet_class_id();
+
void add_packet(PacketDefBase *);
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>
};
+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)
{
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);
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)
}
-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;
};
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);
}
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;
}
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)
}
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()
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
{
projects / libs / net.git / blobdiff