Changeset 2483 for source/ariba/communication/BaseCommunication.cpp

Timestamp:

Feb 24, 2009, 10:06:43 PM (16 years ago)

Author:

Christoph Mayer

Message:

-autolinks impl. (funktioniert noch nicht komplett, macht aber im moment nichts schlechter)
-einige fixes im ablauf etc.

File:

• source/ariba/communication/BaseCommunication.cpp (modified) (21 diffs)

source/ariba/communication/BaseCommunication.cpp

@@ -85 +85 @@
 
         for( ; i != iend; i++){
-                logging_debug( "local locator found " + (*i)->toString() );
+                logging_debug( "local locator found " << (*i)->toString() );
                 IPv4Locator* ipv4locator = dynamic_cast<IPv4Locator*>(*i);
 
@@ -101 +101 @@
                         localDescriptor.locator = ipv4locator;
                         localDescriptor.isUnspec = false;
-                        logging_info( "binding to addr = " + ipv4locator->toString() );
+                        logging_info( "binding to addr = " << ipv4locator->toString() );
                         foundLocator = true;
                         break;
@@ -180 +180 @@
         LinkID linkid = LinkID::create();
 
-        logging_debug( "creating new local descriptor entry with local link id " + linkid.toString() );
-        LinkDescriptor linkDescriptor( linkid, local, LinkID::UNSPECIFIED, remote, descriptor );
+        logging_debug( "creating new local descriptor entry with local link id " << linkid.toString() );
+        LinkDescriptor linkDescriptor( linkid, local, LinkID::UNSPECIFIED, remote, descriptor, false );
         addLink( linkDescriptor );
 
@@ -189 +189 @@
         //
 
-        logging_debug( "sending out base messages with request to open link to " + remote->toString() );
+        logging_debug( "sending out base messages with request to open link to " << remote->toString() );
         AribaBaseMsg baseMsg( remote, AribaBaseMsg::LINK_STATE_OPEN_REQUEST, linkid,
                                                                 LinkID::UNSPECIFIED );
@@ -206 +206 @@
                 logging_error( "don't know the link you want to drop" );
                 return;
+        }
+
+        // warn if this link has some queued messages attached
+        if( descriptor.waitingmsg.size() > 0 ){
+                logging_warn( "dropping link " << link.toString() << 
+                        " that has " << descriptor.waitingmsg.size() << " waiting messages" );
         }
 
@@ -231 +237 @@
 seqnum_t BaseCommunication::sendMessage( const LinkID lid, const Message* message) {
 
-        logging_debug( "sending out message to link " + lid.toString() );
+        logging_debug( "sending out message to link " << lid.toString() );
 
         // query local link info
         LinkDescriptor& linkDesc = queryLocalLink(lid);
         if( linkDesc.isUnspecified() ){
-                logging_error( "don't know the link with id " + lid.toString() );
-                return 0;
+                logging_error( "don't know the link with id " << lid.toString() );
+                return -1;
         }
 
@@ -251 +257 @@
         msg.encapsulate( const_cast<Message*>(message) );
 
-        // send message
-        transport->sendMessage( &msg );
-
-        return ++currentSeqnum;
+        if( linkDesc.linkup ){
+
+                // send message
+                transport->sendMessage( &msg );
+                return ++currentSeqnum;
+
+        } else {
+
+                // queue message
+                logging_info( "link " << lid.toString() << " is not up yet, queueing message" );
+                linkDesc.waitingmsg.push_back( new Message(msg) ); // TODO ooooo
+
+                return 0;
+
+        } // if( linkDesc.linkup )
 }
 
@@ -300 +317 @@
 
         AribaBaseMsg* spovmsg = ((Message*)message)->decapsulate<AribaBaseMsg>();
-        logging_debug( "receiving base comm message of type " + spovmsg->getTypeString() );
+        logging_debug( "receiving base comm message of type " << spovmsg->getTypeString() );
 
         //
@@ -351 +368 @@
                 const NetworkLocator* remoteLocator = dynamic_cast<const NetworkLocator*>(message->getSourceAddress());
 
-                logging_debug( "localLocator=" + localLocator->toString() + " remoteLocator="+remoteLocator->toString());
+                logging_debug( "localLocator=" << localLocator->toString() 
+                                << " remoteLocator=" << remoteLocator->toString());
 
                 // ask the registered listeners if this link
