Changeset 5758 for source/ariba

Timestamp:

Aug 7, 2009, 11:20:14 AM (15 years ago)

Author:

mies

Message:

 

Location:

source/ariba/overlay

Files:

• messages/RelayMessage.h (modified) (1 diff)
• modules/chord/Chord.cpp (modified) (1 diff)

source/ariba/overlay/messages/RelayMessage.h

@@ -37 +37 @@
         /// contructs a unspecified relay message
         RelayMessage() :
-                type(typeInvalid), relayNode(NodeID::UNSPECIFIED), destNode(NodeID::UNSPECIFIED) {
+                type(typeInvalid), relayNode(NodeID::UNSPECIFIED), destNode(NodeID::UNSPECIFIED), destLink(LinkID::UNSPECIFIED) {
+        }
+
+        RelayMessage( const RelayMessage& rhs ) :
+                type(rhs.type), relayNode(rhs.relayNode), destNode(rhs.destNode), destLink(rhs.destLink) {
+
         }
 

source/ariba/overlay/modules/chord/Chord.cpp

@@ -311 +311 @@
 
                 // add to back-routes
-                back_route br;
-                br.id = m->getSource();
-                br.link = link;
-                br.lastseen = time(NULL);
-                back_routes.push_back(br);
+                bool found = false;
+                BOOST_FOREACH( back_route br, back_routes) {
+                        if (br.id == m->getSource()) {
+                                br.link = link;
+                                br.lastseen = time(NULL);
+                                found = true;
+                                break;
+                        }
+                }
+                if (!found) {
+                        back_route br;
+                        br.id = m->getSource();
+                        br.link = link;
+                        br.lastseen = time(NULL);
+                        back_routes.push_back(br);
+                }
 
                 // next hop == myself?