[vidalia-svn] r1365: If we fail to read some config value from Tor, fall back to (trunk/src/config)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2006-10-21 01:04:57 -0400 (Sat, 21 Oct 2006)
New Revision: 1365

Modified:
   trunk/src/config/serversettings.cpp
Log:
If we fail to read some config value from Tor, fall back to checking if we
have it saved to vidalia.conf or have a default for it. Also, use the correct
defaults for BandwidthRate and BandwidthBurst.


Modified: trunk/src/config/serversettings.cpp
===================================================================
--- trunk/src/config/serversettings.cpp	2006-10-21 04:16:04 UTC (rev 1364)
+++ trunk/src/config/serversettings.cpp	2006-10-21 05:04:57 UTC (rev 1365)
@@ -80,8 +80,8 @@
   setDefault(SETTING_SERVER_ORPORT,     9001);
   setDefault(SETTING_SERVER_DIRPORT,    9030);
   setDefault(SETTING_SERVER_CONTACT,    "<your@xxxxxxxxx>");
-  setDefault(SETTING_SERVER_BWRATE,     2097152);
-  setDefault(SETTING_SERVER_BWBURST,    5242880);
+  setDefault(SETTING_SERVER_BWRATE,     3145728);
+  setDefault(SETTING_SERVER_BWBURST,    6291456);
   setDefault(SETTING_SERVER_NICKNAME,   "Unnamed");
   setDefault(SETTING_SERVER_ADDRESS,    net_local_address().toString());
   setDefault(SETTING_SERVER_AUTOUPDATE_ADDRESS, false);
@@ -171,12 +171,13 @@
   QVariant value;
   QString confKey, confValue;
   confKey = key.mid(key.indexOf("/")+1);
-  if (_torControl->isConnected()) {
-    if (_torControl->getConf(confKey, confValue)) {
-      value.setValue(confValue);
-      value.convert(defaultValue(key).type());
-    }
+  if (_torControl->isConnected() &&
+      _torControl->getConf(confKey, confValue)) {
+    /* Get the value from Tor */
+    value.setValue(confValue);
+    value.convert(defaultValue(key).type());
   } else {
+    /* Read our saved value from vidalia.conf */
     value = VidaliaSettings::value(key);
   }
   return (isEmptyValue(value) ? defaultValue(key) : value);