Changeset 5316 for source/ariba/Node.cpp

Timestamp:

Jul 24, 2009, 8:53:41 PM (16 years ago)

Author:

Christoph Mayer

Message:

merge from bootstrap branch

File:

• source/ariba/Node.cpp (modified) (2 diffs)

source/ariba/Node.cpp

@@ -63 +63 @@
         const communication::EndpointDescriptor* ep =
                         ariba_mod.getBootstrapNode(vnetname);
-        if( ep == NULL ) {
-                std::cout << "no bootstrap node defined" << std::endl;
-                return;
-        }
-        ariba_mod.base_comm->start();
-        base_overlay->start( *ariba_mod.base_comm, nodeId );
-        base_overlay->joinSpoVNet( spovnetId, *ep);
+
+        // start base comm if not started
+        if( !ariba_mod.base_comm->isStarted() )
+                ariba_mod.base_comm->start();
+
+        // start base overlay if not started
+        // join against ourselfs
+        if( !base_overlay->isStarted() )
+                base_overlay->start( *ariba_mod.base_comm, nodeId );
+        base_overlay->joinSpoVNet( spovnetId );
+
+        // join against further nodes
+        if( ep != NULL && *ep != EndpointDescriptor::UNSPECIFIED )
+                base_overlay->joinSpoVNet( spovnetId, *ep);
 }
 
@@ -82 +89 @@
         nodeId = generateNodeId(name);
 
-        ariba_mod.base_comm->start();
-
-        base_overlay->start( *ariba_mod.base_comm, nodeId );
+        // start base comm if not started
+        if( !ariba_mod.base_comm->isStarted() )
+                ariba_mod.base_comm->start();
+
+        // start base overlay if not started
+        if( !base_overlay->isStarted() )
+                base_overlay->start( *ariba_mod.base_comm, nodeId );
+
         base_overlay->createSpoVNet( spovnetId, ovrpset );
-
-        ariba_mod.addBootstrapNode(vnetname,
-                new EndpointDescriptor(ariba_mod.base_comm->getEndpointDescriptor()));
 }