Split ROUTER_REQUIRED_MIN_BANDWIDTH into RELAY_ and BRIDGE_ variants

Also raise those minima from 20 to 75 and 50 respectively.

Closes ticket 13822.

1 files changed, 11 insertions, 6 deletions

diff --git a/src/or/config.c b/src/or/config.c
index de0baa40d9..144499e00c 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -3180,19 +3180,24 @@ options_validate(or_options_t *old_options, or_options_t *options,
     options->RelayBandwidthRate = options->RelayBandwidthBurst;
 
   if (server_mode(options)) {
+    const unsigned ROUTER_REQUIRED_MIN_BANDWIDTH = // tolower XXXX
+      public_server_mode(options) ?
+       RELAY_REQUIRED_MIN_BANDWIDTH : BRIDGE_REQUIRED_MIN_BANDWIDTH;
+    const char * const optbridge =
+      public_server_mode(options) ? "" : "bridge ";
     if (options->BandwidthRate < ROUTER_REQUIRED_MIN_BANDWIDTH) {
       tor_asprintf(msg,
                        "BandwidthRate is set to %d bytes/second. "
-                       "For servers, it must be at least %d.",
-                       (int)options->BandwidthRate,
+                       "For %sservers, it must be at least %u.",
+                       (int)options->BandwidthRate, optbridge,
                        ROUTER_REQUIRED_MIN_BANDWIDTH);
       return -1;
     } else if (options->MaxAdvertisedBandwidth <
                ROUTER_REQUIRED_MIN_BANDWIDTH/2) {
       tor_asprintf(msg,
                        "MaxAdvertisedBandwidth is set to %d bytes/second. "
-                       "For servers, it must be at least %d.",
-                       (int)options->MaxAdvertisedBandwidth,
+                       "For %sservers, it must be at least %u.",
+                       (int)options->MaxAdvertisedBandwidth, optbridge,
                        ROUTER_REQUIRED_MIN_BANDWIDTH/2);
       return -1;
     }
@@ -3200,8 +3205,8 @@ options_validate(or_options_t *old_options, or_options_t *options,
       options->RelayBandwidthRate < ROUTER_REQUIRED_MIN_BANDWIDTH) {
       tor_asprintf(msg,
                        "RelayBandwidthRate is set to %d bytes/second. "
-                       "For servers, it must be at least %d.",
-                       (int)options->RelayBandwidthRate,
+                       "For %sservers, it must be at least %u.",
+                       (int)options->RelayBandwidthRate, optbridge,
                        ROUTER_REQUIRED_MIN_BANDWIDTH);
       return -1;
     }