Changeset 6961 for source

Timestamp:

Nov 18, 2009, 9:44:28 PM (14 years ago)

Author:

mies

Message:

 

Location:

source/ariba/overlay

Files:

• BaseOverlay.cpp (modified) (4 diffs)
• BaseOverlay.h (modified) (1 diff)
• LinkDescriptor.h (modified) (4 diffs)

source/ariba/overlay/BaseOverlay.cpp

@@ -360 +360 @@
                 if (!ld->up) continue;
 
+                // check if link is relayed and retry connecting directly
+                if ( ld->relayed && ld->retryCounter > 0) {
+                        ld->retryCounter--;
+                        ld->communicationId = bc->establishLink( ld->endpoint );
+                }
+
                 // remote used as relay flag
                 if ( ld->relaying && difftime( now, ld->timeRelaying ) > 10)
@@ -756 +762 @@
                         sideport(&SideportListener::DEFAULT), overlayInterface(NULL),
                         counter(0) {
-        dht = new DHT();
-        localDHT = new DHT();
+        initDHT();
 }
 
 BaseOverlay::~BaseOverlay() {
-        delete dht;
+        destroyDHT();
 }
 
@@ -1755 +1760 @@
 
         // try to replace relay link with direct link
-        ldn->communicationId =
-                        bc->establishLink( overlayMsg->getSourceEndpoint() );
+        ldn->retryCounter = 3;
+        ldn->endpoint = overlayMsg->getSourceEndpoint();
+        ldn->communicationId =  bc->establishLink( ldn->endpoint );
 
         return true;
@@ -2096 +2102 @@
 // ----------------------------------------------------------------------------
 
+void BaseOverlay::initDHT() {
+        dht = new DHT();
+        localDHT = new DHT();
+        republishCounter = 0;
+}
+
+void BaseOverlay::destroyDHT() {
+        delete dht;
+        delete localDHT;
+}
+
 /// stabilize DHT state
 void BaseOverlay::stabilizeDHT() {
+
+        // do not refresh every second
+        if (republishCounter < 2) {
+                republishCounter++;
+                return;
+        }
+        republishCounter = 0;
+
         // remove old values from DHT
         BOOST_FOREACH( DHTEntry& entry, dht->entries ) {

source/ariba/overlay/BaseOverlay.h

@@ -500 +500 @@
         DHT* dht;
         DHT* localDHT;
-
+        int republishCounter;
+
+        void initDHT();
+        void destroyDHT();
         void stabilizeDHT();
         void dhtSend( OverlayMsg* msg, const NodeID& dest );

source/ariba/overlay/LinkDescriptor.h

@@ -10 +10 @@
 #include "ariba/utility/messages.h"
 #include "ariba/utility/types.h"
+#include "ariba/communication/EndpointDescriptor.h"
 #include "ariba/CommunicationListener.h"
 
@@ -23 +24 @@
 using ariba::utility::LinkID;
 using ariba::CommunicationListener;
+using ariba::communication::EndpointDescriptor;
 
 namespace ariba {
@@ -55 +57 @@
                 this->autolink = false;
                 this->lastuse = time(NULL);
+                this->retryCounter = 0;
         }
 
@@ -78 +81 @@
         LinkID communicationId; ///< the communication id
         bool   communicationUp;   ///< flag, whether the communication is up
+
+        // direct link retries -----------------------------------------------------
+        EndpointDescriptor endpoint;
+        int retryCounter;
 
         // link alive information --------------------------------------------------