Changeset 2803

Timestamp:

Apr 16, 2009, 10:45:03 AM (16 years ago)

Author:

Christoph Mayer

Message:

-drop all auto-links when leaving the spovnet

Location:

source/ariba/overlay

Files:

• BaseOverlay.cpp (modified) (3 diffs)
• BaseOverlay.h (modified) (1 diff)

source/ariba/overlay/BaseOverlay.cpp

@@ -108 +108 @@
         logging_info( "leaving spovnet " << spovnetId );
 
+        logging_debug( "dropping all auto-links ..." );
+        
+        BOOST_FOREACH( LinkPair item, linkMapping ){
+                if( item.second.autolink ) 
+                        dropLink( item.first );
+        }
+
+        logging_debug( "leaving overlay" );
         // first, leave the overlay interface
         overlayInterface->leaveOverlay();
@@ -880 +888 @@
         // drop links after a timeout of 30s
 
-        // the macro gets confused if type is passed directly
-        // because of the comma in the pair definition
-        typedef pair<LinkID,LinkItem> pairitem; 
-
-        BOOST_FOREACH( pairitem item, linkMapping ){
+        BOOST_FOREACH( LinkPair item, linkMapping ){
                 if( item.second.autolink && difftime(now, item.second.lastuse) > 30)
                         oldlinks.push_back( item.first );
@@ -890 +894 @@
 
         BOOST_FOREACH( const LinkID lnk, oldlinks ){
+                logging_debug( "auto-link " << lnk.toString() << " timed out and is getting dropped" );
                 dropLink( lnk );
         }

source/ariba/overlay/BaseOverlay.h

@@ -348 +348 @@
 
         typedef map<const LinkID, LinkItem> LinkMapping;
+        typedef pair<const LinkID,LinkItem> LinkPair;
         LinkMapping linkMapping;
-
+        
         // nodes with pending joines. TODO: should be cleaned every some seconds
         // add timestamps to each, and check on occasion