Changeset 3056

Timestamp:

Apr 23, 2009, 6:58:34 PM (16 years ago)

Author:

Christoph Mayer

Message:

-fixed all compile errors, but now the overlay functionality is messed up somewhere

Files:

• sample/pingpong/PingPong.cpp (modified) (7 diffs)
• sample/pingpong/PingPong.h (modified) (3 diffs)
• source/ariba/CommunicationListener.cpp (modified) (2 diffs)
• source/ariba/CommunicationListener.h (modified) (2 diffs)
• source/ariba/NodeListener.h (modified) (2 diffs)
• source/ariba/overlay/BaseOverlay.cpp (modified) (20 diffs)
• source/ariba/overlay/BaseOverlay.h (modified) (5 diffs)
• source/ariba/overlay/modules/OverlayInterface.cpp (modified) (1 diff)

sample/pingpong/PingPong.cpp

@@ -13 +13 @@
 
 // the service that the pingpong wants to use
-ServiceID PingPong::PINGPONG_ID = ServiceID( 111 );
+ServiceID PingPong::PINGPONG_SERVICEID = ServiceID( 111 );
 
 // construction
@@ -63 +63 @@
 
         // bind communication and node listener
-        node->bind( this );                       /*NodeListener*/
-        node->bind( this, PingPong::PINGPONG_ID); /*CommunicationListener*/
+        node->bind( this );                              /*NodeListener*/
+        node->bind( this, PingPong::PINGPONG_SERVICEID); /*CommunicationListener*/
 
         // start node module
@@ -88 +88 @@
 
         // unbind communication and node listener
-        node->unbind( this );                        /*NodeListener*/
-        node->unbind( this, PingPong::PINGPONG_ID ); /*CommunicationListener*/
+        node->unbind( this );                               /*NodeListener*/
+        node->unbind( this, PingPong::PINGPONG_SERVICEID ); /*CommunicationListener*/
 
         // leave spovnet
@@ -121 +121 @@
         vector<NodeID> nodes = node->getNeighborNodes();
         BOOST_FOREACH( NodeID nid, nodes ){
-                node->sendMessage( pingmsg, nid, PingPong::PINGPONG_ID );
+                node->sendMessage( pingmsg, nid, PingPong::PINGPONG_SERVICEID );
         }
 
@@ -128 +128 @@
         //           internally, gets all neighboring nodes and sends the message
         //-----------------------------------------------------------------------
-        // node->sendBroadcastMessage( pingmsg, PingPong::PINGPONG_ID );
+        // node->sendBroadcastMessage( pingmsg, PingPong::PINGPONG_SERVICEID );
 }
 
-// node listener interface
 void PingPong::onJoinCompleted( const SpoVNetID& vid ) {
         logging_info( "pingpong node join completed, spovnetid=" << vid.toString() );
@@ -153 +152 @@
 // communication listener
 bool PingPong::onLinkRequest(const NodeID& remote, const DataMessage& msg) {
-        return false;
+        logging_debug( "node " << remote.toString() << " wants to build up a link with us ... allowing" );
+        return true;
 }
 
@@ -191 +191 @@
 }
 
-void PingPong::onMessageSent(seqnum_t seq_num, bool failed, const DataMessage& msg ){
-        logging_info( "received message sent event for seqnum " << seq_num
-                        << " with result " << failed );
-}
-
 }}} // namespace ariba, application, pingpong

sample/pingpong/PingPong.h

@@ -42 +42 @@
         virtual void onLinkFail(const LinkID& lnk, const NodeID& remote);
         virtual void onLinkQoSChanged(const LinkID& lnk, const NodeID& remote, const LinkProperties& prop);
-        virtual void onMessageSent(seqnum_t seq_num, bool failed, const DataMessage& msg = DataMessage::UNSPECIFIED);
 
         // node listener interface
@@ -60 +59 @@
         // the ariba module and a node
         AribaModule* ariba;
-        Node* node;
+        Node*        node;
 
         // flag, whether this node initiates or just joins the spovnet
@@ -66 +65 @@
 
         // the ping pong service id
-        static ServiceID PINGPONG_ID;
+        static ServiceID PINGPONG_SERVICEID;
 
         // the current ping id

source/ariba/CommunicationListener.cpp

@@ -65 +65 @@
 bool CommunicationListener::onLinkRequest(const NodeID& remote,
                 const DataMessage& msg) {
-        return false;
+        return true;
 }
 
@@ -72 +72 @@
 }
 
+// --- extended message functionality ---
 // void CommunicationListener::onMessageSent(seqnum_t seq_num, bool failed,
 //              const DataMessage& msg) {

source/ariba/CommunicationListener.h

