Changeset 2454 for source/ariba/Node.cpp

Timestamp:

Feb 18, 2009, 1:39:08 PM (16 years ago)

Author:

mies

Message:

fixed some bugs

File:

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

source/ariba/Node.cpp

@@ -45 +45 @@
 #include "ariba/interface/ServiceInterface.h"
 #include "ariba/interface/UnderlayAbstraction.h"
-
+#include "ariba/communication/EndpointDescriptor.h"
+
+using ariba::communication::EndpointDescriptor;
 using ariba::interface::UnderlayAbstraction;
 
@@ -125 +127 @@
 
 Node::Node(AribaModule& ariba_mod, const Name& node_name) :
-        ariba_mod( ariba_mod ), name( node_name ), context( NULL ){
+        ariba_mod(ariba_mod), name(node_name), context(NULL) {
 }
 
@@ -133 +135 @@
 void Node::join(const Name& vnetname) {
         spovnetId = vnetname.toSpoVNetId();
-        nodeId = generateNodeId( name );
+        nodeId = generateNodeId(name);
         this->context = ariba_mod.underlay_abs->joinSpoVNet(spovnetId,
                         *ariba_mod.getBootstrapNode(name), nodeId);
@@ -139 +141 @@
 
 void Node::initiate(const Name& vnetname, const SpoVNetProperties& parm) {
-        utility::OverlayParameterSet ovrpset =
-                (utility::OverlayParameterSet::_OverlayStructure) parm.getBaseOverlayType();
+        utility::OverlayParameterSet
+                        ovrpset =
+                                        (utility::OverlayParameterSet::_OverlayStructure) parm.getBaseOverlayType();
         spovnetId = vnetname.toSpoVNetId();
-        nodeId = generateNodeId( name );
+        nodeId = generateNodeId(name);
         this->context = ariba_mod.underlay_abs->createSpoVNet(spovnetId, nodeId,
                         ariba_mod.ip_addr, ariba_mod.tcp_port);
+        ariba_mod.addBootstrapNode(vnetname,
+                        new EndpointDescriptor(this->context->getBaseCommunication().getEndpointDescriptor()));
 }
 
@@ -173 +178 @@
 
 NodeID Node::generateNodeId(const Name& name) const {
-        if( name == Name::UNSPECIFIED )
-                return Name::random().toNodeId();
-        else
-                return name.toNodeId();
+        if (name == Name::UNSPECIFIED) return Name::random().toNodeId();
+        else return name.toNodeId();
 }
 
@@ -190 +193 @@
 seqnum_t Node::sendMessage(const DataMessage& msg, const NodeID& nid,
                 const ServiceID& sid, const LinkProperties& req) {
-        return context->getOverlay().sendMessage((Message*)msg, nid, sid);
+        return context->getOverlay().sendMessage((Message*) msg, nid, sid);
 }
 
 seqnum_t Node::sendMessage(const DataMessage& msg, const LinkID& lnk) {
-        return context->getOverlay().sendMessage((Message*)msg, lnk);
+        return context->getOverlay().sendMessage((Message*) msg, lnk);
 }