From e3cfaa841943326b1527afcc9dacf263fcf77f73 Mon Sep 17 00:00:00 2001
From: "Nathan S. Evans" <evans@in.tum.de>
Date: Fri, 2 Jul 2010 12:04:30 +0000
Subject: [PATCH] remove retransmit

---
 src/dht/dht_api.c         | 4 ++++
 src/dht/test_dht_tools.sh | 8 ++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/dht/dht_api.c b/src/dht/dht_api.c
index f29d71768..83736fb7a 100644
--- a/src/dht/dht_api.c
+++ b/src/dht/dht_api.c
@@ -290,6 +290,7 @@ hash_from_uid (uint64_t uid,
   *((uint64_t*)hash) = uid;
 }
 
+#if RETRANSMIT
 /**
  * Iterator callback to retransmit each outstanding request
  * because the connection to the DHT service went down (and
@@ -317,6 +318,7 @@ static int retransmit_iterator (void *cls,
 
   return GNUNET_OK;
 }
+#endif
 
 /**
  * Try to (re)connect to the dht service.
@@ -571,6 +573,7 @@ service_message_handler (void *cls,
         {
           finish(handle, GNUNET_SYSERR); /* If there was a current message, kill it! */
         }
+#if RETRANSMIT
       if (GNUNET_CONTAINER_multihashmap_iterate(handle->outstanding_requests, &retransmit_iterator, handle) > 0)
         {
           handle->retransmit_stage = DHT_RETRANSMITTING;
@@ -578,6 +581,7 @@ service_message_handler (void *cls,
           process_pending_retransmissions(handle);
         }
       return;
+#endif
     }
 
   switch (ntohs (msg->type))
diff --git a/src/dht/test_dht_tools.sh b/src/dht/test_dht_tools.sh
index 193f5c0e5..85fd29155 100755
--- a/src/dht/test_dht_tools.sh
+++ b/src/dht/test_dht_tools.sh
@@ -42,8 +42,8 @@ echo "PASS"
 sleep 1
 
 echo -n "TEST: Testing put..."
-#if ! valgrind --log-file=test_put.log $putexe -k testkey -d testdata > $out ; then
-if ! $putexe -k testkey -d testdata > $out ; then
+if ! valgrind --leak-check=full --log-file=test_put.log $putexe -k testkey -d testdata > $out ; then
+#if ! $putexe -k testkey -d testdata > $out ; then
   echo "FAIL: error running $putexe"
   echo "Command output was:"
   cat $out
@@ -57,8 +57,8 @@ echo -n "TEST: Testing get..."
 echo "Result 0, type 0:" > $checkout
 echo "testdata" >> $checkout
 
-#if ! valgrind --log-file=test_get.log $getexe -k testkey -T 1 > $out ; then
-if ! $getexe -k testkey -T 1 > $out ; then
+if ! valgrind --leak-check=full --log-file=test_get.log $getexe -k testkey -T 1 > $out ; then
+#if ! $getexe -k testkey -T 1 > $out ; then
   echo "FAIL: error running $putexe"
   echo "Command output was:"
   cat $out
-- 
2.25.1