minor cleanups on karsten's patch

svn:r16810

diff --git a/ChangeLog b/ChangeLog
index 9296c2cd0a290e8d83da24679ccb556a19b5ed65..f7c943f72b29ae60e75614a0c5741c017fe74efc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,12 +5,13 @@ Changes in version 0.2.1.6-alpha - 2008-09-xx
       relay. Fixes bug 809. Bugfix on 0.2.1.5-alpha.
     - When extending a circuit to a hidden service directory to upload a
       rendezvous descriptor using a BEGIN_DIR cell, almost 1/6 of all
-      requests failed, because the router descriptor has not been downloaded
-      before. In these cases, do not attempt to upload the rendezvous
-      descriptor, but wait until the router descriptor is downloaded and
-      retry. Likewise, do not attempt to fetch a rendezvous from a hidden
-      service directory for which the router descriptor has not been
-      downloaded, yet. Fixes bug 767. Bugfix on 0.2.0.10-alpha.
+      requests failed, because the router descriptor has not been
+      downloaded yet. In these cases, do not attempt to upload the
+      rendezvous descriptor, but wait until the router descriptor is
+      downloaded and retry. Likewise, do not attempt to fetch a rendezvous
+      descriptor from a hidden service directory for which the router
+      descriptor has not yet been downloaded. Fixes bug 767. Bugfix
+      on 0.2.0.10-alpha.
 
   o Minor bugfixes:
     - Fix compile on OpenBSD 4.4-current. Bugfix on 0.2.1.5-alpha.

diff --git a/src/or/main.c b/src/or/main.c
index 1df592d93da7be0dc94e87b8edf7d94f097d4cb0..a4bc71ef652c98699731af217ce2abbaf732f5ae 100644 (file)
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -1127,8 +1127,8 @@ run_scheduled_events(time_t now)
 
   /** 7. And upload service descriptors if necessary. */
   if (has_completed_circuit && !we_are_hibernating()) {
-    rend_consider_descriptor_republication();
     rend_consider_services_upload(now);
+    rend_consider_descriptor_republication();
   }
 
   /** 8. and blow away any connections that need to die. have to do this now,

diff --git a/src/or/rendservice.c b/src/or/rendservice.c
index dcaa0343b0b597dcdde471a21c3a839cb5720117..0e715fe27694712a4a57be09df1e9bc54746b3ea 100644 (file)
--- a/src/or/rendservice.c
+++ b/src/or/rendservice.c
@@ -1420,7 +1420,7 @@ directory_post_to_hs_dir(rend_service_descriptor_t *renddesc,
       SMARTLIST_FOREACH(renddesc->successful_uploads, char *, c, tor_free(c););
       smartlist_free(renddesc->successful_uploads);
     }
-    renddesc->all_uploads_performed = -1;
+    renddesc->all_uploads_performed = 1;
   } else {
     /* Remember which routers worked this time, so that we don't upload the
      * descriptor to them again. */