Changeset 2439 for source/ariba

Timestamp:

Feb 17, 2009, 12:06:28 PM (16 years ago)

Author:

Christoph Mayer

Message:

-NodeID Generierung bei UNSPECIFIED gefixt

File:

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

source/ariba/Node.cpp

@@ -124 +124 @@
 const ServiceID Node::anonymousService = 0xFF00;
 
-Node::Node(AribaModule& ariba_mod, const Name& name) :
-        ariba_mod(ariba_mod), name(name) {
-        this->context = NULL;
+Node::Node(AribaModule& ariba_mod, const Name& node_name) :
+        ariba_mod( ariba_mod ), name( node_name ), context( NULL ){
 }
 
@@ -134 +133 @@
 void Node::join(const Name& vnetname) {
         spovnetId = vnetname.toSpoVNetId();
-        nodeId = name.toNodeId();
+        nodeId = generateNodeId( name );
         this->context = ariba_mod.underlay_abs->joinSpoVNet(spovnetId,
                         *ariba_mod.getBootstrapNode(name), nodeId);
@@ -143 +142 @@
                 (utility::OverlayParameterSet::_OverlayStructure) parm.getBaseOverlayType();
         spovnetId = vnetname.toSpoVNetId();
-        nodeId = name.toNodeId();
+        nodeId = generateNodeId( name );
         this->context = ariba_mod.underlay_abs->createSpoVNet(spovnetId, nodeId,
                         ariba_mod.ip_addr, ariba_mod.tcp_port);
@@ -174 +173 @@
 
 NodeID Node::generateNodeId(const Name& name) const {
-        return name.toNodeId();
+        if( name == Name::UNSPECIFIED )
+                return Name::random().toNodeId();
+        else
+                return name.toNodeId();
 }