X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fnet%2Fprotocol.cpp;h=81e9d142a56f93615152a9bfb7b5040ffe05b8ab;hb=92e8064d9f43ca3e28ce9832cfe475034ab98704;hp=db663821c370cef914676eb1da698cdb473f5c50;hpb=ee01d294f9078fbf17dc6a0a645ad3a342c49b1a;p=libs%2Fnet.git

diff --git a/source/net/protocol.cpp b/source/net/protocol.cpp
index db66382..81e9d14 100644
--- 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>
@@ -21,8 +20,8 @@ Protocol::Protocol(unsigned npi):
 
 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()
@@ -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;
-	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;
 }