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

Timestamp:

Aug 11, 2009, 1:47:47 PM (15 years ago)

Author:

Christoph Mayer

Message:

networkinfo fix wenn socket kaputt geht, erfolgreich verwendete bootstrap infos speichern und wenn overlay verbindungen alle weg sind diese infos ausprobieren

File:

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

source/ariba/overlay/BaseOverlay.cpp

@@ -377 +377 @@
 
                 // bootstrap against ourselfs
-                logging_debug("joining spovnet locally");
+                logging_info("joining spovnet locally");
 
                 overlayInterface->joinOverlay();
@@ -394 +394 @@
 
                 // bootstrap against another node
-                logging_debug("joining spovnet remotely against " << bootstrapEp.toString());
+                logging_info("joining spovnet remotely against " << bootstrapEp.toString());
 
                 const LinkID& lnk = bc->establishLink( bootstrapEp );
@@ -1098 +1098 @@
                                         // inform all registered services of the event
                                         BOOST_FOREACH( NodeListener* i, nodeListeners )
-                                        i->onJoinFailed( spovnetId );
+                                                i->onJoinFailed( spovnetId );
 
                                         delete replyMsg;
@@ -1110 +1110 @@
                                 overlayInterface->joinOverlay( replyMsg->getBootstrapEndpoint() );
 
-                                //record bootstrap ep as good endpoint to join
-                                overlayBootstrap.recordJoin( replyMsg->getBootstrapEndpoint() );
-
                                 // update ovlvis
                                 //ovl.visChangeNodeColor( ovlId, nodeId, OvlVis::NODE_COLORS_GREEN);
@@ -1120 +1117 @@
                                         i->onJoinCompleted( spovnetId );
 
-                                delete replyMsg;
-
                         } else {
 
@@ -1128 +1123 @@
                                 overlayInterface->joinOverlay( replyMsg->getBootstrapEndpoint() );
 
-                                delete replyMsg;
-
                         } // if( overlayInterface == NULL )
 
+                        //record bootstrap ep as good endpoint to join
+                        overlayBootstrap.recordJoin( replyMsg->getBootstrapEndpoint() );
+
+                        delete replyMsg;
                         ret = true;
                         break;