[vidalia-svn] r2035: 'PublishServerDescriptor bridge' is the mojo to be a bridge (in trunk: . src/config)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2007-10-15 23:39:58 -0400 (Mon, 15 Oct 2007)
New Revision: 2035

Modified:
   trunk/
   trunk/src/config/serversettings.cpp
Log:
 r2131@lysithea:  edmanm | 2007-10-15 23:39:54 -0400
 'PublishServerDescriptor bridge' is the mojo to be a bridge server,
 apparently.



Property changes on: trunk
___________________________________________________________________
 svk:merge ticket from /local/vidalia/trunk [r2131] on dc66be73-d13e-47ba-a267-8dc7cda68c65

Modified: trunk/src/config/serversettings.cpp
===================================================================
--- trunk/src/config/serversettings.cpp	2007-10-16 03:07:34 UTC (rev 2034)
+++ trunk/src/config/serversettings.cpp	2007-10-16 03:39:58 UTC (rev 2035)
@@ -68,7 +68,7 @@
   setDefault(SETTING_BANDWIDTH_RATE,  3145728);
   setDefault(SETTING_BANDWIDTH_BURST, 6291456);
   setDefault(SETTING_NICKNAME,        "Unnamed");
-  setDefault(SETTING_PUBLISH_DESCRIPTOR, true);
+  setDefault(SETTING_PUBLISH_DESCRIPTOR, "1");
   setDefault(SETTING_EXITPOLICY,
     ExitPolicy(ExitPolicy::Default).toString());
 }
@@ -117,7 +117,8 @@
   conf.insert(SETTING_CONTACT, scrub_email_addr(contact));
   
   /* If we're a bridge, don't publish our server descriptor */
-  conf.insert(SETTING_PUBLISH_DESCRIPTOR, (isBridgeEnabled() ? "0" : "1"));
+  conf.insert(SETTING_PUBLISH_DESCRIPTOR,
+              (isBridgeEnabled() ? "bridge" : "1"));
 
   return conf;
 }
@@ -180,14 +181,15 @@
 void
 ServerSettings::setBridgeEnabled(bool enabled)
 {
-  setValue(SETTING_PUBLISH_DESCRIPTOR, !enabled);
+  setValue(SETTING_PUBLISH_DESCRIPTOR, enabled ? "bridge" : "1");
 }
 
 /** Returns true if Tor is configured to act as a bridge node. */
 bool
 ServerSettings::isBridgeEnabled()
 {
-  return (isServerEnabled() && !value(SETTING_PUBLISH_DESCRIPTOR).toBool());
+  return (isServerEnabled() && 
+          value(SETTING_PUBLISH_DESCRIPTOR).toString().toLower() == "bridge");
 }
 
 /** Sets the server's ORPort. */