Changeset 4618

Timestamp:

Jun 29, 2009, 4:49:46 PM (15 years ago)

Author:

Christoph Mayer

Message:

alle uint_8 auf uint_16 welche an serialisierung beteiligt sind

Files:

• sample/pingpong/PingPongMessage.h (modified) (1 diff)
• source/ariba/communication/EndpointDescriptor.h (modified) (1 diff)
• source/ariba/communication/messages/AribaBaseMsg.h (modified) (2 diffs)
• source/ariba/communication/modules/transport/tcp/TCPTransport.cpp (modified) (2 diffs)
• source/ariba/overlay/messages/LinkRequest.h (modified) (1 diff)
• source/ariba/overlay/messages/OverlayMsg.h (modified) (1 diff)
• source/ariba/overlay/modules/chord/messages/ChordMessage.h (modified) (1 diff)
• source/ariba/overlay/modules/chord/messages/Discovery.h (modified) (1 diff)
• source/ariba/overlay/modules/onehop/messages/OneHopMessage.h (modified) (1 diff)
• source/ariba/utility/types/Identifier.h (modified) (1 diff)
• source/ariba/utility/types/OverlayParameterSet.h (modified) (1 diff)

sample/pingpong/PingPongMessage.h

@@ -18 +18 @@
 public:
         PingPongMessage();
-        PingPongMessage( uint8_t _id );
+        PingPongMessage( uint16_t _id );
         virtual ~PingPongMessage();
 
         string info();
-        uint8_t getid();
+        uint16_t getid();
 private:
-        uint8_t id;
+        uint16_t id; //TODO: was uint8_t
 };
 

source/ariba/communication/EndpointDescriptor.h

@@ -100 +100 @@
 
 sznBeginDefault( ariba::communication::EndpointDescriptor, X ) {
-        uint8_t unspec = isUnspec;
+        uint16_t unspec = isUnspec; //TODO: was uint8_t
 
         X && unspec && VO(locator);

source/ariba/communication/messages/AribaBaseMsg.h

@@ -85 +85 @@
 
 private:
-        uint8_t state;          // the link message type
+        uint16_t state;         // the link message type //TODO: was uint8_t
         LinkID localLink;       // the local link id
         LinkID remoteLink;      // the remote link id
@@ -94 +94 @@
 
 sznBeginDefault( ariba::communication::AribaBaseMsg, X ) {
-        uint8_t x = 0xff;
-        X && state && x && &localLink && &remoteLink && Payload();
+        X && state && &localLink && &remoteLink && Payload();
 } sznEnd();
 

source/ariba/communication/modules/transport/tcp/TCPTransport.cpp

@@ -203 +203 @@
                                         // converting message
                                         logging_debug( "converting message" );
-
-
-                                        std::cout << "XXXXXXXXXXXXreceived data on tcp transport: " << data << std::endl;
-
-
+                                        //std::cout << "XXXXXXXXXXXXreceived data on tcp transport: " << data << std::endl;
                                         Message* msg = new Message(data);
+
                                         std::ostringstream o;
                                         o << (peer->get_ip_str() + 7) << ":" << remotePort;
@@ -243 +240 @@
 
         Data data = data_serialize( message );
-
-
-        std::cout << "XXXXXXXXXXXXXsending out data using tcp transport: " << data << std::endl;
-
-
-
+        //std::cout << "XXXXXXXXXXXXXsending out data using tcp transport: " << data << std::endl;
 
         const_cast<Message*>(message)->dropPayload();

source/ariba/overlay/messages/LinkRequest.h

@@ -24 +24 @@
 private:
         bool free_endpoint_;
-        uint8_t flags;
+        uint16_t flags; //TODO: was uint8_t
         uint32_t nonce;
         const EndpointDescriptor* endpoint;

source/ariba/overlay/messages/OverlayMsg.h

@@ -90 +90 @@
 
 private:
-        uint8_t type;
+        uint16_t type; //TODO: was uint8_t
         ServiceID service;
         NodeID sourceNode;

source/ariba/overlay/modules/chord/messages/ChordMessage.h

@@ -97 +97 @@
 
 private:
-        uint8_t type;
-        uint8_t hop_count;
+        uint16_t type; //TODO: was uint8_t
+        uint16_t hop_count; //TODO: was uint8_t
         NodeID source, destination;
 };

source/ariba/overlay/modules/chord/messages/Discovery.h

@@ -108 +108 @@
 
 private:
-        uint8_t follow_type;
-        uint8_t ttl;
+        uint16_t follow_type; //TODO: was uint8_t
+        uint16_t ttl; //TODO: was uint8_t
         EndpointDescriptor* source_endpoint;
 //      NodeEndpointList descriptors;

source/ariba/overlay/modules/onehop/messages/OneHopMessage.h

@@ -68 +68 @@
 
 private:
-        uint8_t type;
+        uint16_t type; // TODO: was uint8_t
 };
 

source/ariba/utility/types/Identifier.h

@@ -569 +569 @@
 /* serializers */
 sznBeginDefault( ariba::utility::Identifier, X ) {
+
         // calculate length of key
         uint16_t len = array_size*sizeof(mp_limb_t);
-        uint8_t unspec = isUnspec;
+        uint16_t unspec = isUnspec; //TODO: was uint8_t
 
         // only serialize the lower 16 bits of keyLength
         X && unspec && len;
 
-        /*
-        if (X.isDeserializer()){
-                if(len != array_size*sizeof(mp_limb_t)){
-                        std::cout << "len: " << len << ", array_size: "
-                                << array_size << ", sizeof(mp_limb_t): " << sizeof(mp_limb_t) << std::endl;
-                        assert(false);
-                }
-        }
-        */
-
         // serialize the identifier
         for (int i=array_size-1; i>=0; i--) X && key[i];
 
-        // when deserializing reset unspec flag
+        // when deserializing set unspec flag
         if (X.isDeserializer()){
-                //isUnspec = unspec;
-                isUnspec = false;
-                //std::cout << "isUnspec: " << (isUnspec ? "true" : "false") << "   " << "unspec: " << (int)unspec << std::endl;
+                isUnspec = unspec;
         }
 

source/ariba/utility/types/OverlayParameterSet.h

@@ -64 +64 @@
 
 private:
-        uint8_t structure;
+        uint16_t structure; //TODO: was uint8_t
 
 };