[or-cvs] r13045: cleanups on r13037 (in tor/trunk: . src/or)

[arma at seul.org]

Author: arma
Date: 2008-01-06 18:37:48 -0500 (Sun, 06 Jan 2008)
New Revision: 13045

Modified:
   tor/trunk/ChangeLog
   tor/trunk/src/or/directory.c
Log:
cleanups on r13037


Modified: tor/trunk/ChangeLog
===================================================================
--- tor/trunk/ChangeLog	2008-01-06 22:44:59 UTC (rev 13044)
+++ tor/trunk/ChangeLog	2008-01-06 23:37:48 UTC (rev 13045)
@@ -24,6 +24,9 @@
     - Use a mutex to protect the list of logs, so we never write to
       the list as it's being freed.  Bugfix on 0.1.2.x.  Fixes the
       very rare bug 575, which is kind of the revenge of bug 222.
+    - Patch from Karsten Loesing to complain less at both the client
+      and the relay when a relay used to have the HSDir flag but doesn't
+      anymore, and we try to upload a hidden service descriptor.
 
   o Minor features (controller):
     - Get NS events working again.  (Patch from tup)

Modified: tor/trunk/src/or/directory.c
===================================================================
--- tor/trunk/src/or/directory.c	2008-01-06 22:44:59 UTC (rev 13044)
+++ tor/trunk/src/or/directory.c	2008-01-06 23:37:48 UTC (rev 13045)
@@ -2727,18 +2727,17 @@
       !strcmpstart(url,"/tor/rendezvous2/publish")) {
     switch (rend_cache_store_v2_desc_as_dir(body)) {
       case -2:
-        log_info(LD_REND, "Rejected rend descriptor (length %d) from %s.",
+        log_info(LD_REND, "Rejected v2 rend descriptor (length %d) from %s "
+                 "since we're not currently a hidden service directory.",
                  (int)body_len, conn->_base.address);
         write_http_status_line(conn, 503, "Currently not acting as v2 "
                                "hidden service directory");
-        log_info(LD_REND, "Handled v2 rendezvous descriptor post: rejected");
         break;
       case -1:
-        log_info(LD_REND, "Rejected rend descriptor (length %d) from %s.",
+        log_warn(LD_REND, "Rejected v2 rend descriptor (length %d) from %s.",
                  (int)body_len, conn->_base.address);
         write_http_status_line(conn, 400, "Invalid service descriptor "
                                           "rejected");
-        log_info(LD_REND, "Handled v2 rendezvous descriptor post: rejected");
         break;
       default:
         write_http_status_line(conn, 200, "Service descriptor stored");