[vidalia-svn] r2118: Update the default bandwidth rate and burst rate to 5MB and (in trunk: . src/config src/gui/config)

[edmanm@xxxxxxxxxxxxxxxxxxx]

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

Modified:
   trunk/
   trunk/CHANGELOG
   trunk/src/config/serversettings.cpp
   trunk/src/gui/config/serverpage.cpp
Log:
 r2121@lysithea:  edmanm | 2007-11-20 01:29:01 -0500
 Update the default bandwidth rate and burst rate to 5MB and 10MB,
 respectively, to match Tor's defaults.



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

Modified: trunk/CHANGELOG
===================================================================
--- trunk/CHANGELOG	2007-11-20 06:45:38 UTC (rev 2117)
+++ trunk/CHANGELOG	2007-11-20 06:45:46 UTC (rev 2118)
@@ -7,6 +7,8 @@
     supports Window transparency.
   o Use the correct icon for the "Close Stream" context menu action in the
     circuit and stream list widget.
+  o Update the default bandwidth rate and burst rate to 5MB and 10MB,
+    respectively, to match Tor's defaults.
   o Modified the Mac OS X bundle installer to set Vidalia to start
     automatically on login for the user that installed the bundle.
   o Added an Arabic translation from Ahmad Gharbeia.

Modified: trunk/src/config/serversettings.cpp
===================================================================
--- trunk/src/config/serversettings.cpp	2007-11-20 06:45:38 UTC (rev 2117)
+++ trunk/src/config/serversettings.cpp	2007-11-20 06:45:46 UTC (rev 2118)
@@ -70,10 +70,10 @@
   setDefault(SETTING_DIRPORT,       9030);
   setDefault(SETTING_NICKNAME,      "Unnamed");
   setDefault(SETTING_CONTACT,       "<your@xxxxxxxxx>");
-  setDefault(SETTING_BANDWIDTH_RATE,        3145728);
-  setDefault(SETTING_RELAY_BANDWIDTH_RATE,  3145728);
-  setDefault(SETTING_BANDWIDTH_BURST,       6291456);
-  setDefault(SETTING_RELAY_BANDWIDTH_BURST, 6291456);
+  setDefault(SETTING_BANDWIDTH_RATE,        5242880);
+  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());

Modified: trunk/src/gui/config/serverpage.cpp
===================================================================
--- trunk/src/gui/config/serverpage.cpp	2007-11-20 06:45:38 UTC (rev 2117)
+++ trunk/src/gui/config/serverpage.cpp	2007-11-20 06:45:46 UTC (rev 2118)
@@ -51,8 +51,8 @@
 #define CABLE768_MAX_RATE       (192*1024)
 #define T1_AVG_RATE             (192*1024)
 #define T1_MAX_RATE             (384*1024)
-#define HIGHBW_AVG_RATE         (3072*1024)
-#define HIGHBW_MAX_RATE         (6144*1024)
+#define HIGHBW_AVG_RATE         (5120*1024)
+#define HIGHBW_MAX_RATE         (10240*1024)
 /** Minimum allowed bandwidth rate (20KB) */
 #define MIN_BANDWIDTH_RATE      20
 /** Maximum bandwidth rate. This is limited to 2147483646 bytes,