Changeset 3041 for source/ariba/Node.cpp

Timestamp:

Apr 23, 2009, 9:18:12 AM (16 years ago)

Author:

Christoph Mayer

Message:

-mehrere Fixes, Tickets #25 (bind listeners earlier), #21 (better pingpong), #40 (systemqueue misbehavior)

File:

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

source/ariba/Node.cpp

@@ -129 +129 @@
 
 Node::Node(AribaModule& ariba_mod, const Name& node_name) :
-        ariba_mod(ariba_mod), name(node_name), base_overlay(NULL) {
+        ariba_mod(ariba_mod), name(node_name) {
+        base_overlay = new BaseOverlay();
 }
 
 Node::~Node() {
+        delete base_overlay;
+        base_overlay = NULL;
 }
 
@@ -140 +143 @@
         nodeId = generateNodeId(name);
 
-        //logging("joining spovnet on"
-        //              << " [spovnetid=]" << spovnetId.toString()
-        //              << " [nodeid=]" << nodeId.toString() );
-
-        //logging_info("starting base communication...");
         ariba_mod.base_comm->start(ariba_mod.ip_addr, ariba_mod.tcp_port);
-
-        //logging_info("starting base overlay...");
-        base_overlay = new BaseOverlay( *ariba_mod.base_comm, nodeId );
+        base_overlay->start( *ariba_mod.base_comm, nodeId );
 
         const communication::EndpointDescriptor* ep =
@@ -165 +161 @@
         nodeId = generateNodeId(name);
 
-        //logging("joining spovnet on"
-        //                      << " [spovnetid=]" << spovnetId.toString()
-        //                      << " [nodeid=]" << nodeId.toString() );
-
-        //logging_info("starting base communication...");
         ariba_mod.base_comm->start(ariba_mod.ip_addr, ariba_mod.tcp_port);
 
-        //logging_info("starting base overlay...");
-        base_overlay = new BaseOverlay( *ariba_mod.base_comm, nodeId );
+        base_overlay->start( *ariba_mod.base_comm, nodeId );
         base_overlay->createSpoVNet( spovnetId );
 
@@ -184 +174 @@
         ariba_mod.base_comm->stop();
 
-        delete base_overlay;
-        base_overlay = NULL;
+        base_overlay->stop();
 }