Changeset 5151 for source/ariba/communication

Timestamp:

Jul 21, 2009, 1:54:55 PM (15 years ago)

Author:

Christoph Mayer

Message:

begin merge back from relay branch

Location:

source/ariba/communication

Files:

• BaseCommunication.cpp (modified) (1 diff)
• modules/transport/protlib/connectionmap.cpp (modified) (1 diff)
• modules/transport/tcp/TCPTransport.cpp (modified) (2 diffs)

source/ariba/communication/BaseCommunication.cpp

@@ -97 +97 @@
                 IPv4Locator* ipv4locator = dynamic_cast<IPv4Locator*>(*i);
 
-                // TODO: which locators can we find to bind to?
+                // TODO: which locators are find to bind to?
                 // localhost is not too bad, works when testing locally
                 // with several instances. the manual override currently

source/ariba/communication/modules/transport/protlib/connectionmap.cpp

@@ -101 +101 @@
 AssocData* ConnectionMap::lookup(const appladdress& addr) const 
 {
-        const_addr2data_it_t hit= addr2data.find(addr);
-        if (hit!=addr2data.end()) return hit->second;
-        else return NULL;
+        // hack: only search for ip addresses!
+        const char* addr_ip = addr.get_ip_str();
+        for (const_addr2data_it_t::const_iterator i=addr2data.begin(); i!=addr2data.end(); i++) {
+                const appladdress& map_addr = i->first;
+                const char* map_ip =  map_addr.get_ip_str();
+                if (strcmp(map_ip, addr_ip)==0) return i->second;
+        }
+        return NULL;
+
+//      const_addr2data_it_t hit= addr2data.find(addr);
+//      if (hit!=addr2data.end()) return hit->second;
+//      else return NULL;
 } // end lookup
 

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

@@ -242 +242 @@
         //std::cout << "XXXXXXXXXXXXXsending out data using tcp transport: " << data << std::endl;
 
-        const_cast<Message*>(message)->dropPayload();
 
         // prepare netmsg and send it
@@ -258 +257 @@
                         " to address " + address->toString() <<
                         ": " + message->toString() );
+        const_cast<Message*>(message)->dropPayload();
 
         string s = address->toString();