Changeset 3057

Timestamp:

Apr 23, 2009, 7:18:10 PM (16 years ago)

Author:

Christoph Mayer

Message:

-fixes #4 (merge tidy interface with current implementation)

Location:

source/ariba/overlay/modules

Files:

• OverlayInterface.cpp (modified) (1 diff)
• OverlayInterface.h (modified) (1 diff)
• onehop/OneHop.cpp (modified) (11 diffs)
• onehop/OneHop.h (modified) (1 diff)

source/ariba/overlay/modules/OverlayInterface.cpp

@@ -60 +60 @@
 }
 
+void OverlayInterface::onLinkUp(const LinkID& lnk, const NodeID& remote){
+}
+
+void OverlayInterface::onLinkDown(const LinkID& lnk, const NodeID& remote){
+}
+
+void OverlayInterface::onLinkChanged(const LinkID& lnk, const NodeID& remote){
+}
+
+void OverlayInterface::onLinkFail(const LinkID& lnk, const NodeID& remote){
+}
+
+void OverlayInterface::onLinkQoSChanged(const LinkID& lnk, const NodeID& remote, const LinkProperties& prop){
+}
+
+bool OverlayInterface::onLinkRequest(const NodeID& remote, const DataMessage& msg){
+}
+
+void OverlayInterface::onMessage(const DataMessage& msg, const NodeID& remote, const LinkID& lnk){
+}
+
 }} // namespace ariba, overlay

source/ariba/overlay/modules/OverlayInterface.h

@@ -80 +80 @@
         virtual NodeList getKnownNodes() const = 0;
 
+        // functions from CommunicationListener that we _can_ use as overlay
+        virtual void onLinkUp(const LinkID& lnk, const NodeID& remote);
+        virtual void onLinkDown(const LinkID& lnk, const NodeID& remote);
+        virtual void onLinkChanged(const LinkID& lnk, const NodeID& remote);
+        virtual void onLinkFail(const LinkID& lnk, const NodeID& remote);
+        virtual void onLinkQoSChanged(const LinkID& lnk, const NodeID& remote, const LinkProperties& prop);
+        virtual bool onLinkRequest(const NodeID& remote, const DataMessage& msg);
+        virtual void onMessage(const DataMessage& msg, const NodeID& remote, const LinkID& lnk = LinkID::UNSPECIFIED);
+
 protected:
         BaseOverlay& baseoverlay;

source/ariba/overlay/modules/onehop/OneHop.cpp

@@ -58 +58 @@
 
 OneHop::~OneHop(){
-
         deleteOverlay();
 }
@@ -163 +162 @@
 }
 
-void OneHop::onLinkDown( const LinkID& link, const NodeID& local, const NodeID& remote ){
+
+void OneHop::onLinkDown(const LinkID& lnk, const NodeID& remote){
 
         //
@@ -175 +175 @@
 
         for( ; i != iend; i++ ){
-                if( i->second == link ){
+                if( i->second == lnk ){
                         overlayNodes.erase( i );
                         break;
@@ -182 +182 @@
 }
 
-void OneHop::onLinkUp(const LinkID& link, const NodeID& local, const NodeID& remote) {
+void OneHop::onLinkUp(const LinkID& lnk, const NodeID& remote){
 
         //
@@ -189 +189 @@
         //
 
-        if( link != bootstrapLink ){
+        if( lnk != bootstrapLink ){
                 if( pendingLinks > 0 )  pendingLinks--;
                 if( pendingLinks == 0 ) state = OneHopStateCompleted;
@@ -201 +201 @@
 
         state = OneHopStateJoinListingRequested;
-        baseoverlay.sendMessage( &onemsg, link );
-}
-
-bool OneHop::receiveMessage(const Message* message, const LinkID& link, const NodeID& node){
-
-        OneHopMessage* onemsg = const_cast<Message*>(message)->decapsulate<OneHopMessage>();
-        if( onemsg == NULL ) return false;
+        baseoverlay.sendMessage( &onemsg, lnk );
+}
+
+void OneHop::onMessage(const DataMessage& msg, const NodeID& remote, const LinkID& lnk){
+
+        OneHopMessage* onemsg = msg.getMessage()->convert<OneHopMessage>();
+        if( onemsg == NULL ) return;
 
         //
@@ -217 +217 @@
                 NodeListingRequest* request = onemsg->decapsulate<NodeListingRequest>();
 
-                logging_info( "onehop received node listing request from node " << node.toString() );
+                logging_info( "onehop received node listing request from node " << remote.toString() );
 
                 //
@@ -223 +223 @@
                 //
 
-                overlayNodes.insert( make_pair(node, link) );
+                overlayNodes.insert( make_pair(remote, lnk) );
 
                 //
@@ -249 +249 @@
 
                 onehopReply.encapsulate( &listingReply );
-                baseoverlay.sendMessage( &onehopReply, link );
+                baseoverlay.sendMessage( &onehopReply, lnk );
 
                 //
@@ -256 +256 @@
                 //
 
-                eventsReceiver->onNodeJoin( node );
+                eventsReceiver->onNodeJoin( remote );
 
         } // if( request != NULL )
@@ -268 +268 @@
                 NodeListingReply* reply = onemsg->decapsulate<NodeListingReply>();
 
-                logging_debug( "received node listing reply from node " << node.toString()
+                logging_debug( "received node listing reply from node " << remote.toString()
                                         << " with all overlay nodes. connecting to all of them" );
 

source/ariba/overlay/modules/onehop/OneHop.h

@@ -85 +85 @@
 
         //
-        // see CommunicationListener.h and OverlayInterface.h
+        // see CommunicationListener.h or OverlayInterface.h
         //
 
-        virtual void onLinkUp( const LinkID& link, const NodeID& local, const NodeID& remote );
-        virtual void onLinkDown( const LinkID& link, const NodeID& local, const NodeID& remote );
-        virtual bool receiveMessage( const Message* message, const LinkID& link, const NodeID& node );
+        virtual void onLinkUp(const LinkID& lnk, const NodeID& remote);
+        virtual void onLinkDown(const LinkID& lnk, const NodeID& remote);
+        virtual void onMessage(const DataMessage& msg, const NodeID& remote, const LinkID& lnk = LinkID::UNSPECIFIED);
 
 private: