Changeset 10572 for source/ariba/overlay/messages

Timestamp:

Jun 18, 2012, 1:40:59 PM (12 years ago)

Author:

Michael Tänzer

Message:

Fix DHT: messages got lost if not communicating over a direct link.

Also:

• Fix mem leak
• Code clean up

Location:

source/ariba/overlay/messages

Files:

• DHTMessage.cpp (modified) (1 diff)
• DHTMessage.h (modified) (2 diffs)

source/ariba/overlay/messages/DHTMessage.cpp

@@ -8 +8 @@
 vsznDefault(DHTMessage);
 
-DHTMessage::DHTMessage() {
-        this->key.setLength(0);
-        this->ttl = 0;
-        this->replace = false;
-}
+DHTMessage::DHTMessage() :
+        ttl( 0 ),
+        replace( false )
+{}
 
-DHTMessage::DHTMessage( const Data& key ) {
-        // calculate hash of key
-        this->hash = NodeID::sha1( key.getBuffer(), key.getLength() / 8 );
-        this->key = key.clone();
-        this->ttl = 0;
-        this->replace = false;
-}
+DHTMessage::DHTMessage( const Data& key ) :
+        ttl( 0 ),
+        replace( false ),
+        key( key.clone() )
+{}
 
-DHTMessage::DHTMessage( const Data& key, const Data& value ) {
-        // calculate hash of key
-        this->hash = NodeID::sha1( key.getBuffer(), key.getLength() / 8 );
-        this->key = key.clone();
-        this->values.push_back( value.clone() );
-        this->ttl = 0;
-        this->replace = false;
-}
+DHTMessage::DHTMessage( const Data& key, const Data& value ) :
+        ttl( 0 ),
+        replace( false ),
+        key( key.clone() ),
+        values(1, value.clone())
+{}
 
-DHTMessage::DHTMessage( const Data& key, const vector<Data>& values ) {
-        this->hash = NodeID::sha1( key.getBuffer(), key.getLength() / 8 );
-        this->key = key.clone();
+DHTMessage::DHTMessage( const Data& key, const vector<Data>& values ) :
+        ttl( 0 ),
+        replace( false ),
+        key( key.clone() )
+{
+        // preallocate enough room so we don't need to copy a lot
+        this->values.reserve(values.size());
         BOOST_FOREACH(const Data value, values )
                 this->values.push_back( value.clone() );
-        this->ttl = 0;
-        this->replace = false;
 }
 

source/ariba/overlay/messages/DHTMessage.h

@@ -20 +20 @@
 
         const NodeID& getHashedKey() const {
-                return hash;
+                return NodeID::sha1( key.getBuffer(), key.getLength() / 8 );
         }
 
@@ -58 +58 @@
 
 private:
-        NodeID hash;
         uint16_t ttl;
         bool replace;