#include <msp/strings/format.h>
#include <msp/strings/lexicalcast.h>
#include "protocol.h"
+#include "protocol_impl.h"
using namespace std;
{
PacketDefBase *&ptr = packet_class_defs[pdef->get_class_id()];
if(ptr)
+ {
+ packet_id_defs.erase(ptr->get_id());
delete ptr;
+ }
ptr = pdef;
- packet_id_defs[pdef->get_id()] = pdef;
+ if(unsigned id = pdef->get_id())
+ packet_id_defs[id] = pdef;
}
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
+size_t Protocol::dispatch(ReceiverBase &rcv, const char *buf, size_t size) const
{
PacketHeader header;
buf = header_def.deserialize(header, buf, buf+size);
return ptr-buf;
}
-unsigned Protocol::get_packet_size(const char *buf, unsigned size) const
+size_t Protocol::get_packet_size(const char *buf, size_t size) const
{
if(size<4)
return 0;
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);
+ return hash<64>(description);
}
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<bool>::serialize(const bool &, char *, char *) const;
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<UInt64>::serialize(const UInt64 &, 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<bool>::deserialize(bool &, const char *, const 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;