[or-cvs] options->MaxAdvertisedBandwidth only replaces advertised

[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:
	router.c 
Log Message:
options->MaxAdvertisedBandwidth only replaces advertised
bandwidthrate, not advertised bandwidthcapacity


Index: router.c
===================================================================
RCS file: /home2/or/cvsroot/tor/src/or/router.c,v
retrieving revision 1.158
retrieving revision 1.159
diff -u -d -r1.158 -r1.159
--- router.c	22 Mar 2005 19:01:46 -0000	1.158
+++ router.c	22 Mar 2005 20:41:28 -0000	1.159
@@ -687,8 +687,6 @@
 
   if (options->BandwidthRate > options->MaxAdvertisedBandwidth)
     ri->bandwidthrate = (int)options->MaxAdvertisedBandwidth;
-  if (ri->bandwidthcapacity > options->MaxAdvertisedBandwidth)
-    ri->bandwidthcapacity = (int)options->MaxAdvertisedBandwidth;
 
   router_add_exit_policy_from_config(ri);
   if (desc_routerinfo) /* inherit values */