Simplify the inner workings of Protocol

[libs/net.git] / source / net / protocol.cpp

diff --git a/source/net/protocol.cpp b/source/net/protocol.cpp
index 9cba6382d307dcae861d3f4298c76ee4f86ac09b..cee18367b7cb254abf220e33eaad1f76958679f0 100644 (file)
--- a/source/net/protocol.cpp
+++ b/source/net/protocol.cpp
@@ -1,6 +1,5 @@
 #include <cstring>
 #include <string>
-#include <msp/core/hash.h>
 #include <msp/core/maputils.h>
 #include <msp/strings/format.h>
 #include <msp/strings/lexicalcast.h>
@@ -15,7 +14,7 @@ Protocol::Protocol(unsigned npi):
        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);
 }
 
@@ -76,10 +75,13 @@ size_t Protocol::get_packet_size(const char *buf, size_t size) const
 
 uint64_t Protocol::get_hash() const
 {
-       string description;
+       uint64_t result = hash<64>(packet_id_defs.size());
        for(auto &kvp: packet_id_defs)
-               description += format("%d:%s\n", kvp.first, kvp.second->describe());
-       return hash<64>(description);
+       {
+               hash_update<64>(result, kvp.first);
+               hash_update<64>(result, kvp.second->get_hash());
+       }
+       return result;
 }
 
 
@@ -164,11 +166,6 @@ Protocol::PacketDefBase::PacketDefBase(unsigned i):
 { }
 
 
-Protocol::PacketHeader::PacketHeader():
-       type(0),
-       length(0)
-{ }
-
 Protocol::PacketHeader::PacketHeader(uint16_t t, uint16_t l):
        type(t),
        length(l)