@@ -40 +40 @@
 #define COMMUNICATIONLISTENER_H_
 
-namespace ariba {
-// forward declaration
-class CommunicationListener;
-}
-
 #include "Message.h"
 #include "Identifiers.h"
@@ -52 +47 @@
 namespace ariba {
 
+// forward decl
+namespace overlay {
+        class BaseOverlay;
+}
+
 /**
  * Listener for communication events on links.
  */
 class CommunicationListener {
-        friend class Node;
+        friend class ariba::overlay::BaseOverlay;
 protected:
         CommunicationListener();

source/ariba/NodeListener.h

@@ -40 +40 @@
 #define NODELISTENER_H_
 
-// forward declaration
-namespace ariba {
-class NodeListener;
-class Node;
-}
-
 #include "Identifiers.h"
 
 namespace ariba {
+
+// forward decl
+namespace overlay {
+        class BaseOverlay;
+}
 
 /**
@@ -57 +56 @@
  */
 class NodeListener {
-        friend class Node;
+        friend class ariba::overlay::BaseOverlay;
 public:
         NodeListener();
         virtual ~NodeListener();
+
 protected:
         /**

source/ariba/overlay/BaseOverlay.cpp

@@ -148 +148 @@
         // inform all registered services of the event
         BOOST_FOREACH( NodeListener* i, nodeListeners ){
-                if( ret ) i->onLeaveSuccess( spovnetId );
-                else      i->onLeaveFail( spovnetId );
+                if( ret ) i->onLeaveCompleted( spovnetId );
+                else      i->onLeaveFailed( spovnetId );
         }
 }
@@ -178 +178 @@
         overlayInterface->joinOverlay();
         BOOST_FOREACH( NodeListener* i, nodeListeners ){
-                i->onJoinSuccess( spovnetId );
+                i->onJoinCompleted( spovnetId );
         }
 
@@ -252 +252 @@
 
         if( item.interface != NULL )
-                item.interface->onLinkDown( spovnetId, nodeId, item.node );
+                item.interface->onLinkDown( link, item.node );
 }
 
@@ -310 +310 @@
 
 void BaseOverlay::bind(CommunicationListener* listener, const ServiceID& sid){
-        logging_debug( "binding communication listener " << listener 
+        logging_debug( "binding communication listener " << listener
                 << " on serviceid " << sid.toString() );
 
         if( communicationListeners.contains( sid ) ){
-                logging_error( "some listener already registered for service id " 
+                logging_error( "some listener already registered for service id "
                         << sid.toString() );
-                return false;
+                return;
         }
 
         communicationListeners.registerItem( listener, sid );
-        return true;
 }
 
 void BaseOverlay::unbind(CommunicationListener* listener, const ServiceID& sid){
-        logging_debug( "unbinding listener " << listener 
+        logging_debug( "unbinding listener " << listener
                 << " from serviceid " << sid.toString() );
 
@@ -333 +332 @@
 
         if( communicationListeners.get(sid) != listener ){
-                logging_warn( "listener bound to service id " << sid.toString() 
+                logging_warn( "listener bound to service id " << sid.toString()
                         << " is different than listener trying to unbind" );
                 return;
@@ -344 +343 @@
         logging_debug( "binding node listener " << listener );
 
-        NodeListenerVector::iterator i = nodeListeners.find( listener );
+        NodeListenerVector::iterator i = find( nodeListeners.begin(), nodeListeners.end(), listener );
         if( i != nodeListeners.end() ){
                 logging_warn( "node listener " << listener << " is already bound, cannot bind" );
                 return;
         }
-        
+
         nodeListeners.push_back( listener );
 }
@@ -356 +355 @@
         logging_debug( "unbinding node listener " << listener );
 
-        NodeListenerVector::iterator i = nodeListeners.find( listener );
+        NodeListenerVector::iterator i = find( nodeListeners.begin(), nodeListeners.end(), listener );
         if( i == nodeListeners.end() ){
                 logging_warn( "node listener " << listener << " is not bound, cannot unbind" );
                 return;
         }
-        
+
         nodeListeners.erase( i );
 }
@@ -451 +450 @@
 
         if( i->second.interface != NULL )
-                i->second.interface->onLinkDown( id, nodeId, i->second.node );
+                i->second.interface->onLinkDown( id, i->second.node );
 
         linkMapping.erase( i );
@@ -468 +467 @@
 
         if( i->second.interface != NULL )
-                i->second.interface->onLinkChanged( id, nodeId, i->second.node );
+                i->second.interface->onLinkChanged( id, i->second.node );
 
         i->second.markused();
@@ -485 +484 @@
 
         if( i->second.interface != NULL )
-                i->second.interface->onLinkFail( id, nodeId, i->second.node );
+                i->second.interface->onLinkFail( id, i->second.node );
 
         i->second.markused();
@@ -501 +500 @@
         if( i == linkMapping.end() ) return;
 
+        // TODO: convert QoSParameterSet to the LinkProperties properties
         if( i->second.interface != NULL )
-                i->second.interface->onLinkQoSChanged( id, nodeId, i->second.node, qos );
+                i->second.interface->onLinkQoSChanged( id, i->second.node, LinkProperties::DEFAULT );
 
         i->second.markused();
@@ -535 +535 @@
 
                 if( serviceListener != NULL )
-                        serviceListener->receiveMessage( overlayMsg, link, overlayMsg->getSourceNode() );
+                        serviceListener->onMessage( overlayMsg, overlayMsg->getSourceNode(), link );
 
                 return true;
@@ -571 +571 @@
                 //
 
+                // TODO: here you can implement mechanisms to deny joining of a node
                 bool allow = true;
-
-                BOOST_FOREACH( NodeListener* i, nodeListeners ){
-                        allow &= i->isJoinAllowed( overlayMsg->getSourceNode(), spovnetId );
-                }
 
                 logging_info( "sending back join reply for spovnet " <<
@@ -644 +641 @@
 
                         // inform all registered services of the event
-                        BOOST_FOREACH( NodeListener* i, nodeListeners{
-                                i->onJoinFail( spovnetId );
+                        BOOST_FOREACH( NodeListener* i, nodeListeners ){
+                                i->onJoinFailed( spovnetId );
                         }
 
@@ -670 +667 @@
                         // inform all registered services of the event
                         BOOST_FOREACH( NodeListener* i, nodeListeners ){
-                                i->onJoinFail( spovnetId );
+                                i->onJoinFailed( spovnetId );
                         }
 
@@ -692 +689 @@
                 // inform all registered services of the event
                 BOOST_FOREACH( NodeListener* i, nodeListeners ){
-                        i->onJoinSuccess( spovnetId );
+                        i->onJoinCompleted( spovnetId );
                 }
 
@@ -758 +755 @@
 
                 i->second.interface = iface;
-                iface->onLinkUp( link, nodeId, sourcenode );
+                iface->onLinkUp( link, sourcenode );
                 i->second.markused();
 
@@ -792 +789 @@
                         // inform all registered services of the event
                         BOOST_FOREACH( NodeListener* i, nodeListeners ){
-                                i->onLeaveFail( spovnetId );
+                                i->onLeaveFailed( spovnetId );
                         }
 
@@ -802 +799 @@
                         logging_info( "node left " << overlayMsg->getSourceNode() );
 
-                        // inform all registered services of the event
-                        BOOST_FOREACH( NodeListener* i, nodeListeners ){
-                                i->onNodeLeave( overlayMsg->getSourceNode(), spovnetId );
-                        }
                 }
 
@@ -908 +901 @@
                                 << node.toString() );
 
-        BOOST_FOREACH( NodeListener* i, nodeListeners ){
-                i->onNodeJoin( node, spovnetId );
-        }
-
         joiningNodes.erase( i );
 }

source/ariba/overlay/BaseOverlay.h

@@ -70 +70 @@
         class NodeListener;
         class CommunicationListener;
-
         namespace utility {
                 class OvlVis;
@@ -204 +203 @@
          */
         void bind(CommunicationListener* listener, const ServiceID& sid);
-        
+
         /**
          * TODO
          */
         void unbind(CommunicationListener* listener, const ServiceID& sid);
-        
+
         /**
          * TODO
          */
         void bind(NodeListener* listener);
-        
+
         /**
          * TODO
@@ -289 +288 @@
          */
         virtual void incomingRouteMessage( Message* msg );
-        
+
         /**
          * see OverlayStructureEvents.h, called from specific OverlayInterface class
@@ -295 +294 @@
         virtual void onNodeJoin( const NodeID& node );
 
-        
+
         /**
          * TODO, for timer events
@@ -407 +406 @@
         LinkMapping linkMapping;
 
-        
-        /**
-         * nodes with pending joines. TODO: should be cleaned every 
+
+        /**
+         * nodes with pending joines. TODO: should be cleaned every
          * some seconds, add timestamps to each, and check on occasion
          */

source/ariba/overlay/modules/OverlayInterface.cpp

@@ -57 +57 @@
 
 OverlayInterface::~OverlayInterface(){
-        baseoverlay.unbind( OVERLAY_SERVICE_ID );
+        baseoverlay.unbind( this, OVERLAY_SERVICE_ID );
 }