Ignore:
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/modules/transport
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • source/ariba/communication/modules/transport/protlib/connectionmap.cpp

    r5150 r5151  
    101101AssocData* ConnectionMap::lookup(const appladdress& addr) const
    102102{
    103         const_addr2data_it_t hit= addr2data.find(addr);
    104         if (hit!=addr2data.end()) return hit->second;
    105         else return NULL;
     103        // hack: only search for ip addresses!
     104        const char* addr_ip = addr.get_ip_str();
     105        for (const_addr2data_it_t::const_iterator i=addr2data.begin(); i!=addr2data.end(); i++) {
     106                const appladdress& map_addr = i->first;
     107                const char* map_ip =  map_addr.get_ip_str();
     108                if (strcmp(map_ip, addr_ip)==0) return i->second;
     109        }
     110        return NULL;
     111
     112//      const_addr2data_it_t hit= addr2data.find(addr);
     113//      if (hit!=addr2data.end()) return hit->second;
     114//      else return NULL;
    106115} // end lookup
    107116
  • source/ariba/communication/modules/transport/tcp/TCPTransport.cpp

    r4618 r5151  
    242242        //std::cout << "XXXXXXXXXXXXXsending out data using tcp transport: " << data << std::endl;
    243243
    244         const_cast<Message*>(message)->dropPayload();
    245244
    246245        // prepare netmsg and send it
     
    258257                        " to address " + address->toString() <<
    259258                        ": " + message->toString() );
     259        const_cast<Message*>(message)->dropPayload();
    260260
    261261        string s = address->toString();
Note: See TracChangeset for help on using the changeset viewer.