Changeset 10597 for branches

Timestamp:

May 1, 2010, 1:55:20 PM (12 years ago)

Author:

charles

Message:

(1.9x third-party) backport r10423 for #2767 "DHT-formatted dictionaries are incorrect"

Location:

branches/1.9x/third-party/dht

Files:

• CHANGES (modified) (1 diff)
• dht.c (modified) (7 diffs)

branches/1.9x/third-party/dht/CHANGES

@@ +1 @@
+25 March 2010: dht-0.14
+
+  * Fixed ordering of entries in parameter dictionaries.
+
 15 December 2009: dht-0.13
 

branches/1.9x/third-party/dht/dht.c

@@ -1 +1 @@
 /*
-Copyright (c) 2009 by Juliusz Chroboczek
+Copyright (c) 2010 by Juliusz Chroboczek
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -263 +263 @@
 static time_t expire_stuff_time;
 
-#define MAX_LEAKY_BUCKET_TOKENS 40
-static time_t leaky_bucket_time;
-static int leaky_bucket_tokens;
+#define MAX_TOKEN_BUCKET_TOKENS 40
+static time_t token_bucket_time;
+static int token_bucket_tokens;
 
 FILE *dht_debug = NULL;
@@ -989 +989 @@
                    omitting the token when storage tables are full.  While
                    I don't think this makes a lot of sense -- just sending
-                   a positive reply is just as good, let's deal with it. */
+                   a positive reply is just as good --, let's deal with it. */
                 if(n->token_len == 0)
                     n->acked = 1;
@@ -1593 +1593 @@
     next_blacklisted = 0;
 
-    leaky_bucket_time = now.tv_sec;
-    leaky_bucket_tokens = MAX_LEAKY_BUCKET_TOKENS;
+    token_bucket_time = now.tv_sec;
+    token_bucket_tokens = MAX_TOKEN_BUCKET_TOKENS;
 
     memset(secret, 0, sizeof(secret));
@@ -1656 +1656 @@
 
 static int
-leaky_bucket(void)
-{
-    if(leaky_bucket_tokens == 0) {
-        leaky_bucket_tokens = MIN(MAX_LEAKY_BUCKET_TOKENS,
-                                  4 * (now.tv_sec - leaky_bucket_time));
-        leaky_bucket_time = now.tv_sec;
-    }
-
-    if(leaky_bucket_tokens == 0)
+token_bucket(void)
+{
+    if(token_bucket_tokens == 0) {
+        token_bucket_tokens = MIN(MAX_TOKEN_BUCKET_TOKENS,
+                                  4 * (now.tv_sec - token_bucket_time));
+        token_bucket_time = now.tv_sec;
+    }
+
+    if(token_bucket_tokens == 0)
         return 0;
 
-    leaky_bucket_tokens--;
+    token_bucket_tokens--;
     return 1;
 }
@@ -1870 +1870 @@
         if(message > REPLY) {
             /* Rate limit requests. */
-            if(!leaky_bucket()) {
+            if(!token_bucket()) {
                 debugf("Dropping request due to rate limiting.\n");
                 goto dontread;
@@ -2374 +2374 @@
     rc = snprintf(buf + i, 2048 - i, "d1:rd2:id20:"); INC(i, rc, 2048);
     COPY(buf, i, myid, 20, 2048);
+    if(nodes_len > 0) {
+        rc = snprintf(buf + i, 2048 - i, "5:nodes%d:", nodes_len);
+        INC(i, rc, 2048);
+        COPY(buf, i, nodes, nodes_len, 2048);
+    }
+    if(nodes6_len > 0) {
+         rc = snprintf(buf + i, 2048 - i, "6:nodes6%d:", nodes6_len);
+         INC(i, rc, 2048);
+         COPY(buf, i, nodes6, nodes6_len, 2048);
+    }
     if(token_len > 0) {
         rc = snprintf(buf + i, 2048 - i, "5:token%d:", token_len);
         INC(i, rc, 2048);
         COPY(buf, i, token, token_len, 2048);
-    }
-    if(nodes_len > 0) {
-        rc = snprintf(buf + i, 2048 - i, "5:nodes%d:", nodes_len);
-        INC(i, rc, 2048);
-        COPY(buf, i, nodes, nodes_len, 2048);
-    }
-    if(nodes6_len > 0) {
-         rc = snprintf(buf + i, 2048 - i, "6:nodes6%d:", nodes6_len);
-         INC(i, rc, 2048);
-         COPY(buf, i, nodes6, nodes6_len, 2048);
     }