#include <cstdint>
#include <map>
+#include <memory>
#include <stdexcept>
#include <vector>
#include <msp/core/hash.h>
+#include "mspnet_api.h"
#include "receiver.h"
namespace Msp {
namespace Net {
-class bad_packet: public std::runtime_error
+class MSPNET_API bad_packet: public std::runtime_error
{
public:
bad_packet(const std::string &w): std::runtime_error(w) { }
};
-class buffer_error: public std::runtime_error
+class MSPNET_API buffer_error: public std::runtime_error
{
public:
buffer_error(const std::string &w): std::runtime_error(w) { }
};
-class Protocol
+class MSPNET_API Protocol
{
+public:
+ struct PacketHeader
+ {
+ std::uint16_t type = 0;
+ std::uint16_t length = 0;
+
+ PacketHeader() = default;
+ PacketHeader(std::uint16_t, std::uint16_t);
+ };
+
private:
template<typename T, std::uint8_t K>
struct BasicTraits;
virtual unsigned get_class_id() const = 0;
unsigned get_id() const { return id; }
virtual std::uint64_t get_hash() const = 0;
+ virtual const char *deserialize(Variant &, const char *, const char *) const = 0;
virtual const char *dispatch(ReceiverBase &, const char *, const char *) const = 0;
};
class PacketTypeDef: public PacketDefBase
{
private:
- Serializer<P> *serializer;
+ std::unique_ptr<Serializer<P>> serializer;
public:
PacketTypeDef(unsigned);
- ~PacketTypeDef();
unsigned get_class_id() const override { return get_packet_class_id<P>(); }
std::uint64_t get_hash() const override { return serializer->get_hash(); }
char *serialize(const P &, char *, char *) const;
const char *deserialize(P &, const char *, const char *) const;
+ const char *deserialize(Variant &, const char *, const char *) const override;
const char *dispatch(ReceiverBase &, const char *, const char *) const override;
};
public:
PacketDefBuilder(const Protocol &, PacketTypeDef<P> &, const S &);
-
- template<typename T>
- PacketDefBuilder<P, typename S::template Next<T>> operator()(T P::*);
- };
- struct PacketHeader
- {
- std::uint16_t type = 0;
- std::uint16_t length = 0;
+ template<typename T>
+ PacketDefBuilder<P, typename S::template Next<T>> fields(T P::*);
- PacketHeader() = default;
- PacketHeader(std::uint16_t, std::uint16_t);
+ template<typename T1, typename T2, typename... Rest>
+ auto fields(T1 P::*first, T2 P::*second, Rest P::*...rest) { return fields(first).fields(second, rest...); }
};
- typedef std::map<unsigned, PacketDefBase *> PacketMap;
-
PacketTypeDef<PacketHeader> header_def;
- unsigned next_packet_id;
- PacketMap packet_class_defs;
- PacketMap packet_id_defs;
+ unsigned next_packet_id = 1;
+ std::map<unsigned, std::unique_ptr<PacketDefBase>> packet_class_defs;
+ std::map<unsigned, PacketDefBase *> packet_id_defs;
protected:
- Protocol(unsigned = 1);
-public:
- ~Protocol();
+ Protocol();
private:
static unsigned get_next_packet_class_id();
template<typename P>
static unsigned get_packet_class_id();
- void add_packet(PacketDefBase *);
+ void add_packet(std::unique_ptr<PacketDefBase>);
protected:
- template<typename P>
- PacketDefBuilder<P, Serializer<P>> add(unsigned);
-
template<typename P>
PacketDefBuilder<P, Serializer<P>> add();
+ template<typename P, typename T, typename... Rest>
+ auto add(T P::*field, Rest P::*...rest) { return add<P>().fields(field, rest...); }
+
const PacketDefBase &get_packet_by_class_id(unsigned) const;
const PacketDefBase &get_packet_by_id(unsigned) const;
public:
template<typename P>
- std::size_t serialize(const P &, char *, std::size_t) const;
+ bool has_packet() const { return packet_class_defs.count(get_packet_class_id<P>()); }
+
+ template<typename P>
+ unsigned get_packet_id() const { return get_item(packet_class_defs, get_packet_class_id<P>())->get_id(); }
+
+ unsigned get_max_packet_id() const;
+ template<typename P>
+ std::size_t serialize(const P &, char *, std::size_t, unsigned = 0) const;
+
+ bool get_packet_header(PacketHeader &, const char *, std::size_t) const;
std::size_t get_packet_size(const char *, std::size_t) const;
- std::size_t dispatch(ReceiverBase &, const char *, std::size_t) const;
+ std::size_t dispatch(ReceiverBase &, const char *, std::size_t, unsigned = 0) const;
std::uint64_t get_hash() const;
};
return id;
}
-template<typename P>
-Protocol::PacketDefBuilder<P, Protocol::Serializer<P>> Protocol::add(unsigned id)
-{
- PacketTypeDef<P> *pdef = new PacketTypeDef<P>(id);
- add_packet(pdef);
- return PacketDefBuilder<P, Serializer<P>>(*this, *pdef, Serializer<P>());
-}
-
template<typename P>
Protocol::PacketDefBuilder<P, Protocol::Serializer<P>> Protocol::add()
{
- return add<P>(next_packet_id++);
+ std::unique_ptr<PacketTypeDef<P>> pdef = std::make_unique<PacketTypeDef<P>>(next_packet_id++);
+ PacketDefBuilder<P, Serializer<P>> next(*this, *pdef, Serializer<P>());
+ add_packet(move(pdef));
+ return next;
}
template<typename P>
}
template<typename P>
-std::size_t Protocol::serialize(const P &pkt, char *buf, std::size_t size) const
+std::size_t Protocol::serialize(const P &pkt, char *buf, std::size_t size, unsigned base_id) 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);
+ header_def.serialize(PacketHeader(base_id+pdef.get_id(), size), buf, buf+4);
return size;
}
template<typename P>
Protocol::PacketTypeDef<P>::PacketTypeDef(unsigned i):
PacketDefBase(i),
- serializer(new Serializer<P>)
+ serializer(std::make_unique<Serializer<P>>())
{ }
-template<typename P>
-Protocol::PacketTypeDef<P>::~PacketTypeDef()
-{
- delete serializer;
-}
-
template<typename P>
template<typename S>
void Protocol::PacketTypeDef<P>::set_serializer(const S &ser)
{
- delete serializer;
- serializer = new S(ser);
+ serializer = std::make_unique<S>(ser);
}
template<typename P>
return serializer->deserialize(pkt, buf, end);
}
+template<typename P>
+const char *Protocol::PacketTypeDef<P>::deserialize(Variant &var_pkt, const char *buf, const char *end) const
+{
+ P pkt;
+ const char *ptr = serializer->deserialize(pkt, buf, end);
+ var_pkt = std::move(pkt);
+ return ptr;
+}
+
template<typename P>
const char *Protocol::PacketTypeDef<P>::dispatch(ReceiverBase &rcv, const char *buf, const char *end) const
{
template<typename P, typename S>
template<typename T>
-Protocol::PacketDefBuilder<P, typename S::template Next<T>> Protocol::PacketDefBuilder<P, S>::operator()(T P::*ptr)
+Protocol::PacketDefBuilder<P, typename S::template Next<T>> Protocol::PacketDefBuilder<P, S>::fields(T P::*ptr)
{
typename S::template Next<T> next_ser(serializer, ptr, protocol);
pktdef.set_serializer(next_ser);