Lower dir fetch retry schedules in testing networks.

Also lower maximum interval without directory requests, and raise
maximum download tries.

Implements #6752.

1 files changed, 56 insertions, 0 deletions

diff --git a/src/or/confparse.c b/src/or/confparse.c
index 8863d9240..8607f582c 100644
--- a/src/or/confparse.c
+++ b/src/or/confparse.c
@@ -223,6 +223,8 @@ config_assign_value(const config_format_t *fmt, void *options,
   int i, ok;
   const config_var_t *var;
   void *lvalue;
+  int *csv_int;
+  smartlist_t *csv_str;
 
   CONFIG_CHECK(fmt, options);
 
@@ -357,6 +359,36 @@ config_assign_value(const config_format_t *fmt, void *options,
                            SPLIT_SKIP_SPACE|SPLIT_IGNORE_BLANK, 0);
     break;
 
+  case CONFIG_TYPE_CSV_INTERVAL:
+    if (*(smartlist_t**)lvalue) {
+      SMARTLIST_FOREACH(*(smartlist_t**)lvalue, int *, cp, tor_free(cp));
+      smartlist_clear(*(smartlist_t**)lvalue);
+    } else {
+      *(smartlist_t**)lvalue = smartlist_new();
+    }
+    csv_str = smartlist_new();
+    smartlist_split_string(csv_str, c->value, ",",
+                           SPLIT_SKIP_SPACE|SPLIT_IGNORE_BLANK, 0);
+    SMARTLIST_FOREACH_BEGIN(csv_str, char *, str)
+      {
+        i = config_parse_interval(str, &ok);
+        if (!ok) {
+          tor_asprintf(msg,
+              "Interval in '%s %s' is malformed or out of bounds.",
+              c->key, c->value);
+          SMARTLIST_FOREACH(csv_str, char *, cp, tor_free(cp));
+          smartlist_clear(csv_str);
+          return -1;
+        }
+        csv_int = tor_malloc_zero(sizeof(int));
+        *csv_int = i;
+        smartlist_add(*(smartlist_t**)lvalue, csv_int);
+      }
+    SMARTLIST_FOREACH_END(str);
+    SMARTLIST_FOREACH(csv_str, char *, cp, tor_free(cp));
+    smartlist_clear(csv_str);
+    break;
+
   case CONFIG_TYPE_LINELIST:
   case CONFIG_TYPE_LINELIST_S:
     {
@@ -555,6 +587,8 @@ config_get_assigned_option(const config_format_t *fmt, const void *options,
   const config_var_t *var;
   const void *value;
   config_line_t *result;
+  smartlist_t *csv_str;
+  char *s;
   tor_assert(options && key);
 
   CONFIG_CHECK(fmt, options);
@@ -637,6 +671,21 @@ config_get_assigned_option(const config_format_t *fmt, const void *options,
       else
         result->value = tor_strdup("");
       break;
+    case CONFIG_TYPE_CSV_INTERVAL:
+      if (*(smartlist_t**)value) {
+        csv_str = smartlist_new();
+        SMARTLIST_FOREACH_BEGIN(*(smartlist_t**)value, int *, i)
+          {
+            tor_asprintf(&s, "%d", *i);
+            smartlist_add(csv_str, s);
+          }
+        SMARTLIST_FOREACH_END(i);
+        result->value = smartlist_join_strings(csv_str, ",", 0, NULL);
+        SMARTLIST_FOREACH(csv_str, char *, cp, tor_free(cp));
+        smartlist_free(csv_str);
+      } else
+        result->value = tor_strdup("");
+      break;
     case CONFIG_TYPE_OBSOLETE:
       log_fn(LOG_INFO, LD_CONFIG,
              "You asked me for the value of an obsolete config option '%s'.",
@@ -826,6 +875,13 @@ config_clear(const config_format_t *fmt, void *options,
         *(smartlist_t **)lvalue = NULL;
       }
       break;
+    case CONFIG_TYPE_CSV_INTERVAL:
+      if (*(smartlist_t**)lvalue) {
+        SMARTLIST_FOREACH(*(smartlist_t **)lvalue, int *, cp, tor_free(cp));
+        smartlist_free(*(smartlist_t **)lvalue);
+        *(smartlist_t **)lvalue = NULL;
+      }
+      break;
     case CONFIG_TYPE_LINELIST:
     case CONFIG_TYPE_LINELIST_S:
       config_free_lines(*(config_line_t **)lvalue);