[vidalia-svn] r2116: GETCONF RelayBandwidthRate and RelayBandwidthBurst properly (in trunk: . src/config)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2007-11-20 01:45:26 -0500 (Tue, 20 Nov 2007)
New Revision: 2116

Modified:
   trunk/
   trunk/CHANGELOG
   trunk/src/config/serversettings.cpp
   trunk/src/config/serversettings.h
Log:
 r2119@lysithea:  edmanm | 2007-11-20 01:14:08 -0500
 GETCONF RelayBandwidthRate and RelayBandwidthBurst properly on Tor >=
 0.2.0.1-alpha. Previously, we were SETCONFing RelayBandwidthFoo when
 appropriate, but always GETCONFing BandwidthFoo. Fixes Ticket #298.



Property changes on: trunk
___________________________________________________________________
 svk:merge ticket from /local/vidalia/trunk [r2119] on 0108964c-5b0b-4c9e-969f-e2288315d100

Modified: trunk/CHANGELOG
===================================================================
--- trunk/CHANGELOG	2007-11-13 20:49:10 UTC (rev 2115)
+++ trunk/CHANGELOG	2007-11-20 06:45:26 UTC (rev 2116)
@@ -1,3 +1,8 @@
+0.0.16  xx-xxx-200x
+  o GETCONF RelayBandwidthRate and RelayBandwidthBurst properly on Tor >=
+  0.2.0.1-alpha. Previously, we were SETCONFing RelayBandwidthFoo when
+  appropriate, but always GETCONFing BandwidthFoo. Fixes Ticket #298.
+
 0.0.15  24-Oct-2007
   o Add a new 'Network' settings page to the config dialog that lets users
     configure an HTTP/HTTPS proxy, specify allowed ports if they are behind a

Modified: trunk/src/config/serversettings.cpp
===================================================================
--- trunk/src/config/serversettings.cpp	2007-11-13 20:49:10 UTC (rev 2115)
+++ trunk/src/config/serversettings.cpp	2007-11-20 06:45:26 UTC (rev 2116)
@@ -68,11 +68,13 @@
   setDefault(SETTING_ORPORT,        9001);
 #endif
   setDefault(SETTING_DIRPORT,       9030);
+  setDefault(SETTING_NICKNAME,      "Unnamed");
   setDefault(SETTING_CONTACT,       "<your@xxxxxxxxx>");
-  setDefault(SETTING_BANDWIDTH_RATE,  3145728);
-  setDefault(SETTING_BANDWIDTH_BURST, 6291456);
-  setDefault(SETTING_NICKNAME,        "Unnamed");
-  setDefault(SETTING_PUBLISH_DESCRIPTOR, "1");
+  setDefault(SETTING_BANDWIDTH_RATE,        3145728);
+  setDefault(SETTING_RELAY_BANDWIDTH_RATE,  3145728);
+  setDefault(SETTING_BANDWIDTH_BURST,       6291456);
+  setDefault(SETTING_RELAY_BANDWIDTH_BURST, 6291456);
+  setDefault(SETTING_PUBLISH_DESCRIPTOR,    "1");
   setDefault(SETTING_EXITPOLICY,
     ExitPolicy(ExitPolicy::Default).toString());
 }
@@ -158,6 +160,21 @@
   return rc;
 }
 
+/** Virtual method called when we retrieve a server-related setting from Tor.
+ * Currently this just translates BandwidthFoo to RelayBandwidthFoo when
+ * appropriate. */
+QVariant
+ServerSettings::torValue(const QString &key)
+{
+  if (torControl()->getTorVersion() >= 0x020001) {
+    if (key == SETTING_BANDWIDTH_RATE)
+      return AbstractTorSettings::torValue(SETTING_RELAY_BANDWIDTH_RATE);
+    else if (key == SETTING_BANDWIDTH_BURST)
+      return AbstractTorSettings::torValue(SETTING_RELAY_BANDWIDTH_BURST);
+  }
+  return AbstractTorSettings::torValue(key);
+}
+
 /** Enables or disables running Tor as a server. 
  * \param enable Whether to enable or disable the Tor server. 
  */

Modified: trunk/src/config/serversettings.h
===================================================================
--- trunk/src/config/serversettings.h	2007-11-13 20:49:10 UTC (rev 2115)
+++ trunk/src/config/serversettings.h	2007-11-20 06:45:26 UTC (rev 2116)
@@ -92,6 +92,12 @@
   /** Gets the maximum burst rate (in B/s) of this server. */
   quint32 getBandwidthBurstRate();
 
+protected:
+  /** Virtual method called when we retrieve a server-related setting from Tor.
+   * Currently this just translates BandwidthFoo to RelayBandwidthFoo when
+   * appropriate. */
+  virtual QVariant torValue(const QString &key);
+
 private:
   /** Returns Tor-recognizable configuration keys and current values. */
   QHash<QString,QString> confValues();