[or-cvs] r12182: Refuse to start if both ORPort and UseBridges are set. Bugfi (in tor/trunk: . src/or)

[arma at seul.org]

Author: arma
Date: 2007-10-25 00:40:27 -0400 (Thu, 25 Oct 2007)
New Revision: 12182

Modified:
   tor/trunk/ChangeLog
   tor/trunk/src/or/config.c
Log:
Refuse to start if both ORPort and UseBridges are set. Bugfix
on 0.2.0.x.


Modified: tor/trunk/ChangeLog
===================================================================
--- tor/trunk/ChangeLog	2007-10-25 04:37:13 UTC (rev 12181)
+++ tor/trunk/ChangeLog	2007-10-25 04:40:27 UTC (rev 12182)
@@ -1,3 +1,9 @@
+Changes in version 0.2.0.10-alpha - 2007-1?-??
+  o Minor bugfixes:
+    - Refuse to start if both ORPort and UseBridges are set. Bugfix
+      on 0.2.0.x.
+
+
 Changes in version 0.2.0.9-alpha - 2007-10-24
   o Major features (directory system):
     - Clients now download v3 consensus networkstatus documents instead

Modified: tor/trunk/src/or/config.c
===================================================================
--- tor/trunk/src/or/config.c	2007-10-25 04:37:13 UTC (rev 12181)
+++ tor/trunk/src/or/config.c	2007-10-25 04:40:27 UTC (rev 12182)
@@ -2780,6 +2780,11 @@
            "of the Internet, so they must not set Reachable*Addresses "
            "or FascistFirewall.");
 
+  if (options->UseBridges &&
+      server_mode(options))
+    REJECT("Servers must be able to freely connect to the rest "
+           "of the Internet, so they must not set UseBridges.");
+
   options->_AllowInvalid = 0;
   if (options->AllowInvalidNodes) {
     SMARTLIST_FOREACH(options->AllowInvalidNodes, const char *, cp, {