#include <cstring>
#include <string>
-#include <msp/core/hash.h>
#include <msp/core/maputils.h>
#include <msp/strings/format.h>
#include <msp/strings/lexicalcast.h>
header_def(0),
next_packet_id(npi)
{
- PacketDefBuilder<PacketHeader, NullSerializer<PacketHeader> >(*this, header_def, NullSerializer<PacketHeader>())
+ PacketDefBuilder<PacketHeader, Serializer<PacketHeader>>(*this, header_def, Serializer<PacketHeader>())
(&PacketHeader::type)(&PacketHeader::length);
}
Protocol::~Protocol()
{
- for(map<unsigned, PacketDefBase *>::iterator i=packet_class_defs.begin(); i!=packet_class_defs.end(); ++i)
- delete i->second;
+ for(auto &kvp: packet_class_defs)
+ delete kvp.second;
}
unsigned Protocol::get_next_packet_class_id()
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 hash<64>(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;
}
{ }
-Protocol::PacketHeader::PacketHeader():
- type(0),
- length(0)
-{ }
-
Protocol::PacketHeader::PacketHeader(uint16_t t, uint16_t l):
type(t),
length(l)