Changeset 7532 for source/ariba/overlay

Timestamp:

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

Author:

Christoph Mayer

Message:

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

Location:

source/ariba/overlay

Files:

• BaseOverlay.cpp (modified) (4 diffs)
• BaseOverlay.h (modified) (1 diff)
• OverlayBootstrap.cpp (modified) (3 diffs)
• OverlayBootstrap.h (modified) (3 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" );

source/ariba/overlay/BaseOverlay.h

@@ -274 +274 @@
 
         /**
+         * Start the bootstrap modules
+         */
+        void startBootstrapModules(vector<pair<BootstrapManager::BootstrapType,string> > modules);
+
+        /**
+         * Stop the bootstrap modules
+         */
+        void stopBootstrapModules();
+
+        /**
          * Let the node leave the SpoVNet.
          */

source/ariba/overlay/OverlayBootstrap.cpp

@@ -66 +66 @@
 }
 
-void OverlayBootstrap::start(BaseOverlay* _overlay, const SpoVNetID& _spovnetid, const NodeID& _nodeid){
+void OverlayBootstrap::start(BaseOverlay* _overlay,
+                const SpoVNetID& _spovnetid, const NodeID& _nodeid,
+                vector<pair<BootstrapManager::BootstrapType,string> > modules){
         overlay = _overlay;
         spovnetid = _spovnetid;
@@ -74 +76 @@
 
         manager.registerCallback( this );
-        manager.registerModule( BootstrapManager::BootstrapTypePeriodicBroadcast );
-        //manager.registerModule( BootstrapManager::BootstrapTypeBluetoothSdp );
-        //manager.registerModule( BootstrapManager::BootstrapTypeMulticastDns );
+
+        typedef pair<BootstrapManager::BootstrapType,string> X;
+        BOOST_FOREACH( X i, modules){
+                manager.registerModule( i.first, i.second );
+        }
 
         watchtimer.startWatchdog();
@@ -89 +93 @@
 
         manager.unregisterCallback( this );
-        manager.unregisterModule( BootstrapManager::BootstrapTypePeriodicBroadcast );
-        //manager.unregisterModule( BootstrapManager::BootstrapTypeBluetoothSdp );
-        //manager.unregisterModule( BootstrapManager::BootstrapTypeMulticastDns );
+        manager.unregisterAllModules();
 
         watchtimer.stopWatchdog();

source/ariba/overlay/OverlayBootstrap.h

@@ -44 +44 @@
 #include <ctime>
 #include <deque>
+#include <vector>
 #include <algorithm>
 #include <boost/thread/mutex.hpp>
+#include <boost/foreach.hpp>
 #include "ariba/utility/logging/Logging.h"
 #include "ariba/utility/types.h"
@@ -60 +62 @@
 using std::deque;
 using std::string;
+using std::vector;
+using std::pair;
 using std::ostringstream;
 using ariba::utility::SpoVNetID;
@@ -83 +87 @@
         virtual ~OverlayBootstrap();
 
-        void start(BaseOverlay* _overlay, const SpoVNetID& _spovnetid, const NodeID& _nodeid);
+        void start(
+                        BaseOverlay* _overlay,
+                        const SpoVNetID& _spovnetid,
+                        const NodeID& _nodeid,
+                        vector<pair<BootstrapManager::BootstrapType,string> > modules
+                        );
         void stop();