Changeset 6786 for source/ariba/utility

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

Location:

source/ariba/utility

Files:

• addressing/facades/address_v.hpp (modified) (1 diff)
• addressing/facades/to_bytes_v.hpp (modified) (1 diff)
• addressing/port_address.hpp (modified) (1 diff)
• messages/Message.h (modified) (1 diff)
• serialization/Data.hpp (modified) (4 diffs)
• transport/tcpip/protlib/address.cpp (modified) (1 diff)

source/ariba/utility/addressing/facades/address_v.hpp

@@ -2 +2 @@
 #define ADDRESS_V_H_
 
+#include <stdint.h>
 #include <string>
 #include <iostream>

source/ariba/utility/addressing/facades/to_bytes_v.hpp

@@ -5 +5 @@
 
 #include <memory>
+#include <stdint.h>
 #include "vfacade.hpp"
 

source/ariba/utility/addressing/port_address.hpp

@@ -5 +5 @@
 
 #include<string>
+#include<cstdio>
+
 #include<boost/tr1/functional.hpp>
 

source/ariba/utility/messages/Message.h

@@ -105 +105 @@
          * data.
          */
-        inline Message( const Data& data ) :
+        explicit inline Message( const Data& data ) :
                 srcAddr(NULL),destAddr(NULL), releasePayload(true) {
                 this->payload = data.clone();

source/ariba/utility/serialization/Data.hpp

@@ -49 +49 @@
 template<typename T = uint8_t, typename DataModel = DefaultDataModel<uint8_t> > class DataTpl;
 typedef DataTpl<> Data;
-template<typename T, typename DataModel> std::ostream& operator<<(std::ostream& stream, DataTpl<T, DataModel>& data);
+template<typename T, typename DataModel> std::ostream& operator<<(std::ostream& stream, const DataTpl<T, DataModel>& data);
 
 //== internal includes ==
@@ -324 +324 @@
 };
 
-/* default human readable text output */
-template<typename T, typename DataModel>
-std::ostream& operator<<(std::ostream& stream, DataTpl<T, DataModel>& data) {
-        stream << "[" << bitstr(data.getBuffer(), data.getLength(), 4)
-                        << "|'";
-        char* buffer = (char*) data.getBuffer();
-        for (size_t i = 0; i < data.getLength() / 8; i++) {
-                char c = buffer[i] < 32 ? '.' : buffer[i];
-                stream << c;
-        }
-        stream << "']";
-        return stream;
-}
-
 /* unspecified type */
 template<typename T, typename DataModel>
@@ -397 +383 @@
 
         finline int32_t length() const {
-                return bufferLen;
+                return (bufferLen == -1) ? 0 : bufferLen;
         }
 
@@ -442 +428 @@
 }sznEnd();
 
+/* default human readable text output */
+template<typename T, typename DataModel>
+std::ostream& operator<<(std::ostream& stream, const DataTpl<T, DataModel>& data) {
+        stream << "[" << bitstr(data.getBuffer(), data.getLength(), 4)
+                        << "|'";
+        const char* buffer = (const char*) data.getBuffer();
+        for (size_t i = 0; i < data.getLength() / 8; i++) {
+                char c = buffer[i] < 32 ? '.' : buffer[i];
+                stream << c;
+        }
+        stream << "']";
+        return stream;
+}
 #endif /* DATA_HPP_ */

source/ariba/utility/transport/tcpip/protlib/address.cpp

@@ -534 +534 @@
         char ipstr[INET6_ADDRSTRLEN] = {0};
         // look for /
-        i = strchr(str,'/');
+        i = strchr((char*)str,'/');
         if (i) {
                 iplen = i-str;