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

Timestamp:

Feb 4, 2010, 5:29:37 PM (14 years ago)

Author:

Christoph Mayer

Message:

-von außen konfigurierbare bootstrap module, -periodicbroadcast crash fix

File:

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

source/ariba/overlay/BaseOverlay.cpp

@@ -824 +824 @@
         }
 
-
         //ovl.visShowNodeBubble ( ovlId, nodeId, "joining..." );
         logging_info( "Starting to join spovnet " << id.toString() <<
@@ -830 +829 @@
 
         if(bootstrapEp.isUnspecified() && state == BaseOverlayStateInvalid){
+
+                //** FIRST STEP - MANDATORY */
 
                 // bootstrap against ourselfs
@@ -842 +843 @@
                 //ovl.visChangeNodeColor( ovlId, nodeId, OvlVis::NODE_COLORS_GREEN );
 
-                logging_debug("starting overlay bootstrap module");
-                overlayBootstrap.start(this, spovnetId, nodeId);
-                overlayBootstrap.publish(bc->getEndpointDescriptor());
-
         } else {
+
+                //** SECOND STEP - OPTIONAL */
 
                 // bootstrap against another node
@@ -857 +856 @@
 }
 
-void BaseOverlay::leaveSpoVNet() {
-
-        logging_info( "Leaving spovnet " << spovnetId );
-        bool ret = ( state != this->BaseOverlayStateInvalid );
-
+
+void BaseOverlay::startBootstrapModules(vector<pair<BootstrapManager::BootstrapType,string> > modules){
+        logging_debug("starting overlay bootstrap module");
+        overlayBootstrap.start(this, spovnetId, nodeId, modules);
+        overlayBootstrap.publish(bc->getEndpointDescriptor());
+}
+
+void BaseOverlay::stopBootstrapModules(){
         logging_debug("stopping overlay bootstrap module");
         overlayBootstrap.stop();
         overlayBootstrap.revoke();
+}
+
+void BaseOverlay::leaveSpoVNet() {
+
+        logging_info( "Leaving spovnet " << spovnetId );
+        bool ret = ( state != this->BaseOverlayStateInvalid );
 
         logging_debug( "Dropping all auto-links" );