Changeset 2473 for source/ariba/Node.cpp

Timestamp:

Feb 23, 2009, 2:21:49 PM (16 years ago)

Author:

Christoph Mayer

Message:

-einige fixes im ablauf des neuen interface
-einige fehlende funktionalität implementiert

File:

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

source/ariba/Node.cpp

@@ -37 +37 @@
 // [License]
 
-
 #include "Node.h"
 
@@ -61 +60 @@
 
         }
+
         ServiceInterfaceWrapper(CommunicationListener* listener) :
                 nodeListener(NULL), commListener(listener) {
         }
+        
+        ~ServiceInterfaceWrapper() {
+        }
 
 protected:
@@ -69 +72 @@
 
         }
+
         void onOverlayDestroy(const SpoVNetID& id) {
 
@@ -120 +124 @@
                         const NodeID& node) {
                 if (commListener != NULL) commListener->onMessage(
-                                const_cast<Message*> (message), node, link);
+                                const_cast<Message*>(message), node, link);
         }
 };
 
-const ServiceID Node::anonymousService = 0xFF00;
+ServiceID Node::anonymousService = ServiceID(0xFF00);
 
 Node::Node(AribaModule& ariba_mod, const Name& node_name) :
@@ -142 +146 @@
 //TODO: Implement error handling: no bootstrap node available
 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);
+
         this->context = ariba_mod.underlay_abs->createSpoVNet(spovnetId, nodeId,
-                        ariba_mod.ip_addr, ariba_mod.tcp_port);
+                                                        ariba_mod.ip_addr, ariba_mod.tcp_port);
         ariba_mod.addBootstrapNode(vnetname,
-                        new EndpointDescriptor(this->context->getBaseCommunication().getEndpointDescriptor()));
+                new EndpointDescriptor(this->context->getBaseCommunication().getEndpointDescriptor()));
 }
 
 void Node::leave() {
-        // not implemeted yet.
-}
-
-void Node::bind(NodeListener* listener) {
-        this->context->getOverlay().bind(new ServiceInterfaceWrapper(listener),
-                        Node::anonymousService);
-}
-
-void Node::unbind(NodeListener* listener) {
-        // TODO: allow unbinding
+        ariba_mod.underlay_abs->leaveSpoVNet( context );
+        context = NULL;
 }
 
@@ -171 +168 @@
 
 const SpoVNetID& Node::getSpoVNetId() const {
-        return SpoVNetID::UNSPECIFIED;
+        return spovnetId;
 }
 
 const NodeID& Node::getNodeId(const LinkID& lid) const {
-        return NodeID::UNSPECIFIED;
+        return nodeId;
 }
 
@@ -201 +198 @@
 }
 
+void Node::sendBroadcastMessage(const DataMessage& msg, const ServiceID& sid) {
+        return context->getOverlay().broadcastMessage((Message*)msg, sid);
+}
+
+void Node::bind(NodeListener* listener) {
+        context->getOverlay().bind(new ServiceInterfaceWrapper(listener),
+                        Node::anonymousService);
+}
+
+void Node::unbind(NodeListener* listener) {
+        delete context->getOverlay().unbind(Node::anonymousService);
+}
+
 void Node::bind(CommunicationListener* listener, const ServiceID& sid) {
-        this->context->getOverlay().bind(new ServiceInterfaceWrapper(listener), sid);
+        context->getOverlay().bind(new ServiceInterfaceWrapper(listener), sid);
 }
 
 void Node::unbind(CommunicationListener* listener, const ServiceID& sid) {
-        // TODO
+        delete context->getOverlay().unbind(sid);
 }