Changeset 3056 for sample

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

Location:

sample/pingpong

Files:

• PingPong.cpp (modified) (7 diffs)
• PingPong.h (modified) (3 diffs)

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