Changeset 5878

Timestamp:

Aug 12, 2009, 10:43:54 AM (15 years ago)

Author:

mies

Message:

 

File:

• source/ariba/overlay/BaseOverlay.cpp (modified) (5 diffs)

source/ariba/overlay/BaseOverlay.cpp

@@ -116 +116 @@
         // search for a descriptor that is already up
         BOOST_FOREACH( LinkDescriptor* lp, links )
-                if (lp->autolink && lp->remoteNode == node && lp->service == service && lp->up)
+                if (lp->autolink && lp->remoteNode == node && lp->service == service && lp->up && lp->keepAliveMissed == 0)
                         return lp;
         // if not found, search for one that is about to come up...
         BOOST_FOREACH( LinkDescriptor* lp, links )
-                if (lp->autolink && lp->remoteNode == node && lp->service == service )
+                if (lp->autolink && lp->remoteNode == node && lp->service == service && lp->keepAliveMissed == 0 )
                         return lp;
         return NULL;
@@ -154 +154 @@
                         if (ld->keepAliveMissed > 4) {
                                 logging_info( "Link connection request is stale, closing: " << ld );
-                                ld->relaying = false;
                                 oldlinks.push_back( ld );
                                 continue;
@@ -183 +182 @@
                         if (ld->keepAliveMissed >= 4) {
                                 logging_info( "Link is stale, closing: " << ld );
-                                ld->relaying = false;
                                 oldlinks.push_back( ld );
                                 continue;
@@ -192 +190 @@
         // drop links
         BOOST_FOREACH( const LinkDescriptor* ld, oldlinks ) {
-/*
-                vector<LinkID>::iterator it = std::find(
-                                bootstrapLinks.begin(), bootstrapLinks.end(), ld->communicationId);
-
-                if (!ld->communicationId.isUnspecified() && it != bootstrapLinks.end() ){
-                        logging_info( "Not dropping initiator link: " << ld );
-                        continue;
-                }
-*/
                 logging_info( "Link timed out. Dropping " << ld );
+                ld->relaying = false;
                 dropLink( ld->overlayId );
         }
@@ -402 +392 @@
                 || ld->relayed
                 || !message->isRelayed()
+                || !message->getService() == OverlayInterface::OVERLAY_SERVICE_ID
                 || message->getSourceNode()==nodeId ) return;