(trunk) #5671 'dht-0.22': update third-party/dht.c to Juliusz Chroboczek's upstream...

diff --git a/libtransmission/tr-dht.c b/libtransmission/tr-dht.c
index 436dcb7d01abd56bea0ea4df3c41c9efb1b91298..6b00fe1579d3a25341ce2546e980c7771138e764 100644 (file)
--- a/libtransmission/tr-dht.c
+++ b/libtransmission/tr-dht.c
@@ -514,7 +514,7 @@ tr_dhtPrintableStatus (int status)
 
 static void
 callback (void *ignore UNUSED, int event,
-          unsigned char *info_hash, void *data, size_t data_len)
+          const unsigned char *info_hash, const void *data, size_t data_len)
 {
     if (event == DHT_EVENT_VALUES || event == DHT_EVENT_VALUES6) {
         tr_torrent *tor;

diff --git a/third-party/dht/CHANGES b/third-party/dht/CHANGES
index 0c69ac4deecb6c09be459709b3e9d4bf28ccfd91..6904abd60a62685d55cca7097421900381833a37 100644 (file)
--- a/third-party/dht/CHANGES
+++ b/third-party/dht/CHANGES
@@ -1,3 +1,13 @@
+3 May 2014: dht-0.22
+
+  * INCOMPATIBLE CHANGE: the callback now takes const arguments.
+  * Consult the local storage when performing a search, which should
+    make bootstrapping of tiny DHTs easier.  Note that we're still not
+    performing local stores, since that would require knowing our IP
+    address.
+  * Don't attempt to flush the debug stream if debugging is disabled.
+    This appears to work around a bug in Transmission.
+
 25 July 2011: dht-0.21
 
   * Blacklisting support.

diff --git a/third-party/dht/dht-example.c b/third-party/dht/dht-example.c
index dc69e2b43d560a57a8760bc9ba8fe6b04aa1e24d..7ab08b6c25f3fe4ff55fddca4bb6e7250a684d6c 100644 (file)
--- a/third-party/dht/dht-example.c
+++ b/third-party/dht/dht-example.c
@@ -79,8 +79,8 @@ const unsigned char hash[20] = {
 static void
 callback(void *closure,
          int event,
-         unsigned char *info_hash,
-         void *data, size_t data_len)
+         const unsigned char *info_hash,
+         const void *data, size_t data_len)
 {
     if(event == DHT_EVENT_SEARCH_DONE)
         printf("Search done.\n");

diff --git a/third-party/dht/dht.c b/third-party/dht/dht.c
index fa7a959c1c1bcd6d4ce1c9b55877f4e341a8c88c..61522bff8dc5569c4c3222564d7aa4567ee5c69b 100644 (file)
--- a/third-party/dht/dht.c
+++ b/third-party/dht/dht.c
@@ -212,6 +212,7 @@ struct storage {
     struct storage *next;
 };
 
+static struct storage * find_storage(const unsigned char *id);
 static void flush_search_node(struct search_node *n, struct search *sr);
 
 static int send_ping(const struct sockaddr *sa, int salen,
@@ -326,11 +327,11 @@ debugf(const char *format, ...)
 {
     va_list args;
     va_start(args, format);
-    if(dht_debug) {
+    if(dht_debug)
         vfprintf(dht_debug, format, args);
-        fflush(dht_debug);
-    }
     va_end(args);
+    if(dht_debug)
+        fflush(dht_debug);
 }
 
 static void
@@ -1193,6 +1194,7 @@ dht_search(const unsigned char *id, int port, int af,
            dht_callback *callback, void *closure)
 {
     struct search *sr;
+    struct storage *st;
     struct bucket *b = find_bucket(id, af);
 
     if(b == NULL) {
@@ -1200,6 +1202,36 @@ dht_search(const unsigned char *id, int port, int af,
         return -1;
     }
 
+    /* Try to answer this search locally.  In a fully grown DHT this
+       is very unlikely, but people are running modified versions of
+       this code in private DHTs with very few nodes.  What's wrong
+       with flooding? */
+    if(callback) {
+        st = find_storage(id);
+        if(st) {
+            unsigned short swapped;
+            unsigned char buf[18];
+            int i;
+
+            debugf("Found local data (%d peers).\n", st->numpeers);
+
+            for(i = 0; i < st->numpeers; i++) {
+                swapped = htons(st->peers[i].port);
+                if(st->peers[i].len == 4) {
+                    memcpy(buf, st->peers[i].ip, 4);
+                    memcpy(buf + 4, &swapped, 2);
+                    (*callback)(closure, DHT_EVENT_VALUES, id,
+                                (void*)buf, 6);
+                } else if(st->peers[i].len == 16) {
+                    memcpy(buf, st->peers[i].ip, 16);
+                    memcpy(buf + 16, &swapped, 2);
+                    (*callback)(closure, DHT_EVENT_VALUES6, id,
+                                (void*)buf, 18);
+                }
+            }
+        }
+    }
+
     sr = searches;
     while(sr) {
         if(sr->af == af && id_cmp(sr->id, id) == 0)

diff --git a/third-party/dht/dht.h b/third-party/dht/dht.h
index f88e46b295fcae9a912d8bd8729ee090901d81c7..2a0c633237adb5296f061c205f79590506d18ca5 100644 (file)
--- a/third-party/dht/dht.h
+++ b/third-party/dht/dht.h
@@ -22,8 +22,8 @@ THE SOFTWARE.
 
 typedef void
 dht_callback(void *closure, int event,
-             unsigned char *info_hash,
-             void *data, size_t data_len);
+             const unsigned char *info_hash,
+             const void *data, size_t data_len);
 
 #define DHT_EVENT_NONE 0
 #define DHT_EVENT_VALUES 1