Changeset 4618 for source/ariba/communication

Timestamp:

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

Author:

Christoph Mayer

Message:

alle uint_8 auf uint_16 welche an serialisierung beteiligt sind

Location:

source/ariba/communication

Files:

• EndpointDescriptor.h (modified) (1 diff)
• messages/AribaBaseMsg.h (modified) (2 diffs)
• modules/transport/tcp/TCPTransport.cpp (modified) (2 diffs)

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();