Changeset 3071 for sample

Timestamp:

Apr 24, 2009, 4:34:53 PM (16 years ago)

Author:

Christoph Mayer

Message:

-some further fixed in the protocols and cleaning the interfaces for stuff we have no functionality yet

Location:

sample/pingpong

Files:

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

sample/pingpong/PingPong.cpp

@@ -87 +87 @@
         Timer::stop();
 
+        // leave spovnet
+        node->leave();
+
         // unbind communication and node listener
         node->unbind( this );                               /*NodeListener*/
         node->unbind( this, PingPong::PINGPONG_SERVICEID ); /*CommunicationListener*/
-
-        // leave spovnet
-        node->leave();
 
         // stop the ariba module
@@ -111 +111 @@
         // this can be all nodes (OneHop) overlay or just some neighbors
         // in case of a Chord or Kademlia structure
+
+        // in this sample we use auto-links: we just send out our message
+        // to the node and the link is established automatically. for more
+        // control we would use the node->establishLink function to create
+        // a link and start using the link in the CommunicationListener::onLinkUp
+        // function that is implemented further down in PingPong::onLinkUp
 
         logging_info( "pinging overlay neighbors with ping id " << ++pingId );
@@ -139 +145 @@
 
 void PingPong::onJoinFailed( const SpoVNetID& vid ) {
-        logging_error("XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX pingpong node join failed, spovnetid=" << vid.toString() );
+        logging_error("pingpong node join failed, spovnetid=" << vid.toString() );
 }
 
@@ -150 +156 @@
 }
 
-// communication listener
-bool PingPong::onLinkRequest(const NodeID& remote, const DataMessage& msg) {
-        logging_debug( "node " << remote.toString() << " wants to build up a link with us ... allowing" );
-        return true;
-}
-
 void PingPong::onMessage(const DataMessage& msg, const NodeID& remote, const LinkID& lnk) {
-
         PingPongMessage* pingmsg = msg.getMessage()->convert<PingPongMessage> ();
 
@@ -176 +175 @@
 
 void PingPong::onLinkChanged(const LinkID& lnk, const NodeID& remote){
-        logging_info( "received link-changed event for link " << lnk.toString()
+        logging_info( "link-changed event for link " << lnk.toString()
                         << " and node " << remote.toString() );
+}
+
+bool PingPong::onLinkRequest(const NodeID& remote, const DataMessage& msg) {
+        logging_info( "node " << remote.toString() << " wants to build up a link with us ... allowing" );
+        return true;
 }
 
@@ -185 +189 @@
 }
 
-void PingPong::onLinkQoSChanged(const LinkID& lnk, const NodeID& remote, const LinkProperties& prop){
-        logging_info( "received link-qos-changed event for link " << lnk.toString()
-                                << " and node " << remote.toString()
-                                << " with link properties " << prop.toString() );
-}
-
 }}} // namespace ariba, application, pingpong

sample/pingpong/PingPong.h

@@ -35 +35 @@
 protected:
         // communication listener interface
-        virtual bool onLinkRequest(const NodeID& remote, const DataMessage& msg);
+        virtual bool onLinkRequest(const NodeID& remote, const DataMessage& msg = DataMessage::UNSPECIFIED);
         virtual void onMessage(const DataMessage& msg, const NodeID& remote, const LinkID& lnk= LinkID::UNSPECIFIED);
         virtual void onLinkUp(const LinkID& lnk, const NodeID& remote);
@@ -41 +41 @@
         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);
 
         // node listener interface