Changeset 5838 for source/ariba/overlay/BaseOverlay.cpp

Timestamp:

Aug 11, 2009, 8:39:47 AM (16 years ago)

Author:

Christoph Mayer

Message:

watchdog bootstrapping und kleine relay fixes

File:

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

source/ariba/overlay/BaseOverlay.cpp

@@ -370 +370 @@
         }
 
-
         //ovl.visShowNodeBubble ( ovlId, nodeId, "joining..." );
         logging_info( "Starting to join spovnet " << id.toString() <<
@@ -399 +398 @@
                 const LinkID& lnk = bc->establishLink( bootstrapEp );
                 bootstrapLinks.push_back(lnk);
+
                 logging_info("join process initiated for " << id.toString() << "...");
+
         }
 }
@@ -1107 +1108 @@
                                 state = BaseOverlayStateCompleted;
                                 overlayInterface->createOverlay();
-
                                 overlayInterface->joinOverlay( replyMsg->getBootstrapEndpoint() );
+
+                                //record bootstrap ep as good endpoint to join
+                                overlayBootstrap.recordJoin( replyMsg->getBootstrapEndpoint() );
 
                                 // update ovlvis
@@ -1555 +1558 @@
 
 vector<NodeID> BaseOverlay::getOverlayNeighbors(bool deep) const {
+
+        vector<NodeID> nodes = overlayInterface->getKnownNodes(deep);
+
         // the known nodes _can_ also include our node, so we remove ourself
-        vector<NodeID> nodes = overlayInterface->getKnownNodes(deep);
-
         vector<NodeID>::iterator i = find( nodes.begin(), nodes.end(), this->nodeId );
         if( i != nodes.end() ) nodes.erase( i );