|
@@ -58,7 +58,8 @@ static time_t time_to_check_for_correct_dns = 0;
|
|
|
|
|
|
static connection_t *connection_array[MAXCONNECTIONS+1] =
|
|
static connection_t *connection_array[MAXCONNECTIONS+1] =
|
|
{ NULL };
|
|
{ NULL };
|
|
-
|
|
+
|
|
|
|
+ * and removed from connection_array. */
|
|
static smartlist_t *closeable_connection_lst = NULL;
|
|
static smartlist_t *closeable_connection_lst = NULL;
|
|
|
|
|
|
static int n_conns=0;
|
|
static int n_conns=0;
|
|
@@ -818,7 +819,7 @@ run_scheduled_events(time_t now)
|
|
if (any_trusted_dir_is_v1_authority())
|
|
if (any_trusted_dir_is_v1_authority())
|
|
directory_get_from_dirserver(DIR_PURPOSE_FETCH_DIR, NULL, 1);
|
|
directory_get_from_dirserver(DIR_PURPOSE_FETCH_DIR, NULL, 1);
|
|
}
|
|
}
|
|
-
|
|
+
|
|
#define V1_DIR_FETCH_PERIOD (6*60*60)
|
|
#define V1_DIR_FETCH_PERIOD (6*60*60)
|
|
time_to_fetch_directory = now + V1_DIR_FETCH_PERIOD;
|
|
time_to_fetch_directory = now + V1_DIR_FETCH_PERIOD;
|
|
}
|
|
}
|
|
@@ -828,7 +829,7 @@ run_scheduled_events(time_t now)
|
|
if (!authdir_mode(options) || !options->V1AuthoritativeDir) {
|
|
if (!authdir_mode(options) || !options->V1AuthoritativeDir) {
|
|
directory_get_from_dirserver(DIR_PURPOSE_FETCH_RUNNING_LIST, NULL, 1);
|
|
directory_get_from_dirserver(DIR_PURPOSE_FETCH_RUNNING_LIST, NULL, 1);
|
|
}
|
|
}
|
|
-
|
|
+
|
|
#define V1_RUNNINGROUTERS_FETCH_PERIOD (30*60)
|
|
#define V1_RUNNINGROUTERS_FETCH_PERIOD (30*60)
|
|
time_to_fetch_running_routers = now + V1_RUNNINGROUTERS_FETCH_PERIOD;
|
|
time_to_fetch_running_routers = now + V1_RUNNINGROUTERS_FETCH_PERIOD;
|
|
|
|
|
|
@@ -955,9 +956,9 @@ run_scheduled_events(time_t now)
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
-
|
|
+
|
|
static struct event *timeout_event = NULL;
|
|
static struct event *timeout_event = NULL;
|
|
-
|
|
+
|
|
static int n_libevent_errors = 0;
|
|
static int n_libevent_errors = 0;
|
|
|
|
|
|
|
|
|