Changeset 3055 for source/ariba/Node.cpp

Timestamp:

Apr 23, 2009, 5:55:59 PM (16 years ago)

Author:

Christoph Mayer

Message:

-temporärer commit, sorry kompiliert nicht :( muss aber die änderungen auf die andere maschine kriegen, ist in ca1h gefixt.

File:

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

source/ariba/Node.cpp

@@ -41 +41 @@
 #include "ariba/overlay/BaseOverlay.h"
 #include "ariba/utility/types/OverlayParameterSet.h"
-#include "ariba/interface/ServiceInterface.h"
 #include "ariba/communication/EndpointDescriptor.h"
 
@@ -47 +46 @@
 
 namespace ariba {
-
-class ServiceInterfaceWrapper: public interface::ServiceInterface {
-private:
-        NodeListener* nodeListener;
-        CommunicationListener* commListener;
-public:
-        ServiceInterfaceWrapper(NodeListener* listener) :
-                nodeListener(listener), commListener(NULL) {
-
-        }
-
-        ServiceInterfaceWrapper(CommunicationListener* listener) :
-                nodeListener(NULL), commListener(listener) {
-        }
-
-        ~ServiceInterfaceWrapper() {
-        }
-
-protected:
-
-        bool isJoinAllowed(const NodeID& nodeid, const SpoVNetID& spovnetid) {
-                return true;
-        }
-
-        void onNodeJoin(const NodeID& nodeid, const SpoVNetID& spovnetid) {
-                // not handled
-        }
-
-        void onNodeLeave(const NodeID& id, const SpoVNetID& spovnetid) {
-                // not handled
-        }
-
-        void onJoinSuccess(const SpoVNetID& spovnetid) {
-                if (nodeListener != NULL) nodeListener->onJoinCompleted(spovnetid);
-        }
-
-        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);
-        }
-
-        void onLinkUp(const LinkID& link, const NodeID& local, const NodeID& remote) {
-                if (commListener != NULL) commListener->onLinkUp(link, remote);
-        }
-
-        void onLinkDown(const LinkID& link, const NodeID& local,
-                        const NodeID& remote) {
-                if (commListener != NULL) commListener->onLinkDown(link, remote);
-        }
-
-        void onLinkChanged(const LinkID& link, const NodeID& local,
-                        const NodeID& remote) {
-                if (commListener != NULL) commListener->onLinkChanged(link, remote);
-        }
-
-        void onLinkFail(const LinkID& id, const NodeID& local, const NodeID& remote) {
-                if (commListener != NULL) commListener->onLinkFail(id, remote);
-        }
-
-        void onLinkQoSChanged(const LinkID& id, const NodeID& local,
-                        const NodeID& remote, const QoSParameterSet& qos) {
-                if (commListener != NULL) commListener->onLinkQoSChanged(id, remote,
-                                LinkProperties::DEFAULT);
-        }
-
-        bool receiveMessage(const Message* message, const LinkID& link,
-                        const NodeID& node) {
-                if (commListener != NULL) commListener->onMessage(
-                                const_cast<Message*>(message), node, link);
-        }
-};
-
-ServiceID Node::anonymousService = ServiceID(0xFF00);
 
 Node::Node(AribaModule& ariba_mod, const Name& node_name) :
@@ -143 +62 @@
         nodeId = generateNodeId(name);
 
-        ariba_mod.base_comm->start(ariba_mod.ip_addr, ariba_mod.tcp_port);
-        base_overlay->start( *ariba_mod.base_comm, nodeId );
-
         const communication::EndpointDescriptor* ep =
                         ariba_mod.getBootstrapNode(vnetname);
         if( ep == NULL ) return;
 
+        ariba_mod.base_comm->start(ariba_mod.ip_addr, ariba_mod.tcp_port);
+        base_overlay->start( *ariba_mod.base_comm, nodeId );
         base_overlay->joinSpoVNet( spovnetId, *ep);
 }
@@ -173 +91 @@
         base_overlay->leaveSpoVNet();
         ariba_mod.base_comm->stop();
-
         base_overlay->stop();
 }
@@ -222 +139 @@
 
 void Node::bind(NodeListener* listener) {
-        base_overlay->bind(new ServiceInterfaceWrapper(listener),
-                        Node::anonymousService);
+        base_overlay->bind(listener);
 }
 
 void Node::unbind(NodeListener* listener) {
-        delete base_overlay->unbind(Node::anonymousService);
+        base_overlay->unbind(listener);
 }
 
 void Node::bind(CommunicationListener* listener, const ServiceID& sid) {
-        base_overlay->bind(new ServiceInterfaceWrapper(listener), sid);
+        base_overlay->bind(listener, sid);
 }
 
 void Node::unbind(CommunicationListener* listener, const ServiceID& sid) {
-        delete base_overlay->unbind(sid);
+        base_overlay->unbind(listener, sid);
 }