Changeset 6786 for source/ariba/overlay/messages/DHTMessage.h

Timestamp:

Nov 2, 2009, 1:31:19 AM (14 years ago)

Author:

mies

Message:

Changed Data to Message conversion constructor in Message to explicit
Fixed some general bugs in Data: operator<<
Fixed bug in DHTMessage: allow unspecified key/values
Added local DHT message delivery
Adapted sources to work with gcc 4.4.1

File:

• source/ariba/overlay/messages/DHTMessage.h (modified) (2 diffs)

source/ariba/overlay/messages/DHTMessage.h

@@ -62 +62 @@
         X && ttl;
 
+//      std::cout << "1" << std::endl;
+
         // key serialization
-        uint16_t key_length = key.getLength();
+        uint16_t key_length = key.isUnspecified() ? 0 : key.getLength();
         X && key_length;
         if (X.isDeserializer()) key.setLength( key_length );
-        X && key;
+
+//      std::cout << "2 - " << key_length << std::endl;
+        X && this->key;
+//      std::cout << "2b" << std::endl;
 
         // store number of values
@@ -72 +77 @@
         X && num_values;
 
+//      std::cout << "3" << std::endl;
+
         // value serialization
         for (size_t i=0; i<num_values; i++) {
-                Data value = values[i];
-                uint16_t value_length = value.getLength();
+//              std::cout << "4" << std::endl;
+                Data value;
+                if (X.isSerializer()) value = values[i];
+                uint16_t value_length = value.isUnspecified() ? 0 : value.getLength();
                 X && value_length;
+//              std::cout << "5" << std::endl;
                 if (X.isDeserializer()) value.setLength( value_length );
                 X && value;
+//              std::cout << "6" << std::endl;
                 if (X.isDeserializer()) values.push_back(value);
         }