Changeset 2483 for sample

Timestamp:

Feb 24, 2009, 10:06:43 PM (16 years ago)

Author:

Christoph Mayer

Message:

-autolinks impl. (funktioniert noch nicht komplett, macht aber im moment nichts schlechter)
-einige fixes im ablauf etc.

Location:

sample/pingpong

Files:

• PingPong.cpp (modified) (6 diffs)
• PingPong.h (modified) (2 diffs)

sample/pingpong/PingPong.cpp

@@ -17 +17 @@
 // construction
 PingPong::PingPong() : pingId( 0 ) {
+        Timer::setInterval( 5000 );
 }
 
@@ -70 +71 @@
 
         // bind communication and node listener
-        node->bind(this);
-        node->bind(this, PingPong::PINGPONG_ID);
+        node->bind( this );
+        node->bind( this, PingPong::PINGPONG_ID);
         
+        // start the ping timer. if we are not
+        // the initiator this will happen in onJoinCompleted
+        if( isInitiator ) Timer::start();
+
         // ping pong started up...
         logging_info( "pingpong started up ");
@@ -85 +90 @@
         Timer::stop();
 
-        // unbind listeners
+        // unbind communication and node listener
         node->unbind( this );
         node->unbind( this, PingPong::PINGPONG_ID );
@@ -108 +113 @@
 
         // start the timer to ping every second
-        Timer::setInterval( 1000 );
         Timer::start();
 }
@@ -117 +121 @@
 
 // communication listener
-bool PingPong::onLinkRequest(const NodeID& remote, Message* msg) {
+bool PingPong::onLinkRequest(const NodeID& remote, const DataMessage& msg) {
         return false;
 }
 
-void PingPong::onMessage(Message* msg, const NodeID& remote, 
-                const LinkID& lnk = LinkID::UNSPECIFIED) {
+void PingPong::onMessage(const DataMessage& msg, const NodeID& remote, const LinkID& lnk) {
 
-        PingPongMessage* pingmsg = msg->decapsulate<PingPongMessage> ();
+        PingPongMessage* pingmsg = msg.getMessage()->decapsulate<PingPongMessage> ();
 
         logging_info( "received ping message on link " << lnk.toString()
                         << " from node " << remote.toString()
-                        << ": " << pingmsg->toString() );
+                        << ": " << pingmsg->info() );
 }
 
@@ -142 +145 @@
         PingPongMessage pingmsg( pingId );
         node->sendBroadcastMessage( pingmsg, PingPong::PINGPONG_ID );
-
 }
 

sample/pingpong/PingPong.h

@@ -35 +35 @@
 protected:
         // communication listener interface
-        virtual bool onLinkRequest(const NodeID& remote, Message* msg);
-        virtual void onMessage(Message* msg, const NodeID& remote, const LinkID& lnk);
+        virtual bool onLinkRequest(const NodeID& remote, const DataMessage& msg);
+        virtual void onMessage(const DataMessage& msg, const NodeID& remote, const LinkID& lnk= LinkID::UNSPECIFIED);
 
         // node listener interface
@@ -62 +62 @@
         // the current ping id
         unsigned long pingId;
+
 };