[or-cvs] r13036: Fix bug 579: Count DNSPort and hidden services when checking (in tor/trunk: . src/or)

[nickm at seul.org]

Author: nickm
Date: 2008-01-05 20:14:11 -0500 (Sat, 05 Jan 2008)
New Revision: 13036

Modified:
   tor/trunk/
   tor/trunk/ChangeLog
   tor/trunk/src/or/config.c
Log:
 r17469 at catbus:  nickm | 2008-01-05 20:14:07 -0500
 Fix bug 579: Count DNSPort and hidden services when checking whether Tor is going to do anything.  Change "no configured ports" from fatal to warning.



Property changes on: tor/trunk
___________________________________________________________________
 svk:merge ticket from /tor/trunk [r17469] on 8246c3cf-6607-4228-993b-4d95d33730f1

Modified: tor/trunk/ChangeLog
===================================================================
--- tor/trunk/ChangeLog	2008-01-06 00:54:22 UTC (rev 13035)
+++ tor/trunk/ChangeLog	2008-01-06 01:14:11 UTC (rev 13036)
@@ -28,6 +28,12 @@
   o Minor features (controller):
     - Get NS events working again.  (Patch from tup)
 
+  o Minor features (other):
+    - Add hidden services and DNSPorts to the list of things that make
+      Tor accept that it has running ports.  Change starting Tor with
+      no ports from a fatal error to a warning; we might change it
+      back if this turns out to confuse anybody.  (Fixes bug 579.)
+
 Changes in version 0.2.0.15-alpha - 2007-12-25
   o Major bugfixes:
     - Fix several remotely triggerable asserts based on DirPort requests

Modified: tor/trunk/src/or/config.c
===================================================================
--- tor/trunk/src/or/config.c	2008-01-06 00:54:22 UTC (rev 13035)
+++ tor/trunk/src/or/config.c	2008-01-06 01:14:11 UTC (rev 13036)
@@ -2745,9 +2745,12 @@
     REJECT("NatdPort option out of bounds.");
 
   if (options->SocksPort == 0 && options->TransPort == 0 &&
-      options->NatdPort == 0 && options->ORPort == 0)
-    REJECT("SocksPort, TransPort, NatdPort, and ORPort are all undefined? "
-           "Quitting.");
+      options->NatdPort == 0 && options->ORPort == 0 &&
+      options->DNSPort == 0 && !options->RendConfigLines)
+    log(LOG_WARN, LD_CONFIG,
+        "SocksPort, TransPort, NatdPort, DNSPort, and ORPort are all "
+        "undefined, and there aren't any hidden services configured.  "
+        "Tor will still run, but probably won't do anything.");
 
   if (options->ControlPort < 0 || options->ControlPort > 65535)
     REJECT("ControlPort option out of bounds.");