Changeset 3037 for source/ariba/Node.cpp

Timestamp:

Apr 22, 2009, 9:07:53 PM (15 years ago)

Author:

Christoph Mayer

Message:

-jede Menge fixes und Umstellungen
-angefangen ariba/interface los zu werden, erste dateien sind weg

File:

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

source/ariba/Node.cpp

@@ -41 +41 @@
 #include "ariba/overlay/BaseOverlay.h"
 #include "ariba/utility/types/OverlayParameterSet.h"
-#include "ariba/interface/AribaContext.h"
 #include "ariba/interface/ServiceInterface.h"
-#include "ariba/interface/UnderlayAbstraction.h"
 #include "ariba/communication/EndpointDescriptor.h"
 
 using ariba::communication::EndpointDescriptor;
-using ariba::interface::UnderlayAbstraction;
 
 namespace ariba {
@@ -64 +61 @@
                 nodeListener(NULL), commListener(listener) {
         }
-        
+
         ~ServiceInterfaceWrapper() {
         }
 
 protected:
-        void onOverlayCreate(const SpoVNetID& id) {
-
-        }
-
-        void onOverlayDestroy(const SpoVNetID& id) {
-
-        }
 
         bool isJoinAllowed(const NodeID& nodeid, const SpoVNetID& spovnetid) {
@@ -95 +85 @@
         void onJoinFail(const SpoVNetID& spovnetid) {
                 if (nodeListener != NULL) nodeListener->onJoinFailed(spovnetid);
+        }
+
+        void onLeaveSuccess( const SpoVNetID& spovnetid ){
+                if (nodeListener != NULL) nodeListener->onLeaveCompleted(spovnetid);
+        }
+
+        void onLeaveFail( const SpoVNetID& spovnetid ){
+                if (nodeListener != NULL) nodeListener->onLeaveFailed(spovnetid);
         }
 
@@ -131 +129 @@
 
 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), base_overlay(NULL) {
 }
 
@@ -137 +135 @@
 }
 
+//TODO: Implement error handling: no bootstrap node available
 void Node::join(const Name& vnetname) {
         spovnetId = vnetname.toSpoVNetId();
         nodeId = generateNodeId(name);
-        this->context = ariba_mod.underlay_abs->joinSpoVNet(spovnetId,
-                                *ariba_mod.getBootstrapNode(vnetname), nodeId, 
-                                ariba_mod.ip_addr, ariba_mod.tcp_port);
-}
-
-//TODO: Implement error handling: no bootstrap node available
+
+        //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 );
+
+        const communication::EndpointDescriptor* ep =
+                        ariba_mod.getBootstrapNode(vnetname);
+        if( ep == NULL ) return;
+
+        base_overlay->joinSpoVNet( spovnetId, *ep);
+}
+
 void Node::initiate(const Name& vnetname, const SpoVNetProperties& parm) {
         utility::OverlayParameterSet ovrpset =
-                        (utility::OverlayParameterSet::_OverlayStructure) 
+                        (utility::OverlayParameterSet::_OverlayStructure)
                         parm.getBaseOverlayType();
 
@@ -154 +165 @@
         nodeId = generateNodeId(name);
 
-        this->context = ariba_mod.underlay_abs->createSpoVNet(
-                                spovnetId, nodeId, ariba_mod.ip_addr,
-                                ariba_mod.tcp_port);
+        //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->createSpoVNet( spovnetId );
 
         ariba_mod.addBootstrapNode(vnetname,
-                new EndpointDescriptor(this->context->
-                getBaseCommunication().getEndpointDescriptor()));
+                new EndpointDescriptor(ariba_mod.base_comm->getEndpointDescriptor()));
 }
 
 void Node::leave() {
-        ariba_mod.underlay_abs->leaveSpoVNet( context );
-        context = NULL;
+        base_overlay->leaveSpoVNet();
+        ariba_mod.base_comm->stop();
+
+        delete base_overlay;
+        base_overlay = NULL;
 }
 
@@ -177 +197 @@
 
 const NodeID& Node::getNodeId(const LinkID& lid) const {
-        return nodeId;
+        if( lid == LinkID::UNSPECIFIED ) return nodeId;
+        else return base_overlay->getNodeID( lid );
 }
 
@@ -185 +206 @@
 }
 
+vector<NodeID> Node::getNeighborNodes() const {
+        return base_overlay->getOverlayNeighbors();
+}
+
 LinkID Node::establishLink(const NodeID& nid, const ServiceID& sid,
                 const LinkProperties& req, const DataMessage& msg) {
-        return context->getOverlay().establishLink(nid, sid);
+        return base_overlay->establishLink(nid, sid);
 }
 
 void Node::dropLink(const LinkID& lnk) {
-        context->getOverlay().dropLink(lnk);
+        base_overlay->dropLink(lnk);
 }
 
 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 base_overlay->sendMessage((Message*) msg, nid, sid);
 }
 
 seqnum_t Node::sendMessage(const DataMessage& msg, const LinkID& lnk) {
-        return context->getOverlay().sendMessage((Message*) msg, lnk);
+        return base_overlay->sendMessage((Message*) msg, lnk);
 }
 
 void Node::sendBroadcastMessage(const DataMessage& msg, const ServiceID& sid) {
-        return context->getOverlay().broadcastMessage((Message*)msg, sid);
+        return base_overlay->broadcastMessage((Message*)msg, sid);
 }
 
 void Node::bind(NodeListener* listener) {
-        context->getOverlay().bind(new ServiceInterfaceWrapper(listener),
+        base_overlay->bind(new ServiceInterfaceWrapper(listener),
                         Node::anonymousService);
 }
 
 void Node::unbind(NodeListener* listener) {
-        delete context->getOverlay().unbind(Node::anonymousService);
+        delete base_overlay->unbind(Node::anonymousService);
 }
 
 void Node::bind(CommunicationListener* listener, const ServiceID& sid) {
-        context->getOverlay().bind(new ServiceInterfaceWrapper(listener), sid);
+        base_overlay->bind(new ServiceInterfaceWrapper(listener), sid);
 }
 
 void Node::unbind(CommunicationListener* listener, const ServiceID& sid) {
-        delete context->getOverlay().unbind(sid);
+        delete base_overlay->unbind(sid);
 }