summaryrefslogtreecommitdiff
path: root/src/or/router.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2005-03-22 19:01:46 +0000
committerNick Mathewson <nickm@torproject.org>2005-03-22 19:01:46 +0000
commitec81f870181940909507fd5356fa5ecc11c7440e (patch)
tree81e3f8c5afc9d6622e3813c328a4eb34a7edaa00 /src/or/router.c
parent2d662bf773fd9b73c2698f9ddb2e473df180a8e9 (diff)
downloadtor-ec81f870181940909507fd5356fa5ecc11c7440e.tar.gz
tor-ec81f870181940909507fd5356fa5ecc11c7440e.zip
Implement an option to cap bandwidth-to-advertise. Arma: can you improve the manpage entry by explaining why you would want to do this?
svn:r3813
Diffstat (limited to 'src/or/router.c')
-rw-r--r--src/or/router.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/or/router.c b/src/or/router.c
index 6ebce129b1..4f786a2aad 100644
--- a/src/or/router.c
+++ b/src/or/router.c
@@ -684,6 +684,12 @@ int router_rebuild_descriptor(int force) {
ri->bandwidthrate = (int)options->BandwidthRate;
ri->bandwidthburst = (int)options->BandwidthBurst;
ri->bandwidthcapacity = hibernating ? 0 : rep_hist_bandwidth_assess();
+
+ 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 */
ri->is_verified = desc_routerinfo->is_verified;