[vidalia-svn] r3621: Backport the bridge-related fixes in r3519 and r3520. (in vidalia/branches/vidalia-0.1: . src/vidalia/config)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2009-03-16 15:30:44 -0400 (Mon, 16 Mar 2009)
New Revision: 3621

Modified:
   vidalia/branches/vidalia-0.1/
   vidalia/branches/vidalia-0.1/CHANGELOG
   vidalia/branches/vidalia-0.1/src/vidalia/config/serversettings.cpp
Log:

Backport the bridge-related fixes in r3519 and r3520.



Property changes on: vidalia/branches/vidalia-0.1
___________________________________________________________________
Modified: svn:mergeinfo
   - /vidalia/trunk:3235,3482,3504-3505,3516-3517,3524-3526,3528,3530
   + /vidalia/trunk:3235,3482,3504-3505,3516-3517,3519-3520,3524-3526,3528,3530

Modified: vidalia/branches/vidalia-0.1/CHANGELOG
===================================================================
--- vidalia/branches/vidalia-0.1/CHANGELOG	2009-03-16 19:08:30 UTC (rev 3620)
+++ vidalia/branches/vidalia-0.1/CHANGELOG	2009-03-16 19:30:44 UTC (rev 3621)
@@ -6,6 +6,9 @@
   o Remove two duplicated strings in the Spanish translation of Qt's
     internal strings (qt_es.po). The duplicated strings caused build
     errors when building with Qt 4.5. (Ticket #469)
+  o Remove the code that altered PublishServerDescriptor when becoming a
+    bridge, since Tor handles that itself now, and ensure that BridgeRelay
+    is reset when going from bridge to just-a-client mode.
   o Add an application icon based on Tor's logo to the vidalia.desktop
     file.
 

Modified: vidalia/branches/vidalia-0.1/src/vidalia/config/serversettings.cpp
===================================================================
--- vidalia/branches/vidalia-0.1/src/vidalia/config/serversettings.cpp	2009-03-16 19:08:30 UTC (rev 3620)
+++ vidalia/branches/vidalia-0.1/src/vidalia/config/serversettings.cpp	2009-03-16 19:30:44 UTC (rev 3621)
@@ -46,7 +46,6 @@
 #define SETTING_ENABLE_UPNP     "EnableUPnP"
 #define SETTING_RELAY_BANDWIDTH_RATE   "RelayBandwidthRate"
 #define SETTING_RELAY_BANDWIDTH_BURST  "RelayBandwidthBurst"
-#define SETTING_PUBLISH_DESCRIPTOR     "PublishServerDescriptor"
 
 
 /** Constructor.
@@ -70,10 +69,10 @@
   setDefault(SETTING_RELAY_BANDWIDTH_RATE,  5242880);
   setDefault(SETTING_BANDWIDTH_BURST,       10485760);
   setDefault(SETTING_RELAY_BANDWIDTH_BURST, 10485760);
-  setDefault(SETTING_PUBLISH_DESCRIPTOR,    "1");
   setDefault(SETTING_EXITPOLICY,
     ExitPolicy(ExitPolicy::Default).toString());
   setDefault(SETTING_ENABLE_UPNP, false); 
+  setDefault(SETTING_BRIDGE_RELAY, false);
 }
 
 /** Returns a QHash of Tor-recognizable configuratin keys to their current
@@ -120,11 +119,9 @@
   }
   conf.insert(SETTING_CONTACT, scrub_email_addr(contact));
   
-  /* If we're a bridge, don't publish our server descriptor */
-  conf.insert(SETTING_PUBLISH_DESCRIPTOR,
-              (torVersion >= 0x020008 && isBridgeEnabled() ? "bridge" : "1"));
-  if (torVersion >= 0x020013)
-    conf.insert(SETTING_BRIDGE_RELAY, isBridgeEnabled() ? "1" : "0");
+  /* Set if we're a bridge relay */
+  conf.insert(SETTING_BRIDGE_RELAY, isBridgeEnabled() ? "1" : "0");
+
   return conf;
 }
 
@@ -148,7 +145,7 @@
               << SETTING_DIRPORT
               << SETTING_CONTACT
               << SETTING_EXITPOLICY
-              << SETTING_PUBLISH_DESCRIPTOR;
+              << SETTING_BRIDGE_RELAY;
     if (torVersion >= 0x020001) {
       resetKeys << SETTING_RELAY_BANDWIDTH_RATE
                 << SETTING_RELAY_BANDWIDTH_BURST;
@@ -242,15 +239,14 @@
 void
 ServerSettings::setBridgeEnabled(bool enabled)
 {
-  setValue(SETTING_PUBLISH_DESCRIPTOR, enabled ? "bridge" : "1");
+  setValue(SETTING_BRIDGE_RELAY, enabled);
 }
 
 /** Returns true if Tor is configured to act as a bridge node. */
 bool
 ServerSettings::isBridgeEnabled()
 {
-  return (isServerEnabled() && 
-          value(SETTING_PUBLISH_DESCRIPTOR).toString().toLower() == "bridge");
+  return value(SETTING_BRIDGE_RELAY).toBool() && isServerEnabled();
 }
 
 /** Sets the server's ORPort. */