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

Timestamp:

Aug 10, 2009, 5:55:19 PM (16 years ago)

Author:

huebsch

Message:

revert des kompletten overlay ordners auf revision 5752

File:

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

source/ariba/overlay/BaseOverlay.cpp

@@ -118 +118 @@
                 // get descriptor of first hop
                 rld = getDescriptor(rlid);
-                if (rld!=NULL) {
-                        // is first hop a relay path use local relay
-                        if ( rld->relay ) relayNode = rld->localRelay;
-
-                        // no-> a proper relay node has been found
-                        else relayNode = rld->remoteNode;
-                }
+
+                // is first hop a relay path use local relay
+                if ( rld->relay ) relayNode = rld->localRelay;
+
+                // no-> a proper relay node has been found
+                else relayNode = rld->remoteNode;
         }
 
@@ -148 +147 @@
                     lp->service == OverlayInterface::OVERLAY_SERVICE_ID &&
                     lp->relay == false &&
-                    lp->up) {
-
-//                      std::cout << "using relay node: " << lp->remoteNode.toString() << std::endl;
+                    lp->up)
                         return lp;
-                }
 
         return NULL;
@@ -1156 +1152 @@
                         // delegate data message
                         listener->onMessage( overlayMsg,
-                                overlayMsg->getSourceNode(), ld==NULL ? LinkID::UNSPECIFIED : ld->overlayId );
+                                overlayMsg->getSourceNode(), ld->overlayId );
 
                         ret = true;
@@ -1395 +1391 @@
                         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()) {
@@ -1416 +1400 @@
                                                         << " 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
                                         OverlayMsg _overMsg( *overlayMsg );
-                                        relayMsg->setType( RelayMessage::typeRoute );
-                                        _overMsg.encapsulate( relayMsg );
+                                        RelayMessage _relayMsg( *relayMsg );
+                                        _relayMsg.setType( RelayMessage::typeRoute );
+                                        _overMsg.encapsulate( &_relayMsg );
 
                                         // forward message
@@ -1439 +1436 @@
                                                         << " 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->
                                         if (relayMsg->getRelayNode() == nodeId ) {
                                                 logging_debug("I'm the relay for this message. Sending to destination.");
                                                 OverlayMsg _overMsg( *overlayMsg );
-                                                _overMsg.encapsulate(relayMsg);
+                                                RelayMessage _relayMsg( *relayMsg );
+                                                _overMsg.encapsulate(&_relayMsg);
 
                                                 /// this must be handled by using relay link!
@@ -1607 +1617 @@
 
                         // missed more than four keep-alive messages (10 sec)? -> drop link
-                        if (ld->keepAliveMissed > 8) {
+                        if (ld->keepAliveMissed > 4) {
                                 logging_info( "Link connection request is stale, closing: " << ld );
                                 oldlinks.push_back( ld );