Use size_t to represent sizes

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

diff --git a/source/net/protocol.cpp b/source/net/protocol.cpp
index d862ed82f72a37d7416160307dac7b7069d749bf..f8bf4c3dd2fdd43c2d42a8f250d746ab44c545d7 100644 (file)
--- a/source/net/protocol.cpp
+++ b/source/net/protocol.cpp
@@ -1,12 +1,14 @@
 #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"
+#include "protocol_impl.h"
 
 using namespace std;
 
-
 namespace Msp {
 namespace Net {
 
@@ -28,9 +30,13 @@ void Protocol::add_packet(PacketDefBase *pdef)
 {
        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
@@ -43,7 +49,7 @@ const Protocol::PacketDefBase &Protocol::get_packet_by_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);
@@ -54,7 +60,7 @@ unsigned Protocol::dispatch(ReceiverBase &rcv, const char *buf, unsigned size) c
        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;
@@ -63,10 +69,12 @@ unsigned Protocol::get_packet_size(const char *buf, unsigned size) const
        return header.length;
 }
 
-unsigned Protocol::get_hash() const
+UInt64 Protocol::get_hash() const
 {
-       // TODO
-       return 123;
+       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);
 }
 
 
@@ -79,7 +87,7 @@ char *Protocol::BasicSerializer<T>::serialize(const T &value, char *buf, char *e
                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;
@@ -92,12 +100,13 @@ const char *Protocol::BasicSerializer<T>::deserialize(T &value, const char *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;
@@ -108,6 +117,7 @@ template char *Protocol::BasicSerializer<UInt32>::serialize(const UInt32 &, char
 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;