Changeset 5884 for source/ariba/overlay/BaseOverlay.cpp

Timestamp:

Aug 12, 2009, 2:52:12 PM (16 years ago)

Author:

mies

Message:

 

File:

• source/ariba/overlay/BaseOverlay.cpp (modified) (7 diffs)

source/ariba/overlay/BaseOverlay.cpp

@@ -141 +141 @@
         time_t now = time(NULL);
         BOOST_FOREACH( LinkDescriptor* ld, links ) {
-                // remote used as relay flag
-                if ( ld->relaying && difftime( now, ld->timeRelaying ) > 10)
-                        ld->relaying = false;
 
                 // keep alives and not up? yes-> link connection request is stale!
@@ -160 +157 @@
 
                 if (!ld->up) continue;
+
+                // remote used as relay flag
+                if ( ld->relaying && difftime( now, ld->timeRelaying ) > 10)
+                        ld->relaying = false;
 
                 // drop links that are dropped and not used as relay
@@ -240 +241 @@
         } else {
                 // destinastion myself? yes-> handle message
-                if (message->getDestinationNode() == nodeId)
-                        handleMessage( message, NULL );
-                else
+                if (message->getDestinationNode() == nodeId) {
+                        logging_warn("Usually I should not route messages to myself!");
+                        Message msg;
+                        msg.encapsulate(message);
+                        handleMessage( &msg, NULL );
+                } else {
                         // no->send message to next hop
                         send( message, message->getDestinationNode() );
+                }
         }
 }
@@ -331 +336 @@
         const ServiceID& service) {
         message->setSourceNode(nodeId);
+        message->setDestinationNode(remote);
         message->setService(service);
-        message->setDestinationNode(remote);
         send( message, remote );
 }
@@ -343 +348 @@
         }
         message->setSourceNode(nodeId);
+        message->setDestinationNode(ld->remoteNode);
+
         message->setSourceLink(ld->overlayId);
+        message->setDestinationLink(ld->remoteLink);
+
         message->setService(ld->service);
-        message->setDestinationNode(ld->remoteNode);
-        message->setDestinationLink(ld->remoteLink);
         return send( message, ld, ignore_down );
 }
@@ -1476 +1483 @@
         if( overlayMsg == NULL ) return false;
 
+        // increase number of hops
+        overlayMsg->increaseNumHops();
+
         // refresh relay information
         refreshRelayInformation( overlayMsg, ld );
-
-        // increase number of hops
-        overlayMsg->increaseNumHops();
 
         // update route record
@@ -1500 +1507 @@
                         << " to " << overlayMsg->getDestinationNode()
                 );
-
                 route( overlayMsg );
                 delete overlayMsg;