Changeset 7532 for source/ariba/Node.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/Node.cpp (modified) (3 diffs)

source/ariba/Node.cpp

@@ -61 +61 @@
         nodeId = generateNodeId(name);
 
-        const communication::EndpointDescriptor* ep =
-                        ariba_mod.getBootstrapNode(vnetname);
-
         // start base comm if not started
         if( !ariba_mod.base_comm->isStarted() )
@@ -74 +71 @@
         base_overlay->joinSpoVNet( spovnetId );
 
-        // join against further nodes
-        if( ep != NULL && ep->isUnspecified() == false )
-                base_overlay->joinSpoVNet( spovnetId, *ep);
+        // join against static bootstrap points and
+        // start automatic bootstrapping modules
+        vector<AribaModule::BootstrapMechanism> mechanisms
+                = ariba_mod.getBootstrapMechanisms(vnetname);
+
+        vector<pair<BootstrapManager::BootstrapType,string> > internalmodules;
+
+        BOOST_FOREACH(AribaModule::BootstrapMechanism m, mechanisms){
+                switch(m){
+                        case AribaModule::BootstrapMechanismStatic:
+                        {
+                                const communication::EndpointDescriptor* ep =
+                                                        ariba_mod.getBootstrapNode(vnetname, m);
+                                        if( ep != NULL && ep->isUnspecified() == false )
+                                                base_overlay->joinSpoVNet( spovnetId, *ep);
+                                break;
+                        }
+                        case AribaModule::BootstrapMechanismBroadcast:
+                                internalmodules.push_back(make_pair(
+                                                BootstrapManager::BootstrapTypePeriodicBroadcast,
+                                                ariba_mod.getBootstrapInfo(vnetname, m)));
+                                break;
+                        case AribaModule::BootstrapMechanismMulticastDNS:
+                                internalmodules.push_back(make_pair(
+                                                BootstrapManager::BootstrapTypeMulticastDns,
+                                                ariba_mod.getBootstrapInfo(vnetname, m)));
+                                break;
+                        case AribaModule::BootstrapMechanismSDP:
+                                internalmodules.push_back(make_pair(
+                                                BootstrapManager::BootstrapTypeBluetoothSdp,
+                                                ariba_mod.getBootstrapInfo(vnetname, m)));
+                                break;
+                        default:
+                                break;
+                }
+        }
+
+        // start automatic overlay bootstrapping modules
+        base_overlay->startBootstrapModules(internalmodules);
+
+        // done
 }
 
@@ -101 +136 @@
 
 void Node::leave() {
+        base_overlay->stopBootstrapModules();
         base_overlay->leaveSpoVNet();
         ariba_mod.base_comm->stop();