[or-cvs] allow bandwidthburst to be smaller, but whine if it"s small.

[Roger Dingledine]

Update of /home2/or/cvsroot/tor/src/or
In directory moria.mit.edu:/home2/arma/work/onion/cvs/tor/src/or

Modified Files:
	config.c 
Log Message:
allow bandwidthburst to be smaller, but whine if it's small.


Index: config.c
===================================================================
RCS file: /home2/or/cvsroot/tor/src/or/config.c,v
retrieving revision 1.302
retrieving revision 1.303
diff -u -d -r1.302 -r1.303
--- config.c	17 Jan 2005 18:13:09 -0000	1.302
+++ config.c	18 Jan 2005 19:34:22 -0000	1.303
@@ -1394,10 +1394,6 @@
     result = -1;
   }
 
-  if (2*options->BandwidthRate >= options->BandwidthBurst) {
-    log(LOG_WARN,"BandwidthBurst must be more than twice BandwidthRate.");
-    result = -1;
-  }
   if (options->BandwidthRate > INT_MAX) {
     log(LOG_WARN,"BandwidthRate must be less than %d",INT_MAX);
     result = -1;
@@ -1411,6 +1407,15 @@
     log(LOG_WARN,"BandwidthRate is set to %d bytes/second. For servers, it must be at least %d.", (int)options->BandwidthRate, ROUTER_REQUIRED_MIN_BANDWIDTH*2);
     result = -1;
   }
+  if (options->BandwidthRate > options->BandwidthBurst) {
+    log(LOG_WARN,"BandwidthBurst must be at least equal to BandwidthRate.");
+    result = -1;
+  }
+  if (2*options->BandwidthRate > options->BandwidthBurst) {
+    log(LOG_NOTICE,"You have chosen a BandwidthBurst less than twice BandwidthRate. Please consider setting your BandwidthBurst higher (at least %d), to provide better service to the Tor network.", (int)(2*options->BandwidthRate));
+    result = -1;
+  }
+
 
   if (options->_MonthlyAccountingStart) {
     if (options->AccountingStart) {