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

Timestamp:

Aug 7, 2009, 12:55:13 PM (16 years ago)

Author:

mies

Message:

 

File:

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

source/ariba/overlay/BaseOverlay.cpp

@@ -1394 +1394 @@
                         RelayMessage* relayMsg = overlayMsg->decapsulate<RelayMessage>();
 
+                        // mark incoming link as relay
+                        if (ld!=NULL) ld->markAsRelay();
+
+                        // am I the destination of this message? yes->
+                        if (relayMsg->getDestNode() == nodeId ) {
+                                // deliver relay message locally!
+                                logging_debug("Relay message reached destination. Handling the message.");
+                                handleMessage( relayMsg, relayMsg->getDestLink(), LinkID::UNSPECIFIED, remoteNode );
+                                ret = true;
+                                break;
+                        }
+
                         // is relay message informative?
                         switch (relayMsg->getType()) {
@@ -1402 +1414 @@
                                                         << " relay " << relayMsg->getRelayNode()
                                                         << " destination " << relayMsg->getDestNode() );
-
-                                        // mark incoming link as relay
-                                        if (ld!=NULL) ld->markAsRelay();
-
-                                        // am I the destination of this message? yes->
-                                        if (relayMsg->getDestNode() == nodeId ) {
-                                                // deliver relay message locally!
-                                                logging_debug("Relay message reached destination. Handling the message.");
-                                                handleMessage( relayMsg, relayMsg->getDestLink(), LinkID::UNSPECIFIED, remoteNode );
-                                                ret = true;
-                                                break;
-                                        }
 
                                         // create route message
@@ -1426 +1426 @@
                                         } else {
                                                 logging_info("Routing relay message to " << relayMsg->getRelayNode().toString() );
-                                                sendOverlay( &_overMsg, relayMsg->getRelayNode() );
+//                                              sendOverlay( &_overMsg, relayMsg->getRelayNode() );
+                                                sendOverlay( &_overMsg, relayMsg->getDestNode() );
                                         }
                                         ret = true;
@@ -1437 +1438 @@
                                                         << " relay " << relayMsg->getRelayNode()
                                                         << " destination " << relayMsg->getDestNode() );
-
-                                        // mark incoming link as relay
-                                        if (ld!=NULL) ld->markAsRelay();
-
-                                        // am I the destination of this message? yes->
-                                        if (relayMsg->getDestNode() == nodeId ) {
-                                                // deliver relay message locally!
-                                                logging_debug("Relay message reached destination. Handling the message.");
-                                                handleMessage( relayMsg, relayMsg->getDestLink(), LinkID::UNSPECIFIED, remoteNode );
-                                                ret = true;
-                                                break;
-                                        }
 
                                         // am I the relay for this message? yes->