Changeset 5718 for source

Timestamp:

Aug 5, 2009, 4:31:21 PM (15 years ago)

Author:

mies

Message:

 

Location:

source/ariba

Files:

• overlay/modules/chord/Chord.cpp (modified) (2 diffs)
• utility/transport/tcpip/tcpip.cpp (modified) (1 diff)

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

@@ -108 +108 @@
         dmsg.setTTL((uint8_t) ttl);
         cmsg.encapsulate(&dmsg);
-        discovery_count++;
-        if (discovery_count<0) discovery_count = 0;
-        const route_item* item = (*table)[ discovery_count % table->size() ];
-        if (item!=NULL && !item->info.isUnspecified()) send(&cmsg,item->info);
+
+        // get next hop
+        const route_item* item = table->get_next_hop(destination);
+        if (item!=NULL && !item->info.isUnspecified()) send(&cmsg, item->info);
 }
 
@@ -292 +292 @@
         M* m = msg.getMessage()->convert<ChordMessage> ();
         if (m == NULL) return;
-
-        // drop-self messages
-        if (m->getSource() == nodeid ) {
-                delete m;
-                return;
-        }
 
         // handle messages

source/ariba/utility/transport/tcpip/tcpip.cpp

@@ -54 +54 @@
 
 tcpip::~tcpip() {
-
+        if (running) stop();
 }