[or-cvs] r17501: {tor} cleanups on r17500 (in tor/trunk: . src/config src/or)

[arma at seul.org]

Author: arma
Date: 2008-12-06 20:34:45 -0500 (Sat, 06 Dec 2008)
New Revision: 17501

Modified:
   tor/trunk/ChangeLog
   tor/trunk/src/config/torrc.sample.in
   tor/trunk/src/or/config.c
   tor/trunk/src/or/directory.c
Log:
cleanups on r17500


Modified: tor/trunk/ChangeLog
===================================================================
--- tor/trunk/ChangeLog	2008-12-07 01:21:19 UTC (rev 17500)
+++ tor/trunk/ChangeLog	2008-12-07 01:34:45 UTC (rev 17501)
@@ -1,9 +1,9 @@
 Changes in version 0.2.1.8-alpha - 2008-12-06
-  o Major feature:
-    - New DirPortFrontPage option that takes an html file and publishes it as
-      "/" on the DirPort. Now relay operators can provide a disclaimer without
-      needing to set up a separate webserver. There's a sample disclaimer 
-      in contrib/tor-exit-notice.html.
+  o Major features:
+    - New DirPortFrontPage option that takes an html file and publishes
+      it as "/" on the DirPort. Now relay operators can provide a
+      disclaimer without needing to set up a separate webserver. There's
+      a sample disclaimer in contrib/tor-exit-notice.html.
 
   o Major bugfixes:
     - Fix a DOS opportunity during the voting signature collection process

Modified: tor/trunk/src/config/torrc.sample.in
===================================================================
--- tor/trunk/src/config/torrc.sample.in	2008-12-07 01:21:19 UTC (rev 17500)
+++ tor/trunk/src/config/torrc.sample.in	2008-12-07 01:34:45 UTC (rev 17501)
@@ -108,9 +108,9 @@
 ## below too. You'll need to do ipchains or other port forwarding yourself
 ## to make this work.
 #DirListenAddress 0.0.0.0:9091
-
-## Uncomment this to return an arbitrary blob of html on your DirPort. You may
-## wish to use this blob of html to inform clients about your Tor server.
+## Uncomment to return an arbitrary blob of html on your DirPort. Now you
+## can explain what Tor is if anybody wonders why your IP address is
+## contacting them.
 #DirPortFrontPage /etc/tor/exit-notice.html
 
 ## Uncomment this if you run more than one Tor server, and add the

Modified: tor/trunk/src/or/config.c
===================================================================
--- tor/trunk/src/or/config.c	2008-12-07 01:21:19 UTC (rev 17500)
+++ tor/trunk/src/or/config.c	2008-12-07 01:34:45 UTC (rev 17501)
@@ -756,7 +756,7 @@
 static or_state_t *global_state = NULL;
 /** Configuration Options set by command line. */
 static config_line_t *global_cmdline_options = NULL;
-/** Contents of most recently read DirPortFrontPage option file. */
+/** Contents of most recently read DirPortFrontPage file. */
 static char *global_dirfrontpagecontents = NULL;
 
 /** Return the contents of our frontpage string, or NULL if not configured. */

Modified: tor/trunk/src/or/directory.c
===================================================================
--- tor/trunk/src/or/directory.c	2008-12-07 01:21:19 UTC (rev 17500)
+++ tor/trunk/src/or/directory.c	2008-12-07 01:34:45 UTC (rev 17501)
@@ -2479,7 +2479,8 @@
 
     if (frontpage) {
       dlen = strlen(frontpage);
-      /* Lets return a disclaimer, users shouldn't use V1 anymore */
+      /* Let's return a disclaimer page (users shouldn't use V1 anymore,
+         and caches don't fetch '/', so this is safe). */
       if (global_write_bucket_low(TO_CONN(conn), dlen, 1)) {
         log_info(LD_DIRSERV,
                  "Client asked for DirPortFrontPage content, but we've been "
@@ -2493,6 +2494,7 @@
       connection_write_to_buf(frontpage, dlen, TO_CONN(conn));
       goto done;
     }
+    /* if no disclaimer file, fall through and continue */
   }
 
   if (!strcmp(url,"/tor/") || !strcmp(url,"/tor/dir")) { /* v1 dir fetch */