[or-cvs] r16937: {tor} identical error strings in different contexts bad (tor/trunk/src/or)

[arma at seul.org]

Author: arma
Date: 2008-09-23 04:54:03 -0400 (Tue, 23 Sep 2008)
New Revision: 16937

Modified:
   tor/trunk/src/or/directory.c
Log:
identical error strings in different contexts bad


Modified: tor/trunk/src/or/directory.c
===================================================================
--- tor/trunk/src/or/directory.c	2008-09-23 06:51:22 UTC (rev 16936)
+++ tor/trunk/src/or/directory.c	2008-09-23 08:54:03 UTC (rev 16937)
@@ -3024,11 +3024,11 @@
       case -1:
         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");
+        write_http_status_line(conn, 400,
+                               "Invalid v2 service descriptor rejected");
         break;
       default:
-        write_http_status_line(conn, 200, "Service descriptor stored");
+        write_http_status_line(conn, 200, "Service descriptor (v2) stored");
         log_info(LD_REND, "Handled v2 rendezvous descriptor post: accepted");
     }
     goto done;
@@ -3082,9 +3082,10 @@
       log_fn(LOG_PROTOCOL_WARN, LD_DIRSERV,
              "Rejected rend descriptor (length %d) from %s.",
              (int)body_len, conn->_base.address);
-      write_http_status_line(conn, 400, "Invalid service descriptor rejected");
+      write_http_status_line(conn, 400,
+                             "Invalid v1 service descriptor rejected");
     } else {
-      write_http_status_line(conn, 200, "Service descriptor stored");
+      write_http_status_line(conn, 200, "Service descriptor (v1) stored");
     }
     goto done;
   }