+#include "protocol.h"
#include <cstring>
#include <string>
-#include <msp/core/hash.h>
#include <msp/core/maputils.h>
#include <msp/strings/format.h>
#include <msp/strings/lexicalcast.h>
-#include "protocol.h"
using namespace std;
namespace Msp {
namespace Net {
-Protocol::Protocol(unsigned npi):
- header_def(0),
- next_packet_id(npi)
+Protocol::Protocol():
+ header_def(0)
{
- PacketDefBuilder<PacketHeader,
NullSerializer<PacketHeader> >(*this, header_def, NullSerializer<PacketHeader>())
- (&PacketHeader::type)(&PacketHeader::length);
+ PacketDefBuilder<PacketHeader,
Serializer<PacketHeader>>(*this, header_def, Serializer<PacketHeader>())
+ .fields(&PacketHeader::type, &PacketHeader::length);
}
-Protocol::~Protocol()
+unsigned Protocol::get_next_packet_class_id()
{
- for(map<unsigned, PacketDefBase *>::iterator i=packet_class_defs.begin(); i!=packet_class_defs.end(); ++i)
- delete i->second;
+ static unsigned next_id = 1;
+ return next_id++;
}
-void Protocol::add_packet(PacketDefBase *pdef)
+void Protocol::add_packet(unique_ptr<PacketDefBase> pdef)
{
- PacketDefBase *&ptr = packet_class_defs[pdef->get_class_id()];
+ unique_ptr<PacketDefBase> &ptr = packet_class_defs[pdef->get_class_id()];
if(ptr)
- {
packet_id_defs.erase(ptr->get_id());
- delete ptr;
- }
- ptr = pdef;
- if(unsigned id = pdef->get_id())
- packet_id_defs[id] = pdef;
+ ptr = move(pdef);
+ if(unsigned id = ptr->get_id())
+ packet_id_defs[id] = ptr.get();
}
const Protocol::PacketDefBase &Protocol::get_packet_by_class_id(unsigned id) const
return *get_item(packet_id_defs, id);
}
-unsigned Protocol::dispatch(ReceiverBase &rcv, const char *buf, unsigned size) const
+unsigned Protocol::get_max_packet_id() const
+{
+ if(packet_id_defs.empty())
+ return 0;
+ return prev(packet_id_defs.end())->first;
+}
+
+size_t Protocol::dispatch(ReceiverBase &rcv, const char *buf, size_t size, unsigned base_id) const
{
PacketHeader header;
- buf = header_def.deserialize(header, buf, buf+size);
+ const char *ptr = header_def.deserialize(header, buf, buf+size);
if(header.length>size)
throw bad_packet("truncated");
- const PacketDefBase &pdef = get_packet_by_id(header.type);
- const char *ptr = pdef.dispatch(rcv, buf, buf+header.length);
+ const PacketDefBase &pdef = get_packet_by_id(header.type-base_id);
+ if(DynamicReceiver *drcv = dynamic_cast<DynamicReceiver *>(&rcv))
+ {
+ Variant pkt;
+ ptr = pdef.deserialize(pkt, ptr, ptr+header.length);
+ drcv->receive(pdef.get_id(), pkt);
+ }
+ else
+ ptr = pdef.dispatch(rcv, ptr, ptr+header.length);
return ptr-buf;
}
-unsigned Protocol::get_packet_size(const char *buf, unsigned size) const
+bool Protocol::get_packet_header(PacketHeader &header, const char *buf, size_t size) const
{
if(size<4)
- return 0;
- PacketHeader header;
+ return false;
header_def.deserialize(header, buf, buf+size);
- return header.length;
+ return true;
+}
+
+size_t Protocol::get_packet_size(const char *buf, size_t size) const
+{
+ PacketHeader header;
+ return (get_packet_header(header, buf, size) ? header.length : 0);
}
-UInt64 Protocol::get_hash() const
+uint64_t Protocol::get_hash() const
{
- string description;
- for(PacketMap::const_iterator i=packet_id_defs.begin(); i!=packet_id_defs.end(); ++i)
- description += format("%d:%s\n", i->first, i->second->describe());
- return hash64(description);
+ uint64_t result = hash<64>(packet_id_defs.size());
+ for(auto &kvp: packet_id_defs)
+ {
+ hash_update<64>(result, kvp.first);
+ hash_update<64>(result, kvp.second->get_hash());
+ }
+ return result;
}
throw buffer_error("overflow");
const char *ptr = reinterpret_cast<const char *>(&value)+sizeof(T);
- for(unsigned i=0; i<sizeof(T); ++i)
+ for(size_t i=0; i<sizeof(T); ++i)
*buf++ = *--ptr;
return buf;
throw buffer_error("underflow");
char *ptr = reinterpret_cast<char *>(&value)+sizeof(T);
- for(unsigned i=0; i<sizeof(T); ++i)
+ for(size_t i=0; i<sizeof(T); ++i)
*--ptr = *buf++;
return buf;
}
-template char *Protocol::BasicSerializer<Int8>::serialize(const Int8 &, char *, char *) const;
-template char *Protocol::BasicSerializer<Int16>::serialize(const Int16 &, char *, char *) const;
-template char *Protocol::BasicSerializer<Int32>::serialize(const Int32 &, char *, char *) const;
-template char *Protocol::BasicSerializer<Int64>::serialize(const Int64 &, char *, char *) const;
-template char *Protocol::BasicSerializer<UInt8>::serialize(const UInt8 &, char *, char *) const;
-template char *Protocol::BasicSerializer<UInt16>::serialize(const UInt16 &, char *, char *) const;
-template char *Protocol::BasicSerializer<UInt32>::serialize(const UInt32 &, char *, char *) const;
-template char *Protocol::BasicSerializer<UInt64>::serialize(const UInt64 &, char *, char *) const;
+template char *Protocol::BasicSerializer<bool>::serialize(const bool &, char *, char *) const;
+template char *Protocol::BasicSerializer<int8_t>::serialize(const int8_t &, char *, char *) const;
+template char *Protocol::BasicSerializer<int16_t>::serialize(const int16_t &, char *, char *) const;
+template char *Protocol::BasicSerializer<int32_t>::serialize(const int32_t &, char *, char *) const;
+template char *Protocol::BasicSerializer<int64_t>::serialize(const int64_t &, char *, char *) const;
+template char *Protocol::BasicSerializer<uint8_t>::serialize(const uint8_t &, char *, char *) const;
+template char *Protocol::BasicSerializer<uint16_t>::serialize(const uint16_t &, char *, char *) const;
+template char *Protocol::BasicSerializer<uint32_t>::serialize(const uint32_t &, char *, char *) const;
+template char *Protocol::BasicSerializer<uint64_t>::serialize(const uint64_t &, char *, char *) const;
template char *Protocol::BasicSerializer<float>::serialize(const float &, char *, char *) const;
template char *Protocol::BasicSerializer<double>::serialize(const double &, char *, char *) const;
-template const char *Protocol::BasicSerializer<Int8>::deserialize(Int8 &, const char *, const char *) const;
-template const char *Protocol::BasicSerializer<Int16>::deserialize(Int16 &, const char *, const char *) const;
-template const char *Protocol::BasicSerializer<Int32>::deserialize(Int32 &, const char *, const char *) const;
-template const char *Protocol::BasicSerializer<Int64>::deserialize(Int64 &, const char *, const char *) const;
-template const char *Protocol::BasicSerializer<UInt8>::deserialize(UInt8 &, const char *, const char *) const;
-template const char *Protocol::BasicSerializer<UInt16>::deserialize(UInt16 &, const char *, const char *) const;
-template const char *Protocol::BasicSerializer<UInt32>::deserialize(UInt32 &, const char *, const char *) const;
-template const char *Protocol::BasicSerializer<UInt64>::deserialize(UInt64 &, const char *, const char *) const;
+template const char *Protocol::BasicSerializer<bool>::deserialize(bool &, const char *, const char *) const;
+template const char *Protocol::BasicSerializer<int8_t>::deserialize(int8_t &, const char *, const char *) const;
+template const char *Protocol::BasicSerializer<int16_t>::deserialize(int16_t &, const char *, const char *) const;
+template const char *Protocol::BasicSerializer<int32_t>::deserialize(int32_t &, const char *, const char *) const;
+template const char *Protocol::BasicSerializer<int64_t>::deserialize(int64_t &, const char *, const char *) const;
+template const char *Protocol::BasicSerializer<uint8_t>::deserialize(uint8_t &, const char *, const char *) const;
+template const char *Protocol::BasicSerializer<uint16_t>::deserialize(uint16_t &, const char *, const char *) const;
+template const char *Protocol::BasicSerializer<uint32_t>::deserialize(uint32_t &, const char *, const char *) const;
+template const char *Protocol::BasicSerializer<uint64_t>::deserialize(uint64_t &, const char *, const char *) const;
template const char *Protocol::BasicSerializer<float>::deserialize(float &, const char *, const char *) const;
template const char *Protocol::BasicSerializer<double>::deserialize(double &, const char *, const char *) const;
const char *Protocol::StringSerializer::deserialize(string &str, const char *buf, const char *end) const
{
- UInt16 length;
+ uint16_t length;
buf = length_serializer.deserialize(length, buf, end);
if(end-buf<static_cast<int>(length))
throw buffer_error("underflow");
}
-unsigned Protocol::PacketDefBase::next_class_id = 1;
-
Protocol::PacketDefBase::PacketDefBase(unsigned i):
id(i)
{ }
-Protocol::PacketHeader::PacketHeader():
- type(0),
- length(0)
-{ }
-
-Protocol::PacketHeader::PacketHeader(UInt16 t, UInt16 l):
+Protocol::PacketHeader::PacketHeader(uint16_t t, uint16_t l):
type(t),
length(l)
{ }
projects / libs / net.git / blobdiff