@@ -372 +390 @@
 
                 LinkDescriptor linkDescriptor(localLink, localLocator, remoteLink,
-                                        remoteLocator, EndpointDescriptor(remoteLocator));
+                                        remoteLocator, EndpointDescriptor(remoteLocator), true);
 
                 logging_debug( "saving new link descriptor with " <<
@@ -378 +396 @@
                                 "[local locator " << localLocator->toString() << "] " <<
                                 "[remote link " << remoteLink.toString() << "] " <<
-                                "[remote locator " << remoteLocator->toString() << "]" );
+                                "[remote locator " << remoteLocator->toString() << "]" <<
+                                "[link up true]" );
 
                 addLink( linkDescriptor );
@@ -400 +419 @@
                 // the link is now open
                 //
-
+                
                 BOOST_FOREACH( CommunicationEvents* i, eventListener ){
                         i->onLinkUp( localLink, localLocator, remoteLocator );
@@ -420 +439 @@
 
                 if (linkDesc.isUnspecified()) {
-                        logging_warn("Failed to find local link "+spovmsg->getRemoteLink().toString());
+                        logging_warn("Failed to find local link " << spovmsg->getRemoteLink().toString());
                         return false;
                 }
 
                 linkDesc.remoteLink = spovmsg->getLocalLink();
-                logging_debug( "the link is now up with local link id " + spovmsg->getRemoteLink().toString() );
+                linkDesc.linkup = true; 
+        
+                logging_debug( "the link is now up with local link id " << spovmsg->getRemoteLink().toString() );
 
                 BOOST_FOREACH( CommunicationEvents* i, eventListener ){
@@ -431 +452 @@
                 }
 
+                if( linkDesc.waitingmsg.size() > 0 ){ 
+                        logging_info( "sending out queued messages on link " << linkDesc.localLink.toString() );
+
+                        BOOST_FOREACH( Message* msg, linkDesc.waitingmsg ){
+                                sendMessage( linkDesc.localLink, msg );
+                                delete msg;
+                        }
+
+                        linkDesc.waitingmsg.clear();
+                }
+
         } // LINK_STATE_OPEN_REPLY
 
@@ -440 +472 @@
 
                 const LinkID& localLink = spovmsg->getRemoteLink();
-                logging_debug( "received link close request for link " + localLink.toString() );
+                logging_debug( "received link close request for link " << localLink.toString() );
 
                 //
@@ -450 +482 @@
                 LinkDescriptor& linkDesc = queryLocalLink( localLink );
                 if (linkDesc.isUnspecified()) {
-                        logging_warn("Failed to find local link "+localLink.toString());
+                        logging_warn("Failed to find local link " << localLink.toString());
                         return false;
                 }
@@ -469 +501 @@
 
                 const LinkID& localLink = spovmsg->getRemoteLink();
-                logging_debug( "received link update for link " + localLink.toString() );
+                logging_debug( "received link update for link " << localLink.toString() );
 
                 //
@@ -477 +509 @@
                 LinkDescriptor& linkDesc = queryLocalLink( localLink );
                 if (linkDesc.isUnspecified()) {
-                        logging_warn("Failed to update local link "+localLink.toString());
+                        logging_warn("Failed to update local link " << localLink.toString());
                         return false;
                 }
@@ -517 +549 @@
 
         for( ; i != iend; i++){
-                if( (*i).localLink == localLink){
-                        linkSet.erase( i );
-                        break;
-                }
+                if( (*i).localLink != localLink) continue;
+                
+                BOOST_FOREACH( Message* msg, i->waitingmsg ){
+                        delete msg;
+                }
+
+                i->waitingmsg.clear();
+                linkSet.erase( i );
+
+                break;
         }
 }
@@ -568 +606 @@
                 info.type != NetworkChangeInterface::EventTypeAddressDelete ) return;
 
-        logging_info("base communication is handling network address changes");
+        logging_info( "base communication is handling network address changes" );
 
         //
@@ -610 +648 @@
 
         for( ; i != iend; i++){
-                logging_debug( "local locator found " + (*i)->toString() );
+                logging_debug( "local locator found " << (*i)->toString() );
                 IPv4Locator* ipv4locator = dynamic_cast<IPv4Locator*>(*i);