2007-12-12 22:09:01 +01:00
|
|
|
/* Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
|
2008-02-07 06:31:47 +01:00
|
|
|
* Copyright (c) 2007-2008, The Tor Project, Inc. */
|
2004-03-20 02:48:05 +01:00
|
|
|
/* See LICENSE for licensing information */
|
|
|
|
/* $Id$ */
|
2005-12-14 21:40:40 +01:00
|
|
|
const char rephist_c_id[] =
|
|
|
|
"$Id$";
|
2004-03-20 02:48:05 +01:00
|
|
|
|
2004-05-10 06:34:48 +02:00
|
|
|
/**
|
|
|
|
* \file rephist.c
|
2005-06-11 20:52:12 +02:00
|
|
|
* \brief Basic history and "reputation" functionality to remember
|
|
|
|
* which servers have worked in the past, how much bandwidth we've
|
|
|
|
* been using, which ports we tend to want, and so on.
|
2004-05-10 06:34:48 +02:00
|
|
|
**/
|
2004-05-05 23:32:43 +02:00
|
|
|
|
2004-03-20 02:48:05 +01:00
|
|
|
#include "or.h"
|
2007-12-17 23:44:11 +01:00
|
|
|
#include "ht.h"
|
2004-03-20 02:48:05 +01:00
|
|
|
|
2004-07-20 22:57:46 +02:00
|
|
|
static void bw_arrays_init(void);
|
2004-12-05 08:10:08 +01:00
|
|
|
static void predicted_ports_init(void);
|
2007-04-30 19:46:13 +02:00
|
|
|
static void hs_usage_init(void);
|
2004-07-20 22:57:46 +02:00
|
|
|
|
2008-02-09 04:11:10 +01:00
|
|
|
/** Total number of bytes currently allocated in fields used by rephist.c. */
|
2005-07-18 08:09:04 +02:00
|
|
|
uint64_t rephist_total_alloc=0;
|
2008-02-09 04:11:10 +01:00
|
|
|
/** Number of or_history_t objects currently allocated. */
|
2005-07-18 08:09:04 +02:00
|
|
|
uint32_t rephist_total_num=0;
|
2005-06-06 19:03:21 +02:00
|
|
|
|
2007-08-21 07:37:24 +02:00
|
|
|
/** If the total weighted run count of all runs for a router ever falls
|
|
|
|
* below this amount, the router can be treated as having 0 MTBF. */
|
2007-08-16 21:32:29 +02:00
|
|
|
#define STABILITY_EPSILON 0.0001
|
2007-08-21 07:37:24 +02:00
|
|
|
/** Value by which to discount all old intervals for MTBF purposses. This
|
|
|
|
* is compounded every STABILITY_INTERVAL. */
|
|
|
|
#define STABILITY_ALPHA 0.95
|
|
|
|
/** Interval at which to discount all old intervals for MTBF purposes. */
|
2007-08-16 21:32:29 +02:00
|
|
|
#define STABILITY_INTERVAL (12*60*60)
|
2007-08-21 07:37:24 +02:00
|
|
|
/* (This combination of ALPHA, INTERVAL, and EPSILON makes it so that an
|
|
|
|
* interval that just ended counts twice as much as one that ended a week ago,
|
|
|
|
* 20X as much as one that ended a month ago, and routers that have had no
|
|
|
|
* uptime data for about half a year will get forgotten.) */
|
2007-08-16 21:32:29 +02:00
|
|
|
|
2004-05-10 06:34:48 +02:00
|
|
|
/** History of an OR-\>OR link. */
|
2004-03-20 02:48:05 +01:00
|
|
|
typedef struct link_history_t {
|
2004-05-10 06:34:48 +02:00
|
|
|
/** When did we start tracking this list? */
|
2004-03-20 02:48:05 +01:00
|
|
|
time_t since;
|
2004-11-21 06:14:46 +01:00
|
|
|
/** When did we most recently note a change to this link */
|
|
|
|
time_t changed;
|
2004-12-01 04:48:14 +01:00
|
|
|
/** How many times did extending from OR1 to OR2 succeed? */
|
2004-03-20 02:48:05 +01:00
|
|
|
unsigned long n_extend_ok;
|
2004-05-10 06:34:48 +02:00
|
|
|
/** How many times did extending from OR1 to OR2 fail? */
|
2004-03-20 02:48:05 +01:00
|
|
|
unsigned long n_extend_fail;
|
|
|
|
} link_history_t;
|
|
|
|
|
2004-05-10 06:34:48 +02:00
|
|
|
/** History of an OR. */
|
2004-03-20 02:48:05 +01:00
|
|
|
typedef struct or_history_t {
|
2004-05-10 06:34:48 +02:00
|
|
|
/** When did we start tracking this OR? */
|
2004-03-20 02:48:05 +01:00
|
|
|
time_t since;
|
2004-11-21 06:14:46 +01:00
|
|
|
/** When did we most recently note a change to this OR? */
|
|
|
|
time_t changed;
|
2004-05-10 06:34:48 +02:00
|
|
|
/** How many times did we successfully connect? */
|
2004-03-20 02:48:05 +01:00
|
|
|
unsigned long n_conn_ok;
|
2004-05-10 06:34:48 +02:00
|
|
|
/** How many times did we try to connect and fail?*/
|
2004-03-20 02:48:05 +01:00
|
|
|
unsigned long n_conn_fail;
|
2004-05-10 06:34:48 +02:00
|
|
|
/** How many seconds have we been connected to this OR before
|
2004-05-05 23:32:43 +02:00
|
|
|
* 'up_since'? */
|
2004-03-20 02:48:05 +01:00
|
|
|
unsigned long uptime;
|
2004-05-10 06:34:48 +02:00
|
|
|
/** How many seconds have we been unable to connect to this OR before
|
2004-05-05 23:32:43 +02:00
|
|
|
* 'down_since'? */
|
2004-03-20 02:48:05 +01:00
|
|
|
unsigned long downtime;
|
2004-05-10 06:34:48 +02:00
|
|
|
/** If nonzero, we have been connected since this time. */
|
2004-03-20 02:48:05 +01:00
|
|
|
time_t up_since;
|
2004-05-10 06:34:48 +02:00
|
|
|
/** If nonzero, we have been unable to connect since this time. */
|
2004-03-20 02:48:05 +01:00
|
|
|
time_t down_since;
|
2007-08-21 07:37:24 +02:00
|
|
|
|
|
|
|
/* === For MTBF tracking: */
|
|
|
|
/** Weighted sum total of all times that this router has been online.
|
|
|
|
*/
|
2007-08-16 21:32:29 +02:00
|
|
|
unsigned long weighted_run_length;
|
2007-08-21 07:37:24 +02:00
|
|
|
/** If the router is now online (according to stability-checking rules),
|
|
|
|
* when did it come online? */
|
2007-08-16 21:32:29 +02:00
|
|
|
time_t start_of_run;
|
2007-08-21 07:37:24 +02:00
|
|
|
/** Sum of weights for runs in weighted_run_length. */
|
2007-08-16 21:32:29 +02:00
|
|
|
double total_run_weights;
|
2007-09-17 20:27:43 +02:00
|
|
|
/* === For fractional uptime tracking: */
|
|
|
|
time_t start_of_downtime;
|
|
|
|
unsigned long weighted_uptime;
|
|
|
|
unsigned long total_weighted_time;
|
2007-08-21 07:37:24 +02:00
|
|
|
|
2004-07-17 00:23:18 +02:00
|
|
|
/** Map from hex OR2 identity digest to a link_history_t for the link
|
2004-05-05 23:32:43 +02:00
|
|
|
* from this OR to OR2. */
|
2005-10-18 22:12:22 +02:00
|
|
|
digestmap_t *link_history_map;
|
2004-03-20 02:48:05 +01:00
|
|
|
} or_history_t;
|
|
|
|
|
2007-08-21 07:37:24 +02:00
|
|
|
/** When did we last multiply all routers' weighted_run_length and
|
|
|
|
* total_run_weights by STABILITY_ALPHA? */
|
2007-08-16 21:32:29 +02:00
|
|
|
static time_t stability_last_downrated = 0;
|
|
|
|
|
2007-08-21 07:37:24 +02:00
|
|
|
/** */
|
|
|
|
static time_t started_tracking_stability = 0;
|
|
|
|
|
2004-07-17 00:23:18 +02:00
|
|
|
/** Map from hex OR identity digest to or_history_t. */
|
2005-10-18 22:12:22 +02:00
|
|
|
static digestmap_t *history_map = NULL;
|
2004-03-20 02:48:05 +01:00
|
|
|
|
2007-08-17 22:31:59 +02:00
|
|
|
/** Return the or_history_t for the OR with identity digest <b>id</b>,
|
|
|
|
* creating it if necessary. */
|
2005-06-11 20:52:12 +02:00
|
|
|
static or_history_t *
|
|
|
|
get_or_history(const char* id)
|
2004-03-20 02:48:05 +01:00
|
|
|
{
|
|
|
|
or_history_t *hist;
|
2004-07-13 20:23:40 +02:00
|
|
|
|
2006-07-23 07:52:27 +02:00
|
|
|
if (tor_mem_is_zero(id, DIGEST_LEN))
|
2004-08-17 09:12:05 +02:00
|
|
|
return NULL;
|
|
|
|
|
2005-10-18 22:12:22 +02:00
|
|
|
hist = digestmap_get(history_map, id);
|
2004-03-20 02:48:05 +01:00
|
|
|
if (!hist) {
|
|
|
|
hist = tor_malloc_zero(sizeof(or_history_t));
|
2005-06-06 19:03:21 +02:00
|
|
|
rephist_total_alloc += sizeof(or_history_t);
|
2005-07-18 08:09:04 +02:00
|
|
|
rephist_total_num++;
|
2005-10-18 22:12:22 +02:00
|
|
|
hist->link_history_map = digestmap_new();
|
2004-11-21 06:14:46 +01:00
|
|
|
hist->since = hist->changed = time(NULL);
|
2005-10-18 22:12:22 +02:00
|
|
|
digestmap_set(history_map, id, hist);
|
2004-03-20 02:48:05 +01:00
|
|
|
}
|
|
|
|
return hist;
|
|
|
|
}
|
|
|
|
|
2004-05-10 06:34:48 +02:00
|
|
|
/** Return the link_history_t for the link from the first named OR to
|
2004-07-17 00:23:18 +02:00
|
|
|
* the second, creating it if necessary. (ORs are identified by
|
2006-07-23 07:18:29 +02:00
|
|
|
* identity digest.)
|
2004-03-20 05:59:29 +01:00
|
|
|
*/
|
2005-06-11 20:52:12 +02:00
|
|
|
static link_history_t *
|
|
|
|
get_link_history(const char *from_id, const char *to_id)
|
2004-03-20 02:48:05 +01:00
|
|
|
{
|
|
|
|
or_history_t *orhist;
|
|
|
|
link_history_t *lhist;
|
2004-07-13 20:23:40 +02:00
|
|
|
orhist = get_or_history(from_id);
|
2004-08-17 09:12:05 +02:00
|
|
|
if (!orhist)
|
|
|
|
return NULL;
|
2006-07-23 07:52:27 +02:00
|
|
|
if (tor_mem_is_zero(to_id, DIGEST_LEN))
|
2004-08-17 09:12:05 +02:00
|
|
|
return NULL;
|
2005-10-18 22:12:22 +02:00
|
|
|
lhist = (link_history_t*) digestmap_get(orhist->link_history_map, to_id);
|
2004-03-20 02:48:05 +01:00
|
|
|
if (!lhist) {
|
|
|
|
lhist = tor_malloc_zero(sizeof(link_history_t));
|
2005-06-06 19:03:21 +02:00
|
|
|
rephist_total_alloc += sizeof(link_history_t);
|
2004-11-21 06:14:46 +01:00
|
|
|
lhist->since = lhist->changed = time(NULL);
|
2005-10-18 22:12:22 +02:00
|
|
|
digestmap_set(orhist->link_history_map, to_id, lhist);
|
2004-03-20 02:48:05 +01:00
|
|
|
}
|
|
|
|
return lhist;
|
|
|
|
}
|
|
|
|
|
2006-07-23 07:18:29 +02:00
|
|
|
/** Helper: free storage held by a single link history entry. */
|
2004-11-21 06:14:46 +01:00
|
|
|
static void
|
|
|
|
_free_link_history(void *val)
|
|
|
|
{
|
2005-06-06 19:03:21 +02:00
|
|
|
rephist_total_alloc -= sizeof(link_history_t);
|
2004-11-21 06:14:46 +01:00
|
|
|
tor_free(val);
|
|
|
|
}
|
|
|
|
|
2006-07-23 07:18:29 +02:00
|
|
|
/** Helper: free storage held by a single OR history entry. */
|
2004-11-21 06:14:46 +01:00
|
|
|
static void
|
2005-02-11 02:26:47 +01:00
|
|
|
free_or_history(void *_hist)
|
2004-11-21 06:14:46 +01:00
|
|
|
{
|
2005-02-11 02:26:47 +01:00
|
|
|
or_history_t *hist = _hist;
|
2005-10-18 22:12:22 +02:00
|
|
|
digestmap_free(hist->link_history_map, _free_link_history);
|
2005-06-06 19:03:21 +02:00
|
|
|
rephist_total_alloc -= sizeof(or_history_t);
|
2005-07-18 08:09:04 +02:00
|
|
|
rephist_total_num--;
|
2004-11-21 06:14:46 +01:00
|
|
|
tor_free(hist);
|
|
|
|
}
|
|
|
|
|
2004-05-10 06:34:48 +02:00
|
|
|
/** Update an or_history_t object <b>hist</b> so that its uptime/downtime
|
|
|
|
* count is up-to-date as of <b>when</b>.
|
2004-03-20 05:59:29 +01:00
|
|
|
*/
|
2005-06-11 20:52:12 +02:00
|
|
|
static void
|
|
|
|
update_or_history(or_history_t *hist, time_t when)
|
2004-03-20 02:48:05 +01:00
|
|
|
{
|
2004-04-25 22:37:37 +02:00
|
|
|
tor_assert(hist);
|
2004-03-20 02:48:05 +01:00
|
|
|
if (hist->up_since) {
|
2004-04-25 22:37:37 +02:00
|
|
|
tor_assert(!hist->down_since);
|
2004-03-20 02:48:05 +01:00
|
|
|
hist->uptime += (when - hist->up_since);
|
|
|
|
hist->up_since = when;
|
|
|
|
} else if (hist->down_since) {
|
|
|
|
hist->downtime += (when - hist->down_since);
|
|
|
|
hist->down_since = when;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2006-07-23 07:18:29 +02:00
|
|
|
/** Initialize the static data structures for tracking history. */
|
2005-06-11 20:52:12 +02:00
|
|
|
void
|
|
|
|
rep_hist_init(void)
|
2004-03-20 02:48:05 +01:00
|
|
|
{
|
2005-10-18 22:12:22 +02:00
|
|
|
history_map = digestmap_new();
|
2004-07-20 22:57:46 +02:00
|
|
|
bw_arrays_init();
|
2004-12-05 08:10:08 +01:00
|
|
|
predicted_ports_init();
|
2007-04-30 19:46:13 +02:00
|
|
|
hs_usage_init();
|
2004-03-20 02:48:05 +01:00
|
|
|
}
|
|
|
|
|
2007-08-21 07:37:24 +02:00
|
|
|
/** Helper: note that we are no longer connected to the router with history
|
|
|
|
* <b>hist</b>. If <b>failed</b>, the connection failed; otherwise, it was
|
|
|
|
* closed correctly. */
|
2007-08-16 21:32:29 +02:00
|
|
|
static void
|
|
|
|
mark_or_down(or_history_t *hist, time_t when, int failed)
|
|
|
|
{
|
|
|
|
if (hist->up_since) {
|
|
|
|
hist->uptime += (when - hist->up_since);
|
|
|
|
hist->up_since = 0;
|
|
|
|
}
|
|
|
|
if (failed && !hist->down_since) {
|
|
|
|
hist->down_since = when;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2007-08-21 07:37:24 +02:00
|
|
|
/** Helper: note that we are connected to the router with history
|
|
|
|
* <b>hist</b>. */
|
2007-08-16 21:32:29 +02:00
|
|
|
static void
|
|
|
|
mark_or_up(or_history_t *hist, time_t when)
|
|
|
|
{
|
|
|
|
if (hist->down_since) {
|
|
|
|
hist->downtime += (when - hist->down_since);
|
|
|
|
hist->down_since = 0;
|
|
|
|
}
|
|
|
|
if (!hist->up_since) {
|
|
|
|
hist->up_since = when;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2004-07-17 00:23:18 +02:00
|
|
|
/** Remember that an attempt to connect to the OR with identity digest
|
|
|
|
* <b>id</b> failed at <b>when</b>.
|
2004-03-20 05:59:29 +01:00
|
|
|
*/
|
2005-06-11 20:52:12 +02:00
|
|
|
void
|
|
|
|
rep_hist_note_connect_failed(const char* id, time_t when)
|
2004-03-20 02:48:05 +01:00
|
|
|
{
|
|
|
|
or_history_t *hist;
|
2004-07-13 20:23:40 +02:00
|
|
|
hist = get_or_history(id);
|
2004-08-17 09:12:05 +02:00
|
|
|
if (!hist)
|
|
|
|
return;
|
2004-03-20 02:48:05 +01:00
|
|
|
++hist->n_conn_fail;
|
2007-08-16 21:32:29 +02:00
|
|
|
mark_or_down(hist, when, 1);
|
2004-11-21 06:14:46 +01:00
|
|
|
hist->changed = when;
|
2004-03-20 02:48:05 +01:00
|
|
|
}
|
|
|
|
|
2004-07-17 00:23:18 +02:00
|
|
|
/** Remember that an attempt to connect to the OR with identity digest
|
|
|
|
* <b>id</b> succeeded at <b>when</b>.
|
2004-03-20 05:59:29 +01:00
|
|
|
*/
|
2005-06-11 20:52:12 +02:00
|
|
|
void
|
|
|
|
rep_hist_note_connect_succeeded(const char* id, time_t when)
|
2004-03-20 02:48:05 +01:00
|
|
|
{
|
|
|
|
or_history_t *hist;
|
2004-07-13 20:23:40 +02:00
|
|
|
hist = get_or_history(id);
|
2004-08-17 09:12:05 +02:00
|
|
|
if (!hist)
|
|
|
|
return;
|
2004-03-20 02:48:05 +01:00
|
|
|
++hist->n_conn_ok;
|
2007-08-16 21:32:29 +02:00
|
|
|
mark_or_up(hist, when);
|
2004-11-21 06:14:46 +01:00
|
|
|
hist->changed = when;
|
2004-03-20 02:48:05 +01:00
|
|
|
}
|
2004-03-20 05:59:29 +01:00
|
|
|
|
2004-05-10 06:34:48 +02:00
|
|
|
/** Remember that we intentionally closed our connection to the OR
|
2004-07-17 00:23:18 +02:00
|
|
|
* with identity digest <b>id</b> at <b>when</b>.
|
2004-03-20 05:59:29 +01:00
|
|
|
*/
|
2005-06-11 20:52:12 +02:00
|
|
|
void
|
|
|
|
rep_hist_note_disconnect(const char* id, time_t when)
|
2004-03-20 05:59:29 +01:00
|
|
|
{
|
|
|
|
or_history_t *hist;
|
2004-07-13 20:23:40 +02:00
|
|
|
hist = get_or_history(id);
|
2004-08-17 09:12:05 +02:00
|
|
|
if (!hist)
|
|
|
|
return;
|
2007-08-16 21:32:29 +02:00
|
|
|
mark_or_down(hist, when, 0);
|
2004-11-21 06:14:46 +01:00
|
|
|
hist->changed = when;
|
2004-03-20 05:59:29 +01:00
|
|
|
}
|
|
|
|
|
2004-07-17 00:23:18 +02:00
|
|
|
/** Remember that our connection to the OR with identity digest
|
|
|
|
* <b>id</b> had an error and stopped working at <b>when</b>.
|
2004-03-20 05:59:29 +01:00
|
|
|
*/
|
2005-06-11 20:52:12 +02:00
|
|
|
void
|
|
|
|
rep_hist_note_connection_died(const char* id, time_t when)
|
2004-03-20 02:48:05 +01:00
|
|
|
{
|
|
|
|
or_history_t *hist;
|
2004-11-28 10:05:49 +01:00
|
|
|
if (!id) {
|
2007-08-16 21:32:29 +02:00
|
|
|
/* If conn has no identity, it didn't complete its handshake, or something
|
2006-04-18 05:07:24 +02:00
|
|
|
* went wrong. Ignore it.
|
2004-03-20 21:37:49 +01:00
|
|
|
*/
|
|
|
|
return;
|
|
|
|
}
|
2004-07-13 20:23:40 +02:00
|
|
|
hist = get_or_history(id);
|
2004-08-17 09:12:05 +02:00
|
|
|
if (!hist)
|
|
|
|
return;
|
2007-08-16 21:32:29 +02:00
|
|
|
mark_or_down(hist, when, 1);
|
2004-11-21 06:14:46 +01:00
|
|
|
hist->changed = when;
|
2004-03-20 02:48:05 +01:00
|
|
|
}
|
|
|
|
|
2007-08-17 03:29:58 +02:00
|
|
|
/** We have just decided that this router is reachable, meaning
|
|
|
|
* we will give it a "Running" flag for the next while. */
|
|
|
|
void
|
|
|
|
rep_hist_note_router_reachable(const char *id, time_t when)
|
|
|
|
{
|
2007-08-17 22:31:54 +02:00
|
|
|
or_history_t *hist = get_or_history(id);
|
2007-08-21 07:37:24 +02:00
|
|
|
if (!started_tracking_stability)
|
|
|
|
started_tracking_stability = time(NULL);
|
2007-08-17 22:31:54 +02:00
|
|
|
if (hist && !hist->start_of_run) {
|
|
|
|
hist->start_of_run = when;
|
|
|
|
}
|
2007-09-17 20:27:43 +02:00
|
|
|
if (hist && hist->start_of_downtime) {
|
|
|
|
long down_length = when - hist->start_of_downtime;
|
|
|
|
hist->total_weighted_time += down_length;
|
|
|
|
hist->start_of_downtime = 0;
|
|
|
|
}
|
2007-08-17 03:29:58 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/** We have just decided that this router is unreachable, meaning
|
|
|
|
* we are taking away its "Running" flag. */
|
|
|
|
void
|
|
|
|
rep_hist_note_router_unreachable(const char *id, time_t when)
|
|
|
|
{
|
2007-08-17 22:31:54 +02:00
|
|
|
or_history_t *hist = get_or_history(id);
|
2007-08-21 07:37:24 +02:00
|
|
|
if (!started_tracking_stability)
|
|
|
|
started_tracking_stability = time(NULL);
|
2007-08-17 22:31:54 +02:00
|
|
|
if (hist && hist->start_of_run) {
|
2008-02-16 00:39:04 +01:00
|
|
|
/*XXXX We could treat failed connections differently from failed
|
2008-04-16 02:12:44 +02:00
|
|
|
* connect attempts. */
|
2007-08-17 22:31:54 +02:00
|
|
|
long run_length = when - hist->start_of_run;
|
|
|
|
hist->weighted_run_length += run_length;
|
|
|
|
hist->total_run_weights += 1.0;
|
|
|
|
hist->start_of_run = 0;
|
2007-09-17 20:27:43 +02:00
|
|
|
|
|
|
|
hist->weighted_uptime += run_length;
|
|
|
|
hist->total_weighted_time += run_length;
|
|
|
|
}
|
|
|
|
if (hist && !hist->start_of_downtime) {
|
|
|
|
hist->start_of_downtime = when;
|
2007-08-17 22:31:54 +02:00
|
|
|
}
|
2007-08-17 03:29:58 +02:00
|
|
|
}
|
|
|
|
|
2007-08-21 07:37:24 +02:00
|
|
|
/** Helper: Discount all old MTBF data, if it is time to do so. Return
|
|
|
|
* the time at which we should next discount MTBF data. */
|
2007-08-16 21:32:29 +02:00
|
|
|
time_t
|
|
|
|
rep_hist_downrate_old_runs(time_t now)
|
|
|
|
{
|
|
|
|
digestmap_iter_t *orhist_it;
|
|
|
|
const char *digest1;
|
|
|
|
or_history_t *hist;
|
|
|
|
void *hist_p;
|
|
|
|
double alpha = 1.0;
|
|
|
|
|
|
|
|
if (!history_map)
|
|
|
|
history_map = digestmap_new();
|
|
|
|
if (!stability_last_downrated)
|
|
|
|
stability_last_downrated = now;
|
|
|
|
if (stability_last_downrated + STABILITY_INTERVAL > now)
|
|
|
|
return stability_last_downrated + STABILITY_INTERVAL;
|
|
|
|
|
2007-08-21 07:37:24 +02:00
|
|
|
/* Okay, we should downrate the data. By how much? */
|
2007-08-16 21:32:29 +02:00
|
|
|
while (stability_last_downrated + STABILITY_INTERVAL < now) {
|
|
|
|
stability_last_downrated += STABILITY_INTERVAL;
|
|
|
|
alpha *= STABILITY_ALPHA;
|
|
|
|
}
|
|
|
|
|
2007-08-21 07:37:24 +02:00
|
|
|
/* Multiply every w_r_l, t_r_w pair by alpha. */
|
2007-08-16 21:32:29 +02:00
|
|
|
for (orhist_it = digestmap_iter_init(history_map);
|
|
|
|
!digestmap_iter_done(orhist_it);
|
|
|
|
orhist_it = digestmap_iter_next(history_map,orhist_it)) {
|
|
|
|
digestmap_iter_get(orhist_it, &digest1, &hist_p);
|
|
|
|
hist = hist_p;
|
|
|
|
|
|
|
|
hist->weighted_run_length =
|
|
|
|
(unsigned long)(hist->weighted_run_length * alpha);
|
|
|
|
hist->total_run_weights *= alpha;
|
2007-09-17 20:27:43 +02:00
|
|
|
|
2008-02-21 22:15:31 +01:00
|
|
|
hist->weighted_uptime = (unsigned long)(hist->weighted_uptime * alpha);
|
|
|
|
hist->total_weighted_time = (unsigned long)
|
|
|
|
(hist->total_weighted_time * alpha);
|
2007-08-16 21:32:29 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
return stability_last_downrated + STABILITY_INTERVAL;
|
|
|
|
}
|
|
|
|
|
2007-08-21 07:37:24 +02:00
|
|
|
/** Helper: Return the weighted MTBF of the router with history <b>hist</b>. */
|
2007-08-17 22:31:54 +02:00
|
|
|
static double
|
|
|
|
get_stability(or_history_t *hist, time_t when)
|
2007-08-16 21:32:29 +02:00
|
|
|
{
|
2007-08-17 22:31:54 +02:00
|
|
|
unsigned long total = hist->weighted_run_length;
|
|
|
|
double total_weights = hist->total_run_weights;
|
2007-08-16 21:32:29 +02:00
|
|
|
|
|
|
|
if (hist->start_of_run) {
|
2007-08-21 07:37:24 +02:00
|
|
|
/* We're currently in a run. Let total and total_weights hold the values
|
|
|
|
* they would hold if the current run were to end now. */
|
2007-08-16 21:32:29 +02:00
|
|
|
total += (when-hist->start_of_run);
|
|
|
|
total_weights += 1.0;
|
|
|
|
}
|
2007-08-21 07:37:24 +02:00
|
|
|
if (total_weights < STABILITY_EPSILON) {
|
|
|
|
/* Round down to zero, and avoid divide-by-zero. */
|
2007-08-16 21:32:29 +02:00
|
|
|
return 0.0;
|
2007-08-21 07:37:24 +02:00
|
|
|
}
|
2007-08-16 21:32:29 +02:00
|
|
|
|
|
|
|
return total / total_weights;
|
|
|
|
}
|
|
|
|
|
2008-02-16 00:39:04 +01:00
|
|
|
/** Return the total amount of time we've been observing, with each run of
|
|
|
|
* time downrated by the appropriate factor. */
|
2007-11-08 17:58:59 +01:00
|
|
|
static long
|
|
|
|
get_total_weighted_time(or_history_t *hist, time_t when)
|
|
|
|
{
|
|
|
|
long total = hist->total_weighted_time;
|
|
|
|
if (hist->start_of_run) {
|
|
|
|
total += (when - hist->start_of_run);
|
|
|
|
} else if (hist->start_of_downtime) {
|
|
|
|
total += (when - hist->start_of_downtime);
|
|
|
|
}
|
|
|
|
return total;
|
|
|
|
}
|
2007-10-29 00:44:57 +01:00
|
|
|
|
2007-10-04 18:21:58 +02:00
|
|
|
/** Helper: Return the weighted percent-of-time-online of the router with
|
|
|
|
* history <b>hist</b>. */
|
2007-09-17 20:27:43 +02:00
|
|
|
static double
|
|
|
|
get_weighted_fractional_uptime(or_history_t *hist, time_t when)
|
|
|
|
{
|
|
|
|
unsigned long total = hist->total_weighted_time;
|
|
|
|
unsigned long up = hist->weighted_uptime;
|
|
|
|
|
|
|
|
if (hist->start_of_run) {
|
|
|
|
long run_length = (when - hist->start_of_run);
|
|
|
|
up += run_length;
|
|
|
|
total += run_length;
|
|
|
|
} else if (hist->start_of_downtime) {
|
|
|
|
total += (when - hist->start_of_downtime);
|
|
|
|
}
|
|
|
|
return ((double) up) / total;
|
|
|
|
}
|
|
|
|
|
2007-08-21 07:37:24 +02:00
|
|
|
/** Return an estimated MTBF for the router whose identity digest is
|
|
|
|
* <b>id</b>. Return 0 if the router is unknown. */
|
2007-08-17 22:31:54 +02:00
|
|
|
double
|
|
|
|
rep_hist_get_stability(const char *id, time_t when)
|
|
|
|
{
|
|
|
|
or_history_t *hist = get_or_history(id);
|
|
|
|
if (!hist)
|
|
|
|
return 0.0;
|
|
|
|
|
|
|
|
return get_stability(hist, when);
|
|
|
|
}
|
|
|
|
|
2007-10-04 18:21:58 +02:00
|
|
|
/** Return an estimated percent-of-time-online for the router whose identity
|
|
|
|
* digest is <b>id</b>. Return 0 if the router is unknown. */
|
2007-09-17 20:27:43 +02:00
|
|
|
double
|
|
|
|
rep_hist_get_weighted_fractional_uptime(const char *id, time_t when)
|
|
|
|
{
|
|
|
|
or_history_t *hist = get_or_history(id);
|
|
|
|
if (!hist)
|
|
|
|
return 0.0;
|
|
|
|
|
|
|
|
return get_weighted_fractional_uptime(hist, when);
|
|
|
|
}
|
|
|
|
|
2007-11-08 17:58:59 +01:00
|
|
|
/** Return a number representing how long we've known about the router whose
|
|
|
|
* digest is <b>id</b>. Return 0 if the router is unknown.
|
|
|
|
*
|
|
|
|
* Be careful: this measure incresases monotonically as we know the router for
|
|
|
|
* longer and longer, but it doesn't increase linearly.
|
|
|
|
*/
|
|
|
|
long
|
|
|
|
rep_hist_get_weighted_time_known(const char *id, time_t when)
|
|
|
|
{
|
|
|
|
or_history_t *hist = get_or_history(id);
|
|
|
|
if (!hist)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
return get_total_weighted_time(hist, when);
|
|
|
|
}
|
|
|
|
|
2007-08-21 07:37:24 +02:00
|
|
|
/** Return true if we've been measuring MTBFs for long enough to
|
2007-11-10 08:26:56 +01:00
|
|
|
* pronounce on Stability. */
|
2007-08-21 07:37:24 +02:00
|
|
|
int
|
|
|
|
rep_hist_have_measured_enough_stability(void)
|
|
|
|
{
|
2008-02-16 00:39:04 +01:00
|
|
|
/* XXXX021 This doesn't do so well when we change our opinion
|
2007-08-21 07:37:24 +02:00
|
|
|
* as to whether we're tracking router stability. */
|
|
|
|
return started_tracking_stability < time(NULL) - 4*60*60;
|
|
|
|
}
|
|
|
|
|
2004-07-17 00:23:18 +02:00
|
|
|
/** Remember that we successfully extended from the OR with identity
|
|
|
|
* digest <b>from_id</b> to the OR with identity digest
|
2006-07-23 07:18:29 +02:00
|
|
|
* <b>to_name</b>.
|
2004-03-20 05:59:29 +01:00
|
|
|
*/
|
2005-06-11 20:52:12 +02:00
|
|
|
void
|
|
|
|
rep_hist_note_extend_succeeded(const char *from_id, const char *to_id)
|
2004-03-20 02:48:05 +01:00
|
|
|
{
|
|
|
|
link_history_t *hist;
|
2004-03-20 05:59:29 +01:00
|
|
|
/* log_fn(LOG_WARN, "EXTEND SUCCEEDED: %s->%s",from_name,to_name); */
|
2004-07-13 20:23:40 +02:00
|
|
|
hist = get_link_history(from_id, to_id);
|
2004-08-17 09:12:05 +02:00
|
|
|
if (!hist)
|
|
|
|
return;
|
2004-03-20 02:48:05 +01:00
|
|
|
++hist->n_extend_ok;
|
2004-11-21 06:14:46 +01:00
|
|
|
hist->changed = time(NULL);
|
2004-03-20 02:48:05 +01:00
|
|
|
}
|
2004-03-20 05:59:29 +01:00
|
|
|
|
2004-07-17 00:23:18 +02:00
|
|
|
/** Remember that we tried to extend from the OR with identity digest
|
|
|
|
* <b>from_id</b> to the OR with identity digest <b>to_name</b>, but
|
|
|
|
* failed.
|
2004-03-20 05:59:29 +01:00
|
|
|
*/
|
2005-06-11 20:52:12 +02:00
|
|
|
void
|
|
|
|
rep_hist_note_extend_failed(const char *from_id, const char *to_id)
|
2004-03-20 02:48:05 +01:00
|
|
|
{
|
|
|
|
link_history_t *hist;
|
2004-03-20 05:59:29 +01:00
|
|
|
/* log_fn(LOG_WARN, "EXTEND FAILED: %s->%s",from_name,to_name); */
|
2004-07-13 20:23:40 +02:00
|
|
|
hist = get_link_history(from_id, to_id);
|
2004-08-17 09:12:05 +02:00
|
|
|
if (!hist)
|
|
|
|
return;
|
2004-03-20 02:48:05 +01:00
|
|
|
++hist->n_extend_fail;
|
2004-11-21 06:14:46 +01:00
|
|
|
hist->changed = time(NULL);
|
2004-03-20 02:48:05 +01:00
|
|
|
}
|
|
|
|
|
2004-12-01 03:54:13 +01:00
|
|
|
/** Log all the reliability data we have remembered, with the chosen
|
2004-03-20 05:59:29 +01:00
|
|
|
* severity.
|
|
|
|
*/
|
2005-06-11 20:52:12 +02:00
|
|
|
void
|
|
|
|
rep_hist_dump_stats(time_t now, int severity)
|
2004-03-20 02:48:05 +01:00
|
|
|
{
|
2005-10-18 22:12:22 +02:00
|
|
|
digestmap_iter_t *lhist_it;
|
|
|
|
digestmap_iter_t *orhist_it;
|
|
|
|
const char *name1, *name2, *digest1, *digest2;
|
|
|
|
char hexdigest1[HEX_DIGEST_LEN+1];
|
2004-03-20 02:48:05 +01:00
|
|
|
or_history_t *or_history;
|
|
|
|
link_history_t *link_history;
|
2004-03-29 08:18:04 +02:00
|
|
|
void *or_history_p, *link_history_p;
|
2004-03-20 02:48:05 +01:00
|
|
|
double uptime;
|
|
|
|
char buffer[2048];
|
2004-10-14 04:47:09 +02:00
|
|
|
size_t len;
|
2004-10-27 23:54:44 +02:00
|
|
|
int ret;
|
2004-03-20 05:59:29 +01:00
|
|
|
unsigned long upt, downt;
|
2004-07-13 20:23:40 +02:00
|
|
|
routerinfo_t *r;
|
2004-03-20 02:48:05 +01:00
|
|
|
|
2005-07-25 12:29:21 +02:00
|
|
|
rep_history_clean(now - get_options()->RephistTrackTime);
|
2004-11-21 06:14:46 +01:00
|
|
|
|
2005-10-19 00:56:40 +02:00
|
|
|
log(severity, LD_GENERAL, "--------------- Dumping history information:");
|
2004-03-20 02:48:05 +01:00
|
|
|
|
2005-12-14 21:40:40 +01:00
|
|
|
for (orhist_it = digestmap_iter_init(history_map);
|
|
|
|
!digestmap_iter_done(orhist_it);
|
2005-10-18 22:12:22 +02:00
|
|
|
orhist_it = digestmap_iter_next(history_map,orhist_it)) {
|
2007-08-17 22:31:54 +02:00
|
|
|
double s;
|
|
|
|
long stability;
|
2005-10-18 22:12:22 +02:00
|
|
|
digestmap_iter_get(orhist_it, &digest1, &or_history_p);
|
2004-03-29 08:18:04 +02:00
|
|
|
or_history = (or_history_t*) or_history_p;
|
2004-03-20 02:48:05 +01:00
|
|
|
|
2005-10-18 22:12:22 +02:00
|
|
|
if ((r = router_get_by_digest(digest1)))
|
2004-07-13 20:23:40 +02:00
|
|
|
name1 = r->nickname;
|
|
|
|
else
|
|
|
|
name1 = "(unknown)";
|
2005-10-18 22:12:22 +02:00
|
|
|
base16_encode(hexdigest1, sizeof(hexdigest1), digest1, DIGEST_LEN);
|
2004-03-20 02:48:05 +01:00
|
|
|
update_or_history(or_history, now);
|
2004-03-20 05:59:29 +01:00
|
|
|
upt = or_history->uptime;
|
|
|
|
downt = or_history->downtime;
|
2007-08-17 22:31:54 +02:00
|
|
|
s = get_stability(or_history, now);
|
|
|
|
stability = (long)s;
|
2004-03-20 05:59:29 +01:00
|
|
|
if (upt+downt) {
|
|
|
|
uptime = ((double)upt) / (upt+downt);
|
|
|
|
} else {
|
|
|
|
uptime=1.0;
|
|
|
|
}
|
2005-10-19 00:56:40 +02:00
|
|
|
log(severity, LD_GENERAL,
|
2007-08-17 22:31:54 +02:00
|
|
|
"OR %s [%s]: %ld/%ld good connections; uptime %ld/%ld sec (%.2f%%); "
|
2007-08-30 23:12:34 +02:00
|
|
|
"wmtbf %lu:%02lu:%02lu",
|
2004-07-13 20:23:40 +02:00
|
|
|
name1, hexdigest1,
|
2004-04-03 04:14:20 +02:00
|
|
|
or_history->n_conn_ok, or_history->n_conn_fail+or_history->n_conn_ok,
|
2007-08-17 22:31:54 +02:00
|
|
|
upt, upt+downt, uptime*100.0,
|
|
|
|
stability/3600, (stability/60)%60, stability%60);
|
2004-03-20 02:48:05 +01:00
|
|
|
|
2005-10-18 22:12:22 +02:00
|
|
|
if (!digestmap_isempty(or_history->link_history_map)) {
|
2004-12-04 09:56:59 +01:00
|
|
|
strlcpy(buffer, " Extend attempts: ", sizeof(buffer));
|
2004-08-18 11:57:50 +02:00
|
|
|
len = strlen(buffer);
|
2005-10-18 22:12:22 +02:00
|
|
|
for (lhist_it = digestmap_iter_init(or_history->link_history_map);
|
|
|
|
!digestmap_iter_done(lhist_it);
|
2005-12-14 21:40:40 +01:00
|
|
|
lhist_it = digestmap_iter_next(or_history->link_history_map,
|
|
|
|
lhist_it)) {
|
2005-10-18 22:12:22 +02:00
|
|
|
digestmap_iter_get(lhist_it, &digest2, &link_history_p);
|
|
|
|
if ((r = router_get_by_digest(digest2)))
|
2004-08-18 11:57:50 +02:00
|
|
|
name2 = r->nickname;
|
|
|
|
else
|
|
|
|
name2 = "(unknown)";
|
2004-07-13 20:23:40 +02:00
|
|
|
|
2004-08-18 11:57:50 +02:00
|
|
|
link_history = (link_history_t*) link_history_p;
|
2004-11-09 21:04:00 +01:00
|
|
|
|
2004-10-27 23:54:44 +02:00
|
|
|
ret = tor_snprintf(buffer+len, 2048-len, "%s(%ld/%ld); ", name2,
|
2004-08-18 11:57:50 +02:00
|
|
|
link_history->n_extend_ok,
|
|
|
|
link_history->n_extend_ok+link_history->n_extend_fail);
|
2004-10-27 23:54:44 +02:00
|
|
|
if (ret<0)
|
2004-08-18 11:57:50 +02:00
|
|
|
break;
|
2004-10-27 23:30:47 +02:00
|
|
|
else
|
2004-10-27 23:54:44 +02:00
|
|
|
len += ret;
|
2004-03-20 02:48:05 +01:00
|
|
|
}
|
2005-10-19 00:56:40 +02:00
|
|
|
log(severity, LD_GENERAL, "%s", buffer);
|
2004-03-20 02:48:05 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2004-11-21 06:14:46 +01:00
|
|
|
/** Remove history info for routers/links that haven't changed since
|
2006-07-23 07:18:29 +02:00
|
|
|
* <b>before</b>.
|
|
|
|
*/
|
2005-06-11 20:52:12 +02:00
|
|
|
void
|
|
|
|
rep_history_clean(time_t before)
|
2004-11-21 06:14:46 +01:00
|
|
|
{
|
2007-08-17 22:31:54 +02:00
|
|
|
int authority = authdir_mode(get_options());
|
2004-11-21 06:14:46 +01:00
|
|
|
or_history_t *or_history;
|
|
|
|
link_history_t *link_history;
|
|
|
|
void *or_history_p, *link_history_p;
|
2005-10-18 22:12:22 +02:00
|
|
|
digestmap_iter_t *orhist_it, *lhist_it;
|
|
|
|
const char *d1, *d2;
|
2004-11-21 06:14:46 +01:00
|
|
|
|
2005-10-18 22:12:22 +02:00
|
|
|
orhist_it = digestmap_iter_init(history_map);
|
|
|
|
while (!digestmap_iter_done(orhist_it)) {
|
2007-08-17 22:31:54 +02:00
|
|
|
int remove;
|
2005-10-18 22:12:22 +02:00
|
|
|
digestmap_iter_get(orhist_it, &d1, &or_history_p);
|
2004-11-21 06:14:46 +01:00
|
|
|
or_history = or_history_p;
|
2007-08-17 22:31:54 +02:00
|
|
|
|
|
|
|
remove = authority ? (or_history->total_run_weights < STABILITY_EPSILON &&
|
|
|
|
!or_history->start_of_run)
|
|
|
|
: (or_history->changed < before);
|
|
|
|
if (remove) {
|
2005-10-18 22:12:22 +02:00
|
|
|
orhist_it = digestmap_iter_next_rmv(history_map, orhist_it);
|
2005-11-23 05:18:45 +01:00
|
|
|
free_or_history(or_history);
|
2004-11-21 06:14:46 +01:00
|
|
|
continue;
|
|
|
|
}
|
2005-10-18 22:12:22 +02:00
|
|
|
for (lhist_it = digestmap_iter_init(or_history->link_history_map);
|
|
|
|
!digestmap_iter_done(lhist_it); ) {
|
|
|
|
digestmap_iter_get(lhist_it, &d2, &link_history_p);
|
2004-11-21 06:14:46 +01:00
|
|
|
link_history = link_history_p;
|
|
|
|
if (link_history->changed < before) {
|
2005-12-14 21:40:40 +01:00
|
|
|
lhist_it = digestmap_iter_next_rmv(or_history->link_history_map,
|
|
|
|
lhist_it);
|
2005-06-06 19:03:21 +02:00
|
|
|
rephist_total_alloc -= sizeof(link_history_t);
|
2004-11-21 06:14:46 +01:00
|
|
|
tor_free(link_history);
|
|
|
|
continue;
|
|
|
|
}
|
2005-10-18 22:12:22 +02:00
|
|
|
lhist_it = digestmap_iter_next(or_history->link_history_map,lhist_it);
|
2004-11-21 06:14:46 +01:00
|
|
|
}
|
2005-10-18 22:12:22 +02:00
|
|
|
orhist_it = digestmap_iter_next(history_map, orhist_it);
|
2004-11-21 06:14:46 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2007-08-21 07:37:24 +02:00
|
|
|
/** Write MTBF data to disk. Returns 0 on success, negative on failure. */
|
2007-08-17 22:31:59 +02:00
|
|
|
int
|
2007-08-20 18:34:17 +02:00
|
|
|
rep_hist_record_mtbf_data(void)
|
2007-08-17 22:31:59 +02:00
|
|
|
{
|
|
|
|
char time_buf[ISO_TIME_LEN+1];
|
|
|
|
|
|
|
|
digestmap_iter_t *orhist_it;
|
|
|
|
const char *digest;
|
|
|
|
void *or_history_p;
|
|
|
|
or_history_t *hist;
|
2007-08-29 21:02:43 +02:00
|
|
|
open_file_t *open_file = NULL;
|
|
|
|
FILE *f;
|
|
|
|
|
|
|
|
{
|
2007-10-17 18:55:44 +02:00
|
|
|
char *filename = get_datadir_fname("router-stability");
|
2007-08-29 21:02:43 +02:00
|
|
|
f = start_writing_to_stdio_file(filename, OPEN_FLAGS_REPLACE|O_TEXT, 0600,
|
|
|
|
&open_file);
|
|
|
|
tor_free(filename);
|
|
|
|
if (!f)
|
|
|
|
return -1;
|
|
|
|
}
|
2007-08-17 22:31:59 +02:00
|
|
|
|
2007-08-21 07:37:24 +02:00
|
|
|
/* File format is:
|
|
|
|
* FormatLine *KeywordLine Data
|
|
|
|
*
|
|
|
|
* FormatLine = "format 1" NL
|
|
|
|
* KeywordLine = Keyword SP Arguments NL
|
|
|
|
* Data = "data" NL *RouterMTBFLine "." NL
|
|
|
|
* RouterMTBFLine = Fingerprint SP WeightedRunLen SP
|
|
|
|
* TotalRunWeights [SP S=StartRunTime] NL
|
|
|
|
*/
|
2007-08-29 21:02:43 +02:00
|
|
|
#define PUT(s) STMT_BEGIN if (fputs((s),f)<0) goto err; STMT_END
|
|
|
|
#define PRINTF(args) STMT_BEGIN if (fprintf args <0) goto err; STMT_END
|
2007-08-21 07:37:24 +02:00
|
|
|
|
2007-10-10 19:48:58 +02:00
|
|
|
PUT("format 2\n");
|
2007-08-17 22:31:59 +02:00
|
|
|
|
2007-08-20 17:59:31 +02:00
|
|
|
format_iso_time(time_buf, time(NULL));
|
2007-08-29 21:02:43 +02:00
|
|
|
PRINTF((f, "stored-at %s\n", time_buf));
|
2007-08-20 17:59:31 +02:00
|
|
|
|
2007-08-21 07:37:24 +02:00
|
|
|
if (started_tracking_stability) {
|
|
|
|
format_iso_time(time_buf, started_tracking_stability);
|
2007-08-29 21:02:43 +02:00
|
|
|
PRINTF((f, "tracked-since %s\n", time_buf));
|
2007-08-21 07:37:24 +02:00
|
|
|
}
|
2007-08-17 22:31:59 +02:00
|
|
|
if (stability_last_downrated) {
|
|
|
|
format_iso_time(time_buf, stability_last_downrated);
|
2007-08-29 21:02:43 +02:00
|
|
|
PRINTF((f, "last-downrated %s\n", time_buf));
|
2007-08-17 22:31:59 +02:00
|
|
|
}
|
2007-08-20 17:59:31 +02:00
|
|
|
|
2007-08-29 21:02:43 +02:00
|
|
|
PUT("data\n");
|
2007-08-17 22:31:59 +02:00
|
|
|
|
2008-02-15 20:20:53 +01:00
|
|
|
/* XXX021 Nick: now bridge auths record this for all routers too.
|
|
|
|
* Should we make them record it only for bridge routers? -RD
|
|
|
|
* Not for 0.2.0. -NM */
|
2007-08-17 22:31:59 +02:00
|
|
|
for (orhist_it = digestmap_iter_init(history_map);
|
|
|
|
!digestmap_iter_done(orhist_it);
|
|
|
|
orhist_it = digestmap_iter_next(history_map,orhist_it)) {
|
|
|
|
char dbuf[HEX_DIGEST_LEN+1];
|
|
|
|
const char *t = NULL;
|
|
|
|
digestmap_iter_get(orhist_it, &digest, &or_history_p);
|
|
|
|
hist = (or_history_t*) or_history_p;
|
|
|
|
|
|
|
|
base16_encode(dbuf, sizeof(dbuf), digest, DIGEST_LEN);
|
2007-10-10 19:48:58 +02:00
|
|
|
PRINTF((f, "R %s\n", dbuf));
|
2007-11-08 19:15:49 +01:00
|
|
|
if (hist->start_of_run > 0) {
|
2007-08-17 22:31:59 +02:00
|
|
|
format_iso_time(time_buf, hist->start_of_run);
|
|
|
|
t = time_buf;
|
|
|
|
}
|
2007-10-10 19:48:58 +02:00
|
|
|
PRINTF((f, "+MTBF %lu %.5lf%s%s\n",
|
|
|
|
hist->weighted_run_length, hist->total_run_weights,
|
|
|
|
t ? " S=" : "", t ? t : ""));
|
|
|
|
t = NULL;
|
2007-11-08 19:15:49 +01:00
|
|
|
if (hist->start_of_downtime > 0) {
|
2007-10-10 19:48:58 +02:00
|
|
|
format_iso_time(time_buf, hist->start_of_downtime);
|
|
|
|
t = time_buf;
|
|
|
|
}
|
|
|
|
PRINTF((f, "+WFU %lu %lu%s%s\n",
|
|
|
|
hist->weighted_uptime, hist->total_weighted_time,
|
2007-08-29 21:02:43 +02:00
|
|
|
t ? " S=" : "", t ? t : ""));
|
2007-08-17 22:31:59 +02:00
|
|
|
}
|
|
|
|
|
2007-08-29 21:02:43 +02:00
|
|
|
PUT(".\n");
|
2007-08-17 22:31:59 +02:00
|
|
|
|
2007-08-29 21:02:43 +02:00
|
|
|
#undef PUT
|
|
|
|
#undef PRINTF
|
2007-08-17 22:31:59 +02:00
|
|
|
|
2007-08-29 21:02:43 +02:00
|
|
|
return finish_writing_to_file(open_file);
|
|
|
|
err:
|
|
|
|
abort_writing_to_file(open_file);
|
|
|
|
return -1;
|
2007-08-17 22:31:59 +02:00
|
|
|
}
|
|
|
|
|
2007-10-10 19:48:58 +02:00
|
|
|
/** Helper: return the first j >= i such that !strcmpstart(sl[j], prefix) and
|
|
|
|
* such that no line sl[k] with i <= k < j starts with "R ". Return -1 if no
|
|
|
|
* such line exists. */
|
|
|
|
static int
|
|
|
|
find_next_with(smartlist_t *sl, int i, const char *prefix)
|
|
|
|
{
|
|
|
|
for ( ; i < smartlist_len(sl); ++i) {
|
|
|
|
const char *line = smartlist_get(sl, i);
|
|
|
|
if (!strcmpstart(line, prefix))
|
|
|
|
return i;
|
|
|
|
if (!strcmpstart(line, "R "))
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2008-02-06 20:34:32 +01:00
|
|
|
/** How many bad times has parse_possibly_bad_iso_time parsed? */
|
2007-11-08 19:15:49 +01:00
|
|
|
static int n_bogus_times = 0;
|
2008-02-06 20:34:32 +01:00
|
|
|
/** Parse the ISO-formatted time in <b>s</b> into *<b>time_out</b>, but
|
|
|
|
* rounds any pre-1970 date to Jan 1, 1970. */
|
2007-11-08 19:15:49 +01:00
|
|
|
static int
|
|
|
|
parse_possibly_bad_iso_time(const char *s, time_t *time_out)
|
|
|
|
{
|
|
|
|
int year;
|
|
|
|
char b[5];
|
|
|
|
strlcpy(b, s, sizeof(b));
|
|
|
|
b[4] = '\0';
|
2008-02-06 01:54:47 +01:00
|
|
|
year = (int)tor_parse_long(b, 10, 0, INT_MAX, NULL, NULL);
|
2007-11-08 19:15:49 +01:00
|
|
|
if (year < 1970) {
|
|
|
|
*time_out = 0;
|
|
|
|
++n_bogus_times;
|
|
|
|
return 0;
|
|
|
|
} else
|
|
|
|
return parse_iso_time(s, time_out);
|
|
|
|
}
|
|
|
|
|
2008-02-16 00:39:04 +01:00
|
|
|
/** We've read a time <b>t</b> from a file stored at <b>stored_at</b>, which
|
|
|
|
* says we started measuring at <b>started_measuring</b>. Return a new number
|
|
|
|
* that's about as much before <b>now</b> as <b>t</b> was before
|
|
|
|
* <b>stored_at</b>.
|
|
|
|
*/
|
2007-11-08 19:15:49 +01:00
|
|
|
static INLINE time_t
|
|
|
|
correct_time(time_t t, time_t now, time_t stored_at, time_t started_measuring)
|
|
|
|
{
|
|
|
|
if (t < started_measuring - 24*60*60*365)
|
|
|
|
return 0;
|
|
|
|
else if (t < started_measuring)
|
|
|
|
return started_measuring;
|
|
|
|
else if (t > stored_at)
|
|
|
|
return 0;
|
|
|
|
else {
|
|
|
|
long run_length = stored_at - t;
|
|
|
|
t = now - run_length;
|
|
|
|
if (t < started_measuring)
|
|
|
|
t = started_measuring;
|
|
|
|
return t;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2007-08-21 07:37:24 +02:00
|
|
|
/** Load MTBF data from disk. Returns 0 on success or recoverable error, -1
|
|
|
|
* on failure. */
|
2007-08-17 22:31:59 +02:00
|
|
|
int
|
2007-08-20 18:34:17 +02:00
|
|
|
rep_hist_load_mtbf_data(time_t now)
|
2007-08-17 22:31:59 +02:00
|
|
|
{
|
|
|
|
/* XXXX won't handle being called while history is already populated. */
|
|
|
|
smartlist_t *lines;
|
|
|
|
const char *line = NULL;
|
|
|
|
int r=0, i;
|
2007-08-21 07:37:24 +02:00
|
|
|
time_t last_downrated = 0, stored_at = 0, tracked_since = 0;
|
|
|
|
time_t latest_possible_start = now;
|
2007-10-10 19:48:58 +02:00
|
|
|
long format = -1;
|
2007-08-17 22:31:59 +02:00
|
|
|
|
|
|
|
{
|
2007-10-17 18:55:44 +02:00
|
|
|
char *filename = get_datadir_fname("router-stability");
|
2007-08-17 22:31:59 +02:00
|
|
|
char *d = read_file_to_str(filename, RFTS_IGNORE_MISSING, NULL);
|
2007-08-20 18:34:17 +02:00
|
|
|
tor_free(filename);
|
2007-08-17 22:31:59 +02:00
|
|
|
if (!d)
|
|
|
|
return -1;
|
|
|
|
lines = smartlist_create();
|
|
|
|
smartlist_split_string(lines, d, "\n", SPLIT_SKIP_SPACE, 0);
|
|
|
|
tor_free(d);
|
|
|
|
}
|
|
|
|
|
2007-10-10 19:48:58 +02:00
|
|
|
{
|
|
|
|
const char *firstline;
|
|
|
|
if (smartlist_len(lines)>4) {
|
|
|
|
firstline = smartlist_get(lines, 0);
|
|
|
|
if (!strcmpstart(firstline, "format "))
|
|
|
|
format = tor_parse_long(firstline+strlen("format "),
|
|
|
|
10, -1, LONG_MAX, NULL, NULL);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (format != 1 && format != 2) {
|
|
|
|
log_warn(LD_GENERAL,
|
|
|
|
"Unrecognized format in mtbf history file. Skipping.");
|
2007-08-17 22:31:59 +02:00
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
for (i = 1; i < smartlist_len(lines); ++i) {
|
|
|
|
line = smartlist_get(lines, i);
|
|
|
|
if (!strcmp(line, "data"))
|
|
|
|
break;
|
|
|
|
if (!strcmpstart(line, "last-downrated ")) {
|
|
|
|
if (parse_iso_time(line+strlen("last-downrated "), &last_downrated)<0)
|
|
|
|
log_warn(LD_GENERAL,"Couldn't parse downrate time in mtbf "
|
|
|
|
"history file.");
|
|
|
|
}
|
2007-08-20 18:34:17 +02:00
|
|
|
if (!strcmpstart(line, "stored-at ")) {
|
|
|
|
if (parse_iso_time(line+strlen("stored-at "), &stored_at)<0)
|
|
|
|
log_warn(LD_GENERAL,"Couldn't parse stored time in mtbf "
|
|
|
|
"history file.");
|
|
|
|
}
|
2007-08-21 07:37:24 +02:00
|
|
|
if (!strcmpstart(line, "tracked-since ")) {
|
|
|
|
if (parse_iso_time(line+strlen("tracked-since "), &tracked_since)<0)
|
|
|
|
log_warn(LD_GENERAL,"Couldn't parse started-tracking time in mtbf "
|
|
|
|
"history file.");
|
|
|
|
}
|
2007-08-17 22:31:59 +02:00
|
|
|
}
|
2007-08-20 18:34:17 +02:00
|
|
|
if (last_downrated > now)
|
|
|
|
last_downrated = now;
|
2007-08-21 07:37:24 +02:00
|
|
|
if (tracked_since > now)
|
|
|
|
tracked_since = now;
|
2007-08-20 18:34:17 +02:00
|
|
|
|
|
|
|
if (!stored_at) {
|
|
|
|
log_warn(LD_GENERAL, "No stored time recorded.");
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
|
2007-08-17 22:31:59 +02:00
|
|
|
if (line && !strcmp(line, "data"))
|
|
|
|
++i;
|
|
|
|
|
2007-11-08 19:15:49 +01:00
|
|
|
n_bogus_times = 0;
|
|
|
|
|
2007-08-17 22:31:59 +02:00
|
|
|
for (; i < smartlist_len(lines); ++i) {
|
|
|
|
char digest[DIGEST_LEN];
|
|
|
|
char hexbuf[HEX_DIGEST_LEN+1];
|
2007-10-10 19:48:58 +02:00
|
|
|
char mtbf_timebuf[ISO_TIME_LEN+1];
|
|
|
|
char wfu_timebuf[ISO_TIME_LEN+1];
|
2007-08-17 22:31:59 +02:00
|
|
|
time_t start_of_run = 0;
|
2007-10-10 19:48:58 +02:00
|
|
|
time_t start_of_downtime = 0;
|
|
|
|
int have_mtbf = 0, have_wfu = 0;
|
|
|
|
long wrl = 0;
|
|
|
|
double trw = 0;
|
|
|
|
long wt_uptime = 0, total_wt_time = 0;
|
2007-08-17 22:31:59 +02:00
|
|
|
int n;
|
|
|
|
or_history_t *hist;
|
|
|
|
line = smartlist_get(lines, i);
|
|
|
|
if (!strcmp(line, "."))
|
|
|
|
break;
|
2007-10-10 19:48:58 +02:00
|
|
|
|
|
|
|
mtbf_timebuf[0] = '\0';
|
|
|
|
wfu_timebuf[0] = '\0';
|
|
|
|
|
|
|
|
if (format == 1) {
|
|
|
|
n = sscanf(line, "%40s %ld %lf S=%10s %8s",
|
|
|
|
hexbuf, &wrl, &trw, mtbf_timebuf, mtbf_timebuf+11);
|
|
|
|
if (n != 3 && n != 5) {
|
|
|
|
log_warn(LD_GENERAL, "Couldn't scan line %s", escaped(line));
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
have_mtbf = 1;
|
|
|
|
} else {
|
|
|
|
// format == 2.
|
|
|
|
int mtbf_idx, wfu_idx;
|
|
|
|
if (strcmpstart(line, "R ") || strlen(line) < 2+HEX_DIGEST_LEN)
|
|
|
|
continue;
|
|
|
|
strlcpy(hexbuf, line+2, sizeof(hexbuf));
|
|
|
|
mtbf_idx = find_next_with(lines, i+1, "+MTBF ");
|
|
|
|
wfu_idx = find_next_with(lines, i+1, "+WFU ");
|
|
|
|
if (mtbf_idx >= 0) {
|
|
|
|
const char *mtbfline = smartlist_get(lines, mtbf_idx);
|
|
|
|
n = sscanf(mtbfline, "+MTBF %lu %lf S=%10s %8s",
|
|
|
|
&wrl, &trw, mtbf_timebuf, mtbf_timebuf+11);
|
|
|
|
if (n == 2 || n == 4) {
|
|
|
|
have_mtbf = 1;
|
|
|
|
} else {
|
|
|
|
log_warn(LD_GENERAL, "Couldn't scan +MTBF line %s",
|
|
|
|
escaped(mtbfline));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (wfu_idx >= 0) {
|
|
|
|
const char *wfuline = smartlist_get(lines, wfu_idx);
|
|
|
|
n = sscanf(wfuline, "+WFU %lu %lu S=%10s %8s",
|
|
|
|
&wt_uptime, &total_wt_time,
|
|
|
|
wfu_timebuf, wfu_timebuf+11);
|
|
|
|
if (n == 2 || n == 4) {
|
|
|
|
have_wfu = 1;
|
|
|
|
} else {
|
|
|
|
log_warn(LD_GENERAL, "Couldn't scan +WFU line %s", escaped(wfuline));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (wfu_idx > i)
|
|
|
|
i = wfu_idx;
|
|
|
|
if (mtbf_idx > i)
|
|
|
|
i = mtbf_idx;
|
2007-08-17 22:31:59 +02:00
|
|
|
}
|
|
|
|
if (base16_decode(digest, DIGEST_LEN, hexbuf, HEX_DIGEST_LEN) < 0) {
|
|
|
|
log_warn(LD_GENERAL, "Couldn't hex string %s", escaped(hexbuf));
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
hist = get_or_history(digest);
|
|
|
|
if (!hist)
|
|
|
|
continue;
|
2007-08-20 18:34:17 +02:00
|
|
|
|
2007-10-10 19:48:58 +02:00
|
|
|
if (have_mtbf) {
|
|
|
|
if (mtbf_timebuf[0]) {
|
|
|
|
mtbf_timebuf[10] = ' ';
|
2007-11-08 19:15:49 +01:00
|
|
|
if (parse_possibly_bad_iso_time(mtbf_timebuf, &start_of_run)<0)
|
2007-10-10 19:48:58 +02:00
|
|
|
log_warn(LD_GENERAL, "Couldn't parse time %s",
|
|
|
|
escaped(mtbf_timebuf));
|
|
|
|
}
|
2007-11-08 19:15:49 +01:00
|
|
|
hist->start_of_run = correct_time(start_of_run, now, stored_at,
|
|
|
|
tracked_since);
|
2007-10-10 19:48:58 +02:00
|
|
|
if (hist->start_of_run < latest_possible_start + wrl)
|
|
|
|
latest_possible_start = hist->start_of_run - wrl;
|
|
|
|
|
|
|
|
hist->weighted_run_length = wrl;
|
|
|
|
hist->total_run_weights = trw;
|
|
|
|
}
|
|
|
|
if (have_wfu) {
|
|
|
|
if (wfu_timebuf[0]) {
|
|
|
|
wfu_timebuf[10] = ' ';
|
2007-11-08 19:15:49 +01:00
|
|
|
if (parse_possibly_bad_iso_time(wfu_timebuf, &start_of_downtime)<0)
|
2007-10-10 19:48:58 +02:00
|
|
|
log_warn(LD_GENERAL, "Couldn't parse time %s", escaped(wfu_timebuf));
|
|
|
|
}
|
|
|
|
}
|
2007-11-08 19:15:49 +01:00
|
|
|
hist->start_of_downtime = correct_time(start_of_downtime, now, stored_at,
|
|
|
|
tracked_since);
|
2007-10-10 19:48:58 +02:00
|
|
|
hist->weighted_uptime = wt_uptime;
|
|
|
|
hist->total_weighted_time = total_wt_time;
|
2007-08-17 22:31:59 +02:00
|
|
|
}
|
|
|
|
if (strcmp(line, "."))
|
2007-08-20 18:34:17 +02:00
|
|
|
log_warn(LD_GENERAL, "Truncated MTBF file.");
|
2007-08-17 22:31:59 +02:00
|
|
|
|
2008-02-21 03:18:41 +01:00
|
|
|
if (tracked_since < 86400*365) /* Recover from insanely early value. */
|
2007-08-21 07:37:24 +02:00
|
|
|
tracked_since = latest_possible_start;
|
|
|
|
|
2007-08-17 22:31:59 +02:00
|
|
|
stability_last_downrated = last_downrated;
|
2007-08-21 07:37:24 +02:00
|
|
|
started_tracking_stability = tracked_since;
|
2007-08-17 22:31:59 +02:00
|
|
|
|
|
|
|
goto done;
|
|
|
|
err:
|
|
|
|
r = -1;
|
|
|
|
done:
|
|
|
|
SMARTLIST_FOREACH(lines, char *, cp, tor_free(cp));
|
|
|
|
smartlist_free(lines);
|
|
|
|
return r;
|
|
|
|
}
|
|
|
|
|
2006-03-12 23:48:18 +01:00
|
|
|
/** For how many seconds do we keep track of individual per-second bandwidth
|
|
|
|
* totals? */
|
2004-07-13 09:42:20 +02:00
|
|
|
#define NUM_SECS_ROLLING_MEASURE 10
|
2007-04-30 19:46:13 +02:00
|
|
|
/** How large are the intervals for which we track and report bandwidth use? */
|
2004-07-20 22:57:46 +02:00
|
|
|
#define NUM_SECS_BW_SUM_INTERVAL (15*60)
|
2006-03-12 23:48:18 +01:00
|
|
|
/** How far in the past do we remember and publish bandwidth use? */
|
|
|
|
#define NUM_SECS_BW_SUM_IS_VALID (24*60*60)
|
2006-07-23 07:18:29 +02:00
|
|
|
/** How many bandwidth usage intervals do we remember? (derived) */
|
2004-07-20 22:57:46 +02:00
|
|
|
#define NUM_TOTALS (NUM_SECS_BW_SUM_IS_VALID/NUM_SECS_BW_SUM_INTERVAL)
|
|
|
|
|
2006-07-23 07:18:29 +02:00
|
|
|
/** Structure to track bandwidth use, and remember the maxima for a given
|
2004-07-20 22:57:46 +02:00
|
|
|
* time period.
|
|
|
|
*/
|
|
|
|
typedef struct bw_array_t {
|
|
|
|
/** Observation array: Total number of bytes transferred in each of the last
|
|
|
|
* NUM_SECS_ROLLING_MEASURE seconds. This is used as a circular array. */
|
2006-01-11 04:57:01 +01:00
|
|
|
uint64_t obs[NUM_SECS_ROLLING_MEASURE];
|
2004-07-20 22:57:46 +02:00
|
|
|
int cur_obs_idx; /**< Current position in obs. */
|
|
|
|
time_t cur_obs_time; /**< Time represented in obs[cur_obs_idx] */
|
2006-01-11 05:04:42 +01:00
|
|
|
uint64_t total_obs; /**< Total for all members of obs except
|
|
|
|
* obs[cur_obs_idx] */
|
|
|
|
uint64_t max_total; /**< Largest value that total_obs has taken on in the
|
|
|
|
* current period. */
|
2005-12-14 21:40:40 +01:00
|
|
|
uint64_t total_in_period; /**< Total bytes transferred in the current
|
|
|
|
* period. */
|
2004-07-20 22:57:46 +02:00
|
|
|
|
|
|
|
/** When does the next period begin? */
|
|
|
|
time_t next_period;
|
|
|
|
/** Where in 'maxima' should the maximum bandwidth usage for the current
|
|
|
|
* period be stored? */
|
|
|
|
int next_max_idx;
|
2004-08-07 04:46:16 +02:00
|
|
|
/** How many values in maxima/totals have been set ever? */
|
|
|
|
int num_maxes_set;
|
|
|
|
/** Circular array of the maximum
|
|
|
|
* bandwidth-per-NUM_SECS_ROLLING_MEASURE usage for the last
|
|
|
|
* NUM_TOTALS periods */
|
2006-01-11 04:57:01 +01:00
|
|
|
uint64_t maxima[NUM_TOTALS];
|
2004-08-07 04:46:16 +02:00
|
|
|
/** Circular array of the total bandwidth usage for the last NUM_TOTALS
|
|
|
|
* periods */
|
2005-09-23 10:29:58 +02:00
|
|
|
uint64_t totals[NUM_TOTALS];
|
2004-07-20 22:57:46 +02:00
|
|
|
} bw_array_t;
|
|
|
|
|
2006-07-23 07:18:29 +02:00
|
|
|
/** Shift the current period of b forward by one. */
|
2005-06-11 20:52:12 +02:00
|
|
|
static void
|
|
|
|
commit_max(bw_array_t *b)
|
|
|
|
{
|
2004-08-07 04:46:16 +02:00
|
|
|
/* Store total from current period. */
|
|
|
|
b->totals[b->next_max_idx] = b->total_in_period;
|
2004-07-20 22:57:46 +02:00
|
|
|
/* Store maximum from current period. */
|
|
|
|
b->maxima[b->next_max_idx++] = b->max_total;
|
|
|
|
/* Advance next_period and next_max_idx */
|
|
|
|
b->next_period += NUM_SECS_BW_SUM_INTERVAL;
|
|
|
|
if (b->next_max_idx == NUM_TOTALS)
|
|
|
|
b->next_max_idx = 0;
|
2004-08-07 04:46:16 +02:00
|
|
|
if (b->num_maxes_set < NUM_TOTALS)
|
|
|
|
++b->num_maxes_set;
|
2004-07-20 22:57:46 +02:00
|
|
|
/* Reset max_total. */
|
|
|
|
b->max_total = 0;
|
2004-08-07 07:13:55 +02:00
|
|
|
/* Reset total_in_period. */
|
|
|
|
b->total_in_period = 0;
|
2004-07-20 22:57:46 +02:00
|
|
|
}
|
|
|
|
|
2006-07-23 07:18:29 +02:00
|
|
|
/** Shift the current observation time of 'b' forward by one second. */
|
2005-06-11 20:52:12 +02:00
|
|
|
static INLINE void
|
|
|
|
advance_obs(bw_array_t *b)
|
|
|
|
{
|
2004-07-20 22:57:46 +02:00
|
|
|
int nextidx;
|
2006-01-11 04:57:01 +01:00
|
|
|
uint64_t total;
|
2004-07-20 22:57:46 +02:00
|
|
|
|
|
|
|
/* Calculate the total bandwidth for the last NUM_SECS_ROLLING_MEASURE
|
|
|
|
* seconds; adjust max_total as needed.*/
|
|
|
|
total = b->total_obs + b->obs[b->cur_obs_idx];
|
|
|
|
if (total > b->max_total)
|
|
|
|
b->max_total = total;
|
|
|
|
|
|
|
|
nextidx = b->cur_obs_idx+1;
|
|
|
|
if (nextidx == NUM_SECS_ROLLING_MEASURE)
|
|
|
|
nextidx = 0;
|
|
|
|
|
|
|
|
b->total_obs = total - b->obs[nextidx];
|
|
|
|
b->obs[nextidx]=0;
|
|
|
|
b->cur_obs_idx = nextidx;
|
|
|
|
|
|
|
|
if (++b->cur_obs_time >= b->next_period)
|
|
|
|
commit_max(b);
|
|
|
|
}
|
|
|
|
|
2008-02-20 03:17:41 +01:00
|
|
|
/** Add <b>n</b> bytes to the number of bytes in <b>b</b> for second
|
|
|
|
* <b>when</b>. */
|
2005-06-11 20:52:12 +02:00
|
|
|
static INLINE void
|
2006-01-02 01:42:19 +01:00
|
|
|
add_obs(bw_array_t *b, time_t when, uint64_t n)
|
2005-06-11 20:52:12 +02:00
|
|
|
{
|
2004-07-21 01:25:00 +02:00
|
|
|
/* Don't record data in the past. */
|
|
|
|
if (when<b->cur_obs_time)
|
|
|
|
return;
|
|
|
|
/* If we're currently adding observations for an earlier second than
|
|
|
|
* 'when', advance b->cur_obs_time and b->cur_obs_idx by an
|
|
|
|
* appropriate number of seconds, and do all the other housekeeping */
|
|
|
|
while (when>b->cur_obs_time)
|
2004-07-20 22:57:46 +02:00
|
|
|
advance_obs(b);
|
2004-07-21 01:25:00 +02:00
|
|
|
|
2004-07-20 22:57:46 +02:00
|
|
|
b->obs[b->cur_obs_idx] += n;
|
2004-08-07 04:46:16 +02:00
|
|
|
b->total_in_period += n;
|
2004-07-20 22:57:46 +02:00
|
|
|
}
|
|
|
|
|
2006-07-23 07:18:29 +02:00
|
|
|
/** Allocate, initialize, and return a new bw_array. */
|
2005-09-30 03:39:24 +02:00
|
|
|
static bw_array_t *
|
|
|
|
bw_array_new(void)
|
2005-06-11 20:52:12 +02:00
|
|
|
{
|
2004-07-20 22:57:46 +02:00
|
|
|
bw_array_t *b;
|
|
|
|
time_t start;
|
|
|
|
b = tor_malloc_zero(sizeof(bw_array_t));
|
2005-06-06 19:03:21 +02:00
|
|
|
rephist_total_alloc += sizeof(bw_array_t);
|
2004-07-20 22:57:46 +02:00
|
|
|
start = time(NULL);
|
|
|
|
b->cur_obs_time = start;
|
|
|
|
b->next_period = start + NUM_SECS_BW_SUM_INTERVAL;
|
|
|
|
return b;
|
|
|
|
}
|
|
|
|
|
|
|
|
static bw_array_t *read_array = NULL;
|
|
|
|
static bw_array_t *write_array = NULL;
|
|
|
|
|
2006-07-23 07:18:29 +02:00
|
|
|
/** Set up read_array and write_array. */
|
2005-06-11 20:52:12 +02:00
|
|
|
static void
|
|
|
|
bw_arrays_init(void)
|
2004-07-20 22:57:46 +02:00
|
|
|
{
|
|
|
|
read_array = bw_array_new();
|
|
|
|
write_array = bw_array_new();
|
|
|
|
}
|
2004-07-13 09:42:20 +02:00
|
|
|
|
|
|
|
/** We read <b>num_bytes</b> more bytes in second <b>when</b>.
|
|
|
|
*
|
|
|
|
* Add num_bytes to the current running total for <b>when</b>.
|
|
|
|
*
|
|
|
|
* <b>when</b> can go back to time, but it's safe to ignore calls
|
2004-07-13 18:58:01 +02:00
|
|
|
* earlier than the latest <b>when</b> you've heard of.
|
2004-07-13 09:42:20 +02:00
|
|
|
*/
|
2005-06-11 20:52:12 +02:00
|
|
|
void
|
2008-02-20 03:17:41 +01:00
|
|
|
rep_hist_note_bytes_written(size_t num_bytes, time_t when)
|
2005-06-11 20:52:12 +02:00
|
|
|
{
|
2004-07-13 09:42:20 +02:00
|
|
|
/* Maybe a circular array for recent seconds, and step to a new point
|
|
|
|
* every time a new second shows up. Or simpler is to just to have
|
|
|
|
* a normal array and push down each item every second; it's short.
|
|
|
|
*/
|
|
|
|
/* When a new second has rolled over, compute the sum of the bytes we've
|
|
|
|
* seen over when-1 to when-1-NUM_SECS_ROLLING_MEASURE, and stick it
|
|
|
|
* somewhere. See rep_hist_bandwidth_assess() below.
|
|
|
|
*/
|
2004-07-20 22:57:46 +02:00
|
|
|
add_obs(write_array, when, num_bytes);
|
2004-07-13 09:42:20 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/** We wrote <b>num_bytes</b> more bytes in second <b>when</b>.
|
|
|
|
* (like rep_hist_note_bytes_written() above)
|
|
|
|
*/
|
2005-06-11 20:52:12 +02:00
|
|
|
void
|
2008-02-20 03:17:41 +01:00
|
|
|
rep_hist_note_bytes_read(size_t num_bytes, time_t when)
|
2005-06-11 20:52:12 +02:00
|
|
|
{
|
2004-07-13 09:42:20 +02:00
|
|
|
/* if we're smart, we can make this func and the one above share code */
|
2004-07-20 22:57:46 +02:00
|
|
|
add_obs(read_array, when, num_bytes);
|
|
|
|
}
|
|
|
|
|
|
|
|
/** Helper: Return the largest value in b->maxima. (This is equal to the
|
|
|
|
* most bandwidth used in any NUM_SECS_ROLLING_MEASURE period for the last
|
|
|
|
* NUM_SECS_BW_SUM_IS_VALID seconds.)
|
|
|
|
*/
|
2006-01-11 04:57:01 +01:00
|
|
|
static uint64_t
|
2005-06-11 20:52:12 +02:00
|
|
|
find_largest_max(bw_array_t *b)
|
2004-07-20 22:57:46 +02:00
|
|
|
{
|
2006-01-11 04:57:01 +01:00
|
|
|
int i;
|
|
|
|
uint64_t max;
|
2004-07-20 22:57:46 +02:00
|
|
|
max=0;
|
|
|
|
for (i=0; i<NUM_TOTALS; ++i) {
|
|
|
|
if (b->maxima[i]>max)
|
|
|
|
max = b->maxima[i];
|
|
|
|
}
|
|
|
|
return max;
|
2004-07-13 09:42:20 +02:00
|
|
|
}
|
|
|
|
|
2006-07-23 07:18:29 +02:00
|
|
|
/** Find the largest sums in the past NUM_SECS_BW_SUM_IS_VALID (roughly)
|
2004-07-13 09:42:20 +02:00
|
|
|
* seconds. Find one sum for reading and one for writing. They don't have
|
2008-02-20 03:17:41 +01:00
|
|
|
* to be at the same time.
|
2004-07-13 09:42:20 +02:00
|
|
|
*
|
|
|
|
* Return the smaller of these sums, divided by NUM_SECS_ROLLING_MEASURE.
|
|
|
|
*/
|
2005-06-11 20:52:12 +02:00
|
|
|
int
|
|
|
|
rep_hist_bandwidth_assess(void)
|
|
|
|
{
|
2006-01-11 04:57:01 +01:00
|
|
|
uint64_t w,r;
|
2004-07-20 22:57:46 +02:00
|
|
|
r = find_largest_max(read_array);
|
|
|
|
w = find_largest_max(write_array);
|
|
|
|
if (r>w)
|
2006-07-17 02:39:05 +02:00
|
|
|
return (int)(U64_TO_DBL(w)/NUM_SECS_ROLLING_MEASURE);
|
2004-07-20 22:57:46 +02:00
|
|
|
else
|
2006-07-17 02:39:05 +02:00
|
|
|
return (int)(U64_TO_DBL(r)/NUM_SECS_ROLLING_MEASURE);
|
2004-07-13 09:42:20 +02:00
|
|
|
}
|
|
|
|
|
2006-07-23 07:18:29 +02:00
|
|
|
/** Print the bandwidth history of b (either read_array or write_array)
|
2005-12-24 00:56:42 +01:00
|
|
|
* into the buffer pointed to by buf. The format is simply comma
|
|
|
|
* separated numbers, from oldest to newest.
|
|
|
|
*
|
|
|
|
* It returns the number of bytes written.
|
|
|
|
*/
|
2005-12-29 21:25:53 +01:00
|
|
|
static size_t
|
2005-12-24 00:56:42 +01:00
|
|
|
rep_hist_fill_bandwidth_history(char *buf, size_t len, bw_array_t *b)
|
|
|
|
{
|
|
|
|
char *cp = buf;
|
|
|
|
int i, n;
|
2007-10-10 17:07:19 +02:00
|
|
|
or_options_t *options = get_options();
|
|
|
|
uint64_t cutoff;
|
2005-12-24 00:56:42 +01:00
|
|
|
|
|
|
|
if (b->num_maxes_set <= b->next_max_idx) {
|
|
|
|
/* We haven't been through the circular array yet; time starts at i=0.*/
|
|
|
|
i = 0;
|
|
|
|
} else {
|
|
|
|
/* We've been around the array at least once. The next i to be
|
|
|
|
overwritten is the oldest. */
|
|
|
|
i = b->next_max_idx;
|
|
|
|
}
|
|
|
|
|
2007-10-10 17:07:19 +02:00
|
|
|
if (options->RelayBandwidthRate) {
|
|
|
|
/* We don't want to report that we used more bandwidth than the max we're
|
|
|
|
* willing to relay; otherwise everybody will know how much traffic
|
|
|
|
* we used ourself. */
|
|
|
|
cutoff = options->RelayBandwidthRate * NUM_SECS_BW_SUM_INTERVAL;
|
|
|
|
} else {
|
|
|
|
cutoff = UINT64_MAX;
|
|
|
|
}
|
|
|
|
|
2005-12-24 00:56:42 +01:00
|
|
|
for (n=0; n<b->num_maxes_set; ++n,++i) {
|
2006-12-07 21:11:36 +01:00
|
|
|
uint64_t total;
|
2007-06-06 15:02:22 +02:00
|
|
|
if (i >= NUM_TOTALS)
|
|
|
|
i -= NUM_TOTALS;
|
|
|
|
tor_assert(i < NUM_TOTALS);
|
2006-12-07 21:11:36 +01:00
|
|
|
/* Round the bandwidth used down to the nearest 1k. */
|
|
|
|
total = b->totals[i] & ~0x3ff;
|
2007-10-10 17:07:19 +02:00
|
|
|
if (total > cutoff)
|
|
|
|
total = cutoff;
|
|
|
|
|
2005-12-24 00:56:42 +01:00
|
|
|
if (n==(b->num_maxes_set-1))
|
2006-12-07 21:11:36 +01:00
|
|
|
tor_snprintf(cp, len-(cp-buf), U64_FORMAT, U64_PRINTF_ARG(total));
|
2005-12-24 00:56:42 +01:00
|
|
|
else
|
2006-12-07 21:11:36 +01:00
|
|
|
tor_snprintf(cp, len-(cp-buf), U64_FORMAT",", U64_PRINTF_ARG(total));
|
2005-12-24 00:56:42 +01:00
|
|
|
cp += strlen(cp);
|
|
|
|
}
|
|
|
|
return cp-buf;
|
|
|
|
}
|
|
|
|
|
2006-07-23 07:18:29 +02:00
|
|
|
/** Allocate and return lines for representing this server's bandwidth
|
2004-11-09 19:22:17 +01:00
|
|
|
* history in its descriptor.
|
2004-08-07 04:46:16 +02:00
|
|
|
*/
|
2004-11-09 19:22:17 +01:00
|
|
|
char *
|
2007-04-16 20:54:56 +02:00
|
|
|
rep_hist_get_bandwidth_lines(int for_extrainfo)
|
2004-08-07 04:46:16 +02:00
|
|
|
{
|
|
|
|
char *buf, *cp;
|
|
|
|
char t[ISO_TIME_LEN+1];
|
2005-12-24 00:56:42 +01:00
|
|
|
int r;
|
2004-08-07 04:46:16 +02:00
|
|
|
bw_array_t *b;
|
|
|
|
size_t len;
|
|
|
|
|
2004-11-09 19:22:17 +01:00
|
|
|
/* opt (read|write)-history yyyy-mm-dd HH:MM:SS (n s) n,n,n,n,n... */
|
2005-09-23 10:29:58 +02:00
|
|
|
len = (60+20*NUM_TOTALS)*2;
|
2004-08-07 04:46:16 +02:00
|
|
|
buf = tor_malloc_zero(len);
|
|
|
|
cp = buf;
|
|
|
|
for (r=0;r<2;++r) {
|
|
|
|
b = r?read_array:write_array;
|
2004-11-23 10:01:37 +01:00
|
|
|
tor_assert(b);
|
2004-08-07 04:46:16 +02:00
|
|
|
format_iso_time(t, b->next_period-NUM_SECS_BW_SUM_INTERVAL);
|
2007-04-16 20:54:56 +02:00
|
|
|
tor_snprintf(cp, len-(cp-buf), "%s%s %s (%d s) ",
|
2007-04-16 23:37:21 +02:00
|
|
|
for_extrainfo ? "" : "opt ",
|
2005-09-23 19:02:50 +02:00
|
|
|
r ? "read-history" : "write-history", t,
|
2005-09-23 10:29:58 +02:00
|
|
|
NUM_SECS_BW_SUM_INTERVAL);
|
2004-08-07 04:46:16 +02:00
|
|
|
cp += strlen(cp);
|
2005-12-24 00:56:42 +01:00
|
|
|
cp += rep_hist_fill_bandwidth_history(cp, len-(cp-buf), b);
|
2004-10-27 08:25:29 +02:00
|
|
|
strlcat(cp, "\n", len-(cp-buf));
|
2004-08-07 04:46:16 +02:00
|
|
|
++cp;
|
|
|
|
}
|
|
|
|
return buf;
|
|
|
|
}
|
|
|
|
|
2005-12-24 23:48:12 +01:00
|
|
|
/** Update <b>state</b> with the newest bandwidth history. */
|
|
|
|
void
|
2005-12-24 00:56:42 +01:00
|
|
|
rep_hist_update_state(or_state_t *state)
|
|
|
|
{
|
|
|
|
int len, r;
|
|
|
|
char *buf, *cp;
|
|
|
|
smartlist_t **s_values;
|
|
|
|
time_t *s_begins;
|
|
|
|
int *s_interval;
|
|
|
|
bw_array_t *b;
|
|
|
|
|
|
|
|
len = 20*NUM_TOTALS+1;
|
|
|
|
buf = tor_malloc_zero(len);
|
|
|
|
|
|
|
|
for (r=0;r<2;++r) {
|
|
|
|
b = r?read_array:write_array;
|
|
|
|
s_begins = r?&state->BWHistoryReadEnds :&state->BWHistoryWriteEnds;
|
|
|
|
s_interval= r?&state->BWHistoryReadInterval:&state->BWHistoryWriteInterval;
|
|
|
|
s_values = r?&state->BWHistoryReadValues :&state->BWHistoryWriteValues;
|
|
|
|
|
|
|
|
if (*s_values) {
|
2007-05-17 00:15:14 +02:00
|
|
|
SMARTLIST_FOREACH(*s_values, char *, val, tor_free(val));
|
2005-12-24 00:56:42 +01:00
|
|
|
smartlist_free(*s_values);
|
|
|
|
}
|
2006-12-07 19:57:29 +01:00
|
|
|
if (! server_mode(get_options())) {
|
|
|
|
/* Clients don't need to store bandwidth history persistently;
|
|
|
|
* force these values to the defaults. */
|
2006-12-09 20:40:16 +01:00
|
|
|
/* FFFF we should pull the default out of config.c's state table,
|
|
|
|
* so we don't have two defaults. */
|
2006-12-24 03:45:46 +01:00
|
|
|
if (*s_begins != 0 || *s_interval != 900) {
|
|
|
|
time_t now = time(NULL);
|
|
|
|
time_t save_at = get_options()->AvoidDiskWrites ? now+3600 : now+600;
|
|
|
|
or_state_mark_dirty(state, save_at);
|
|
|
|
}
|
2006-12-07 19:57:29 +01:00
|
|
|
*s_begins = 0;
|
|
|
|
*s_interval = 900;
|
|
|
|
*s_values = smartlist_create();
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
*s_begins = b->next_period;
|
|
|
|
*s_interval = NUM_SECS_BW_SUM_INTERVAL;
|
2005-12-24 00:56:42 +01:00
|
|
|
cp = buf;
|
|
|
|
cp += rep_hist_fill_bandwidth_history(cp, len, b);
|
|
|
|
tor_snprintf(cp, len-(cp-buf), cp == buf ? U64_FORMAT : ","U64_FORMAT,
|
|
|
|
U64_PRINTF_ARG(b->total_in_period));
|
|
|
|
*s_values = smartlist_create();
|
2006-01-02 13:19:28 +01:00
|
|
|
if (server_mode(get_options()))
|
|
|
|
smartlist_split_string(*s_values, buf, ",", SPLIT_SKIP_SPACE, 0);
|
2005-12-24 00:56:42 +01:00
|
|
|
}
|
|
|
|
tor_free(buf);
|
2006-12-24 03:45:46 +01:00
|
|
|
if (server_mode(get_options())) {
|
2006-12-07 21:11:30 +01:00
|
|
|
or_state_mark_dirty(get_or_state(), time(NULL)+(2*3600));
|
2006-12-24 03:45:46 +01:00
|
|
|
}
|
2005-12-24 00:56:42 +01:00
|
|
|
}
|
|
|
|
|
2006-07-23 07:18:29 +02:00
|
|
|
/** Set bandwidth history from our saved state. */
|
2005-12-24 00:56:42 +01:00
|
|
|
int
|
2006-03-26 08:51:26 +02:00
|
|
|
rep_hist_load_state(or_state_t *state, char **err)
|
2005-12-24 00:56:42 +01:00
|
|
|
{
|
|
|
|
time_t s_begins, start;
|
|
|
|
time_t now = time(NULL);
|
|
|
|
uint64_t v;
|
|
|
|
int r,i,ok;
|
|
|
|
int all_ok = 1;
|
|
|
|
int s_interval;
|
|
|
|
smartlist_t *s_values;
|
|
|
|
bw_array_t *b;
|
|
|
|
|
|
|
|
/* Assert they already have been malloced */
|
|
|
|
tor_assert(read_array && write_array);
|
|
|
|
|
|
|
|
for (r=0;r<2;++r) {
|
|
|
|
b = r?read_array:write_array;
|
|
|
|
s_begins = r?state->BWHistoryReadEnds:state->BWHistoryWriteEnds;
|
|
|
|
s_interval = r?state->BWHistoryReadInterval:state->BWHistoryWriteInterval;
|
|
|
|
s_values = r?state->BWHistoryReadValues:state->BWHistoryWriteValues;
|
|
|
|
if (s_values && s_begins >= now - NUM_SECS_BW_SUM_INTERVAL*NUM_TOTALS) {
|
|
|
|
start = s_begins - s_interval*(smartlist_len(s_values));
|
2007-08-18 20:20:42 +02:00
|
|
|
if (start > now)
|
|
|
|
continue;
|
2005-12-24 00:56:42 +01:00
|
|
|
b->cur_obs_time = start;
|
|
|
|
b->next_period = start + NUM_SECS_BW_SUM_INTERVAL;
|
|
|
|
SMARTLIST_FOREACH(s_values, char *, cp, {
|
|
|
|
v = tor_parse_uint64(cp, 10, 0, UINT64_MAX, &ok, NULL);
|
|
|
|
if (!ok) {
|
|
|
|
all_ok=0;
|
2006-02-13 11:33:00 +01:00
|
|
|
log_notice(LD_GENERAL, "Could not parse '%s' into a number.'", cp);
|
2005-12-24 00:56:42 +01:00
|
|
|
}
|
2007-08-18 20:20:42 +02:00
|
|
|
if (start < now) {
|
|
|
|
add_obs(b, start, v);
|
|
|
|
start += NUM_SECS_BW_SUM_INTERVAL;
|
|
|
|
}
|
2005-12-24 00:56:42 +01:00
|
|
|
});
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Clean up maxima and observed */
|
|
|
|
/* Do we really want to zero this for the purpose of max capacity? */
|
|
|
|
for (i=0; i<NUM_SECS_ROLLING_MEASURE; ++i) {
|
|
|
|
b->obs[i] = 0;
|
|
|
|
}
|
|
|
|
b->total_obs = 0;
|
|
|
|
for (i=0; i<NUM_TOTALS; ++i) {
|
|
|
|
b->maxima[i] = 0;
|
|
|
|
}
|
|
|
|
b->max_total = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!all_ok) {
|
2006-03-26 08:51:26 +02:00
|
|
|
*err = tor_strdup("Parsing of bandwidth history values failed");
|
2005-12-24 00:56:42 +01:00
|
|
|
/* and create fresh arrays */
|
|
|
|
tor_free(read_array);
|
|
|
|
tor_free(write_array);
|
|
|
|
read_array = bw_array_new();
|
|
|
|
write_array = bw_array_new();
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2006-05-30 08:19:06 +02:00
|
|
|
/*********************************************************************/
|
|
|
|
|
2004-12-05 08:10:08 +01:00
|
|
|
/** A list of port numbers that have been used recently. */
|
|
|
|
static smartlist_t *predicted_ports_list=NULL;
|
|
|
|
/** The corresponding most recently used time for each port. */
|
|
|
|
static smartlist_t *predicted_ports_times=NULL;
|
|
|
|
|
2006-07-23 07:18:29 +02:00
|
|
|
/** We just got an application request for a connection with
|
|
|
|
* port <b>port</b>. Remember it for the future, so we can keep
|
|
|
|
* some circuits open that will exit to this port.
|
|
|
|
*/
|
2005-06-11 20:52:12 +02:00
|
|
|
static void
|
2008-04-16 02:10:39 +02:00
|
|
|
add_predicted_port(time_t now, uint16_t port)
|
2005-06-11 20:52:12 +02:00
|
|
|
{
|
2005-06-06 19:03:21 +02:00
|
|
|
/* XXXX we could just use uintptr_t here, I think. */
|
2004-12-05 08:10:08 +01:00
|
|
|
uint16_t *tmp_port = tor_malloc(sizeof(uint16_t));
|
|
|
|
time_t *tmp_time = tor_malloc(sizeof(time_t));
|
|
|
|
*tmp_port = port;
|
|
|
|
*tmp_time = now;
|
2005-06-06 19:03:21 +02:00
|
|
|
rephist_total_alloc += sizeof(uint16_t) + sizeof(time_t);
|
2004-12-05 08:10:08 +01:00
|
|
|
smartlist_add(predicted_ports_list, tmp_port);
|
|
|
|
smartlist_add(predicted_ports_times, tmp_time);
|
|
|
|
}
|
|
|
|
|
2006-07-23 07:18:29 +02:00
|
|
|
/** Initialize whatever memory and structs are needed for predicting
|
|
|
|
* which ports will be used. Also seed it with port 80, so we'll build
|
|
|
|
* circuits on start-up.
|
|
|
|
*/
|
2005-06-11 20:52:12 +02:00
|
|
|
static void
|
|
|
|
predicted_ports_init(void)
|
|
|
|
{
|
2004-12-05 08:10:08 +01:00
|
|
|
predicted_ports_list = smartlist_create();
|
|
|
|
predicted_ports_times = smartlist_create();
|
2008-04-16 02:10:39 +02:00
|
|
|
add_predicted_port(time(NULL), 80); /* add one to kickstart us */
|
2004-12-05 08:10:08 +01:00
|
|
|
}
|
|
|
|
|
2006-07-23 07:18:29 +02:00
|
|
|
/** Free whatever memory is needed for predicting which ports will
|
|
|
|
* be used.
|
|
|
|
*/
|
2005-06-11 20:52:12 +02:00
|
|
|
static void
|
|
|
|
predicted_ports_free(void)
|
|
|
|
{
|
2005-06-06 19:03:21 +02:00
|
|
|
rephist_total_alloc -= smartlist_len(predicted_ports_list)*sizeof(uint16_t);
|
2005-02-28 02:59:18 +01:00
|
|
|
SMARTLIST_FOREACH(predicted_ports_list, char *, cp, tor_free(cp));
|
|
|
|
smartlist_free(predicted_ports_list);
|
2005-06-06 19:03:21 +02:00
|
|
|
rephist_total_alloc -= smartlist_len(predicted_ports_times)*sizeof(time_t);
|
2005-02-28 02:59:18 +01:00
|
|
|
SMARTLIST_FOREACH(predicted_ports_times, char *, cp, tor_free(cp));
|
|
|
|
smartlist_free(predicted_ports_times);
|
|
|
|
}
|
|
|
|
|
2004-12-05 08:10:08 +01:00
|
|
|
/** Remember that <b>port</b> has been asked for as of time <b>now</b>.
|
|
|
|
* This is used for predicting what sorts of streams we'll make in the
|
2005-11-25 09:08:56 +01:00
|
|
|
* future and making exit circuits to anticipate that.
|
2004-12-05 08:10:08 +01:00
|
|
|
*/
|
2005-06-11 20:52:12 +02:00
|
|
|
void
|
2008-04-16 02:10:39 +02:00
|
|
|
rep_hist_note_used_port(time_t now, uint16_t port)
|
2005-06-11 20:52:12 +02:00
|
|
|
{
|
2004-12-05 08:10:08 +01:00
|
|
|
int i;
|
|
|
|
uint16_t *tmp_port;
|
|
|
|
time_t *tmp_time;
|
|
|
|
|
|
|
|
tor_assert(predicted_ports_list);
|
|
|
|
tor_assert(predicted_ports_times);
|
|
|
|
|
2004-12-07 06:33:55 +01:00
|
|
|
if (!port) /* record nothing */
|
2004-12-05 08:10:08 +01:00
|
|
|
return;
|
|
|
|
|
|
|
|
for (i = 0; i < smartlist_len(predicted_ports_list); ++i) {
|
|
|
|
tmp_port = smartlist_get(predicted_ports_list, i);
|
|
|
|
tmp_time = smartlist_get(predicted_ports_times, i);
|
|
|
|
if (*tmp_port == port) {
|
|
|
|
*tmp_time = now;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
/* it's not there yet; we need to add it */
|
2008-04-16 02:10:39 +02:00
|
|
|
add_predicted_port(now, port);
|
2004-12-05 08:10:08 +01:00
|
|
|
}
|
|
|
|
|
2006-03-12 23:48:18 +01:00
|
|
|
/** For this long after we've seen a request for a given port, assume that
|
|
|
|
* we'll want to make connections to the same port in the future. */
|
|
|
|
#define PREDICTED_CIRCS_RELEVANCE_TIME (60*60)
|
2004-12-05 08:10:08 +01:00
|
|
|
|
2004-12-07 16:29:54 +01:00
|
|
|
/** Return a pointer to the list of port numbers that
|
2004-12-05 08:10:08 +01:00
|
|
|
* are likely to be asked for in the near future.
|
2004-12-07 16:29:54 +01:00
|
|
|
*
|
|
|
|
* The caller promises not to mess with it.
|
2004-12-05 08:10:08 +01:00
|
|
|
*/
|
2005-06-11 20:52:12 +02:00
|
|
|
smartlist_t *
|
|
|
|
rep_hist_get_predicted_ports(time_t now)
|
|
|
|
{
|
2004-12-05 08:10:08 +01:00
|
|
|
int i;
|
|
|
|
uint16_t *tmp_port;
|
|
|
|
time_t *tmp_time;
|
|
|
|
|
|
|
|
tor_assert(predicted_ports_list);
|
|
|
|
tor_assert(predicted_ports_times);
|
|
|
|
|
|
|
|
/* clean out obsolete entries */
|
|
|
|
for (i = 0; i < smartlist_len(predicted_ports_list); ++i) {
|
|
|
|
tmp_time = smartlist_get(predicted_ports_times, i);
|
Introduce a notion of 'internal' circs, which are chosen without regard
to the exit policy of the last hop. Intro and rendezvous circs must
be internal circs, to avoid leaking information. Resolve and connect
streams can use internal circs if they want.
New circuit pooling algorithm: make sure to have enough circs around
to satisfy any predicted ports, and also make sure to have 2 internal
circs around if we've required internal circs lately (with high uptime
if we've seen that lately).
Split NewCircuitPeriod config option into NewCircuitPeriod (30 secs),
which describes how often we retry making new circuits if current ones
are dirty, and MaxCircuitDirtiness (10 mins), which describes how long
we're willing to make use of an already-dirty circuit.
Once rendezvous circuits are established, keep using the same circuit as
long as you attach a new stream to it at least every 10 minutes. (So web
browsing doesn't require you to build new rend circs every 30 seconds.)
Cannibalize GENERAL circs to be C_REND, C_INTRO, S_INTRO, and S_REND
circ as necessary, if there are any completed ones lying around when
we try to launch one.
Re-instate the ifdef's to use version-0 style introduce cells, since
there was yet another bug in handling version-1 style. We'll try switching
over again after 0.0.9 is obsolete.
Bugfix: when choosing an exit node for a new non-internal circ, don't take
into account whether it'll be useful for any pending x.onion addresses --
it won't.
Bugfix: we weren't actually publishing the hidden service descriptor when
it became dirty. So we only published it every 20 minutes or so, which
means when you first start your Tor, the hidden service will seem broken.
svn:r3360
2005-01-17 19:13:09 +01:00
|
|
|
if (*tmp_time + PREDICTED_CIRCS_RELEVANCE_TIME < now) {
|
2004-12-05 08:10:08 +01:00
|
|
|
tmp_port = smartlist_get(predicted_ports_list, i);
|
2006-02-13 11:33:00 +01:00
|
|
|
log_debug(LD_CIRC, "Expiring predicted port %d", *tmp_port);
|
2004-12-05 08:10:08 +01:00
|
|
|
smartlist_del(predicted_ports_list, i);
|
|
|
|
smartlist_del(predicted_ports_times, i);
|
2005-06-06 19:03:21 +02:00
|
|
|
rephist_total_alloc -= sizeof(uint16_t)+sizeof(time_t);
|
2004-12-05 08:10:08 +01:00
|
|
|
tor_free(tmp_port);
|
|
|
|
tor_free(tmp_time);
|
|
|
|
i--;
|
|
|
|
}
|
|
|
|
}
|
2004-12-07 16:29:54 +01:00
|
|
|
return predicted_ports_list;
|
2004-12-05 08:10:08 +01:00
|
|
|
}
|
|
|
|
|
2005-11-25 09:08:56 +01:00
|
|
|
/** The user asked us to do a resolve. Rather than keeping track of
|
2008-04-16 02:12:44 +02:00
|
|
|
* timings and such of resolves, we fake it for now by treating
|
2005-11-25 09:08:56 +01:00
|
|
|
* it the same way as a connection to port 80. This way we will continue
|
|
|
|
* to have circuits lying around if the user only uses Tor for resolves.
|
|
|
|
*/
|
|
|
|
void
|
|
|
|
rep_hist_note_used_resolve(time_t now)
|
|
|
|
{
|
2008-04-16 02:10:39 +02:00
|
|
|
rep_hist_note_used_port(now, 80);
|
2005-11-25 09:08:56 +01:00
|
|
|
}
|
|
|
|
|
Introduce a notion of 'internal' circs, which are chosen without regard
to the exit policy of the last hop. Intro and rendezvous circs must
be internal circs, to avoid leaking information. Resolve and connect
streams can use internal circs if they want.
New circuit pooling algorithm: make sure to have enough circs around
to satisfy any predicted ports, and also make sure to have 2 internal
circs around if we've required internal circs lately (with high uptime
if we've seen that lately).
Split NewCircuitPeriod config option into NewCircuitPeriod (30 secs),
which describes how often we retry making new circuits if current ones
are dirty, and MaxCircuitDirtiness (10 mins), which describes how long
we're willing to make use of an already-dirty circuit.
Once rendezvous circuits are established, keep using the same circuit as
long as you attach a new stream to it at least every 10 minutes. (So web
browsing doesn't require you to build new rend circs every 30 seconds.)
Cannibalize GENERAL circs to be C_REND, C_INTRO, S_INTRO, and S_REND
circ as necessary, if there are any completed ones lying around when
we try to launch one.
Re-instate the ifdef's to use version-0 style introduce cells, since
there was yet another bug in handling version-1 style. We'll try switching
over again after 0.0.9 is obsolete.
Bugfix: when choosing an exit node for a new non-internal circ, don't take
into account whether it'll be useful for any pending x.onion addresses --
it won't.
Bugfix: we weren't actually publishing the hidden service descriptor when
it became dirty. So we only published it every 20 minutes or so, which
means when you first start your Tor, the hidden service will seem broken.
svn:r3360
2005-01-17 19:13:09 +01:00
|
|
|
/** The last time at which we needed an internal circ. */
|
2005-11-25 09:08:56 +01:00
|
|
|
static time_t predicted_internal_time = 0;
|
Introduce a notion of 'internal' circs, which are chosen without regard
to the exit policy of the last hop. Intro and rendezvous circs must
be internal circs, to avoid leaking information. Resolve and connect
streams can use internal circs if they want.
New circuit pooling algorithm: make sure to have enough circs around
to satisfy any predicted ports, and also make sure to have 2 internal
circs around if we've required internal circs lately (with high uptime
if we've seen that lately).
Split NewCircuitPeriod config option into NewCircuitPeriod (30 secs),
which describes how often we retry making new circuits if current ones
are dirty, and MaxCircuitDirtiness (10 mins), which describes how long
we're willing to make use of an already-dirty circuit.
Once rendezvous circuits are established, keep using the same circuit as
long as you attach a new stream to it at least every 10 minutes. (So web
browsing doesn't require you to build new rend circs every 30 seconds.)
Cannibalize GENERAL circs to be C_REND, C_INTRO, S_INTRO, and S_REND
circ as necessary, if there are any completed ones lying around when
we try to launch one.
Re-instate the ifdef's to use version-0 style introduce cells, since
there was yet another bug in handling version-1 style. We'll try switching
over again after 0.0.9 is obsolete.
Bugfix: when choosing an exit node for a new non-internal circ, don't take
into account whether it'll be useful for any pending x.onion addresses --
it won't.
Bugfix: we weren't actually publishing the hidden service descriptor when
it became dirty. So we only published it every 20 minutes or so, which
means when you first start your Tor, the hidden service will seem broken.
svn:r3360
2005-01-17 19:13:09 +01:00
|
|
|
/** The last time we needed an internal circ with good uptime. */
|
2005-11-25 09:08:56 +01:00
|
|
|
static time_t predicted_internal_uptime_time = 0;
|
Introduce a notion of 'internal' circs, which are chosen without regard
to the exit policy of the last hop. Intro and rendezvous circs must
be internal circs, to avoid leaking information. Resolve and connect
streams can use internal circs if they want.
New circuit pooling algorithm: make sure to have enough circs around
to satisfy any predicted ports, and also make sure to have 2 internal
circs around if we've required internal circs lately (with high uptime
if we've seen that lately).
Split NewCircuitPeriod config option into NewCircuitPeriod (30 secs),
which describes how often we retry making new circuits if current ones
are dirty, and MaxCircuitDirtiness (10 mins), which describes how long
we're willing to make use of an already-dirty circuit.
Once rendezvous circuits are established, keep using the same circuit as
long as you attach a new stream to it at least every 10 minutes. (So web
browsing doesn't require you to build new rend circs every 30 seconds.)
Cannibalize GENERAL circs to be C_REND, C_INTRO, S_INTRO, and S_REND
circ as necessary, if there are any completed ones lying around when
we try to launch one.
Re-instate the ifdef's to use version-0 style introduce cells, since
there was yet another bug in handling version-1 style. We'll try switching
over again after 0.0.9 is obsolete.
Bugfix: when choosing an exit node for a new non-internal circ, don't take
into account whether it'll be useful for any pending x.onion addresses --
it won't.
Bugfix: we weren't actually publishing the hidden service descriptor when
it became dirty. So we only published it every 20 minutes or so, which
means when you first start your Tor, the hidden service will seem broken.
svn:r3360
2005-01-17 19:13:09 +01:00
|
|
|
/** The last time we needed an internal circ with good capacity. */
|
2005-11-25 09:08:56 +01:00
|
|
|
static time_t predicted_internal_capacity_time = 0;
|
Introduce a notion of 'internal' circs, which are chosen without regard
to the exit policy of the last hop. Intro and rendezvous circs must
be internal circs, to avoid leaking information. Resolve and connect
streams can use internal circs if they want.
New circuit pooling algorithm: make sure to have enough circs around
to satisfy any predicted ports, and also make sure to have 2 internal
circs around if we've required internal circs lately (with high uptime
if we've seen that lately).
Split NewCircuitPeriod config option into NewCircuitPeriod (30 secs),
which describes how often we retry making new circuits if current ones
are dirty, and MaxCircuitDirtiness (10 mins), which describes how long
we're willing to make use of an already-dirty circuit.
Once rendezvous circuits are established, keep using the same circuit as
long as you attach a new stream to it at least every 10 minutes. (So web
browsing doesn't require you to build new rend circs every 30 seconds.)
Cannibalize GENERAL circs to be C_REND, C_INTRO, S_INTRO, and S_REND
circ as necessary, if there are any completed ones lying around when
we try to launch one.
Re-instate the ifdef's to use version-0 style introduce cells, since
there was yet another bug in handling version-1 style. We'll try switching
over again after 0.0.9 is obsolete.
Bugfix: when choosing an exit node for a new non-internal circ, don't take
into account whether it'll be useful for any pending x.onion addresses --
it won't.
Bugfix: we weren't actually publishing the hidden service descriptor when
it became dirty. So we only published it every 20 minutes or so, which
means when you first start your Tor, the hidden service will seem broken.
svn:r3360
2005-01-17 19:13:09 +01:00
|
|
|
|
|
|
|
/** Remember that we used an internal circ at time <b>now</b>. */
|
2005-06-11 20:52:12 +02:00
|
|
|
void
|
2005-11-25 09:08:56 +01:00
|
|
|
rep_hist_note_used_internal(time_t now, int need_uptime, int need_capacity)
|
2005-06-11 20:52:12 +02:00
|
|
|
{
|
2005-11-25 09:08:56 +01:00
|
|
|
predicted_internal_time = now;
|
Introduce a notion of 'internal' circs, which are chosen without regard
to the exit policy of the last hop. Intro and rendezvous circs must
be internal circs, to avoid leaking information. Resolve and connect
streams can use internal circs if they want.
New circuit pooling algorithm: make sure to have enough circs around
to satisfy any predicted ports, and also make sure to have 2 internal
circs around if we've required internal circs lately (with high uptime
if we've seen that lately).
Split NewCircuitPeriod config option into NewCircuitPeriod (30 secs),
which describes how often we retry making new circuits if current ones
are dirty, and MaxCircuitDirtiness (10 mins), which describes how long
we're willing to make use of an already-dirty circuit.
Once rendezvous circuits are established, keep using the same circuit as
long as you attach a new stream to it at least every 10 minutes. (So web
browsing doesn't require you to build new rend circs every 30 seconds.)
Cannibalize GENERAL circs to be C_REND, C_INTRO, S_INTRO, and S_REND
circ as necessary, if there are any completed ones lying around when
we try to launch one.
Re-instate the ifdef's to use version-0 style introduce cells, since
there was yet another bug in handling version-1 style. We'll try switching
over again after 0.0.9 is obsolete.
Bugfix: when choosing an exit node for a new non-internal circ, don't take
into account whether it'll be useful for any pending x.onion addresses --
it won't.
Bugfix: we weren't actually publishing the hidden service descriptor when
it became dirty. So we only published it every 20 minutes or so, which
means when you first start your Tor, the hidden service will seem broken.
svn:r3360
2005-01-17 19:13:09 +01:00
|
|
|
if (need_uptime)
|
2005-11-25 09:08:56 +01:00
|
|
|
predicted_internal_uptime_time = now;
|
Introduce a notion of 'internal' circs, which are chosen without regard
to the exit policy of the last hop. Intro and rendezvous circs must
be internal circs, to avoid leaking information. Resolve and connect
streams can use internal circs if they want.
New circuit pooling algorithm: make sure to have enough circs around
to satisfy any predicted ports, and also make sure to have 2 internal
circs around if we've required internal circs lately (with high uptime
if we've seen that lately).
Split NewCircuitPeriod config option into NewCircuitPeriod (30 secs),
which describes how often we retry making new circuits if current ones
are dirty, and MaxCircuitDirtiness (10 mins), which describes how long
we're willing to make use of an already-dirty circuit.
Once rendezvous circuits are established, keep using the same circuit as
long as you attach a new stream to it at least every 10 minutes. (So web
browsing doesn't require you to build new rend circs every 30 seconds.)
Cannibalize GENERAL circs to be C_REND, C_INTRO, S_INTRO, and S_REND
circ as necessary, if there are any completed ones lying around when
we try to launch one.
Re-instate the ifdef's to use version-0 style introduce cells, since
there was yet another bug in handling version-1 style. We'll try switching
over again after 0.0.9 is obsolete.
Bugfix: when choosing an exit node for a new non-internal circ, don't take
into account whether it'll be useful for any pending x.onion addresses --
it won't.
Bugfix: we weren't actually publishing the hidden service descriptor when
it became dirty. So we only published it every 20 minutes or so, which
means when you first start your Tor, the hidden service will seem broken.
svn:r3360
2005-01-17 19:13:09 +01:00
|
|
|
if (need_capacity)
|
2005-11-25 09:08:56 +01:00
|
|
|
predicted_internal_capacity_time = now;
|
Introduce a notion of 'internal' circs, which are chosen without regard
to the exit policy of the last hop. Intro and rendezvous circs must
be internal circs, to avoid leaking information. Resolve and connect
streams can use internal circs if they want.
New circuit pooling algorithm: make sure to have enough circs around
to satisfy any predicted ports, and also make sure to have 2 internal
circs around if we've required internal circs lately (with high uptime
if we've seen that lately).
Split NewCircuitPeriod config option into NewCircuitPeriod (30 secs),
which describes how often we retry making new circuits if current ones
are dirty, and MaxCircuitDirtiness (10 mins), which describes how long
we're willing to make use of an already-dirty circuit.
Once rendezvous circuits are established, keep using the same circuit as
long as you attach a new stream to it at least every 10 minutes. (So web
browsing doesn't require you to build new rend circs every 30 seconds.)
Cannibalize GENERAL circs to be C_REND, C_INTRO, S_INTRO, and S_REND
circ as necessary, if there are any completed ones lying around when
we try to launch one.
Re-instate the ifdef's to use version-0 style introduce cells, since
there was yet another bug in handling version-1 style. We'll try switching
over again after 0.0.9 is obsolete.
Bugfix: when choosing an exit node for a new non-internal circ, don't take
into account whether it'll be useful for any pending x.onion addresses --
it won't.
Bugfix: we weren't actually publishing the hidden service descriptor when
it became dirty. So we only published it every 20 minutes or so, which
means when you first start your Tor, the hidden service will seem broken.
svn:r3360
2005-01-17 19:13:09 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/** Return 1 if we've used an internal circ recently; else return 0. */
|
2005-06-11 20:52:12 +02:00
|
|
|
int
|
2005-12-14 21:40:40 +01:00
|
|
|
rep_hist_get_predicted_internal(time_t now, int *need_uptime,
|
|
|
|
int *need_capacity)
|
2005-06-11 20:52:12 +02:00
|
|
|
{
|
2005-11-25 09:08:56 +01:00
|
|
|
if (!predicted_internal_time) { /* initialize it */
|
|
|
|
predicted_internal_time = now;
|
|
|
|
predicted_internal_uptime_time = now;
|
|
|
|
predicted_internal_capacity_time = now;
|
2005-08-13 02:22:07 +02:00
|
|
|
}
|
2005-11-25 09:08:56 +01:00
|
|
|
if (predicted_internal_time + PREDICTED_CIRCS_RELEVANCE_TIME < now)
|
Introduce a notion of 'internal' circs, which are chosen without regard
to the exit policy of the last hop. Intro and rendezvous circs must
be internal circs, to avoid leaking information. Resolve and connect
streams can use internal circs if they want.
New circuit pooling algorithm: make sure to have enough circs around
to satisfy any predicted ports, and also make sure to have 2 internal
circs around if we've required internal circs lately (with high uptime
if we've seen that lately).
Split NewCircuitPeriod config option into NewCircuitPeriod (30 secs),
which describes how often we retry making new circuits if current ones
are dirty, and MaxCircuitDirtiness (10 mins), which describes how long
we're willing to make use of an already-dirty circuit.
Once rendezvous circuits are established, keep using the same circuit as
long as you attach a new stream to it at least every 10 minutes. (So web
browsing doesn't require you to build new rend circs every 30 seconds.)
Cannibalize GENERAL circs to be C_REND, C_INTRO, S_INTRO, and S_REND
circ as necessary, if there are any completed ones lying around when
we try to launch one.
Re-instate the ifdef's to use version-0 style introduce cells, since
there was yet another bug in handling version-1 style. We'll try switching
over again after 0.0.9 is obsolete.
Bugfix: when choosing an exit node for a new non-internal circ, don't take
into account whether it'll be useful for any pending x.onion addresses --
it won't.
Bugfix: we weren't actually publishing the hidden service descriptor when
it became dirty. So we only published it every 20 minutes or so, which
means when you first start your Tor, the hidden service will seem broken.
svn:r3360
2005-01-17 19:13:09 +01:00
|
|
|
return 0; /* too long ago */
|
2006-09-30 21:22:24 +02:00
|
|
|
if (predicted_internal_uptime_time + PREDICTED_CIRCS_RELEVANCE_TIME >= now)
|
Introduce a notion of 'internal' circs, which are chosen without regard
to the exit policy of the last hop. Intro and rendezvous circs must
be internal circs, to avoid leaking information. Resolve and connect
streams can use internal circs if they want.
New circuit pooling algorithm: make sure to have enough circs around
to satisfy any predicted ports, and also make sure to have 2 internal
circs around if we've required internal circs lately (with high uptime
if we've seen that lately).
Split NewCircuitPeriod config option into NewCircuitPeriod (30 secs),
which describes how often we retry making new circuits if current ones
are dirty, and MaxCircuitDirtiness (10 mins), which describes how long
we're willing to make use of an already-dirty circuit.
Once rendezvous circuits are established, keep using the same circuit as
long as you attach a new stream to it at least every 10 minutes. (So web
browsing doesn't require you to build new rend circs every 30 seconds.)
Cannibalize GENERAL circs to be C_REND, C_INTRO, S_INTRO, and S_REND
circ as necessary, if there are any completed ones lying around when
we try to launch one.
Re-instate the ifdef's to use version-0 style introduce cells, since
there was yet another bug in handling version-1 style. We'll try switching
over again after 0.0.9 is obsolete.
Bugfix: when choosing an exit node for a new non-internal circ, don't take
into account whether it'll be useful for any pending x.onion addresses --
it won't.
Bugfix: we weren't actually publishing the hidden service descriptor when
it became dirty. So we only published it every 20 minutes or so, which
means when you first start your Tor, the hidden service will seem broken.
svn:r3360
2005-01-17 19:13:09 +01:00
|
|
|
*need_uptime = 1;
|
2006-09-30 21:22:24 +02:00
|
|
|
if (predicted_internal_capacity_time + PREDICTED_CIRCS_RELEVANCE_TIME >= now)
|
Introduce a notion of 'internal' circs, which are chosen without regard
to the exit policy of the last hop. Intro and rendezvous circs must
be internal circs, to avoid leaking information. Resolve and connect
streams can use internal circs if they want.
New circuit pooling algorithm: make sure to have enough circs around
to satisfy any predicted ports, and also make sure to have 2 internal
circs around if we've required internal circs lately (with high uptime
if we've seen that lately).
Split NewCircuitPeriod config option into NewCircuitPeriod (30 secs),
which describes how often we retry making new circuits if current ones
are dirty, and MaxCircuitDirtiness (10 mins), which describes how long
we're willing to make use of an already-dirty circuit.
Once rendezvous circuits are established, keep using the same circuit as
long as you attach a new stream to it at least every 10 minutes. (So web
browsing doesn't require you to build new rend circs every 30 seconds.)
Cannibalize GENERAL circs to be C_REND, C_INTRO, S_INTRO, and S_REND
circ as necessary, if there are any completed ones lying around when
we try to launch one.
Re-instate the ifdef's to use version-0 style introduce cells, since
there was yet another bug in handling version-1 style. We'll try switching
over again after 0.0.9 is obsolete.
Bugfix: when choosing an exit node for a new non-internal circ, don't take
into account whether it'll be useful for any pending x.onion addresses --
it won't.
Bugfix: we weren't actually publishing the hidden service descriptor when
it became dirty. So we only published it every 20 minutes or so, which
means when you first start your Tor, the hidden service will seem broken.
svn:r3360
2005-01-17 19:13:09 +01:00
|
|
|
*need_capacity = 1;
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2006-07-22 09:15:34 +02:00
|
|
|
/** Any ports used lately? These are pre-seeded if we just started
|
|
|
|
* up or if we're running a hidden service. */
|
|
|
|
int
|
|
|
|
any_predicted_circuits(time_t now)
|
|
|
|
{
|
|
|
|
return smartlist_len(predicted_ports_list) ||
|
|
|
|
predicted_internal_time + PREDICTED_CIRCS_RELEVANCE_TIME >= now;
|
|
|
|
}
|
|
|
|
|
2006-05-30 08:19:06 +02:00
|
|
|
/** Return 1 if we have no need for circuits currently, else return 0. */
|
|
|
|
int
|
2006-06-09 00:36:13 +02:00
|
|
|
rep_hist_circbuilding_dormant(time_t now)
|
2006-05-30 08:19:06 +02:00
|
|
|
{
|
2006-07-22 09:15:34 +02:00
|
|
|
if (any_predicted_circuits(now))
|
2006-06-03 04:56:44 +02:00
|
|
|
return 0;
|
|
|
|
|
|
|
|
/* see if we'll still need to build testing circuits */
|
2008-02-19 23:01:45 +01:00
|
|
|
if (server_mode(get_options()) &&
|
|
|
|
(!check_whether_orport_reachable() || !circuit_enough_testing_circs()))
|
2006-06-03 04:56:44 +02:00
|
|
|
return 0;
|
|
|
|
if (!check_whether_dirport_reachable())
|
|
|
|
return 0;
|
|
|
|
|
2006-05-30 08:19:06 +02:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2006-10-31 20:17:07 +01:00
|
|
|
static uint32_t n_signed_dir_objs = 0;
|
|
|
|
static uint32_t n_signed_routerdescs = 0;
|
|
|
|
static uint32_t n_verified_dir_objs = 0;
|
|
|
|
static uint32_t n_verified_routerdescs = 0;
|
|
|
|
static uint32_t n_onionskins_encrypted = 0;
|
|
|
|
static uint32_t n_onionskins_decrypted = 0;
|
|
|
|
static uint32_t n_tls_client_handshakes = 0;
|
|
|
|
static uint32_t n_tls_server_handshakes = 0;
|
|
|
|
static uint32_t n_rend_client_ops = 0;
|
|
|
|
static uint32_t n_rend_mid_ops = 0;
|
|
|
|
static uint32_t n_rend_server_ops = 0;
|
|
|
|
|
2007-02-24 08:50:38 +01:00
|
|
|
/** Increment the count of the number of times we've done <b>operation</b>. */
|
2006-10-31 20:17:07 +01:00
|
|
|
void
|
|
|
|
note_crypto_pk_op(pk_op_t operation)
|
|
|
|
{
|
|
|
|
switch (operation)
|
|
|
|
{
|
|
|
|
case SIGN_DIR:
|
|
|
|
n_signed_dir_objs++;
|
|
|
|
break;
|
|
|
|
case SIGN_RTR:
|
|
|
|
n_signed_routerdescs++;
|
|
|
|
break;
|
|
|
|
case VERIFY_DIR:
|
|
|
|
n_verified_dir_objs++;
|
|
|
|
break;
|
|
|
|
case VERIFY_RTR:
|
|
|
|
n_verified_routerdescs++;
|
|
|
|
break;
|
|
|
|
case ENC_ONIONSKIN:
|
|
|
|
n_onionskins_encrypted++;
|
|
|
|
break;
|
|
|
|
case DEC_ONIONSKIN:
|
|
|
|
n_onionskins_decrypted++;
|
|
|
|
break;
|
|
|
|
case TLS_HANDSHAKE_C:
|
|
|
|
n_tls_client_handshakes++;
|
|
|
|
break;
|
|
|
|
case TLS_HANDSHAKE_S:
|
2006-11-01 14:33:49 +01:00
|
|
|
n_tls_server_handshakes++;
|
2006-10-31 20:17:07 +01:00
|
|
|
break;
|
|
|
|
case REND_CLIENT:
|
|
|
|
n_rend_client_ops++;
|
|
|
|
break;
|
|
|
|
case REND_MID:
|
|
|
|
n_rend_mid_ops++;
|
|
|
|
break;
|
|
|
|
case REND_SERVER:
|
|
|
|
n_rend_server_ops++;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
log_warn(LD_BUG, "Unknown pk operation %d", operation);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2007-02-16 21:01:02 +01:00
|
|
|
/** Log the number of times we've done each public/private-key operation. */
|
2006-10-31 20:17:07 +01:00
|
|
|
void
|
|
|
|
dump_pk_ops(int severity)
|
|
|
|
{
|
|
|
|
log(severity, LD_GENERAL,
|
|
|
|
"PK operations: %lu directory objects signed, "
|
|
|
|
"%lu directory objects verified, "
|
|
|
|
"%lu routerdescs signed, "
|
|
|
|
"%lu routerdescs verified, "
|
|
|
|
"%lu onionskins encrypted, "
|
|
|
|
"%lu onionskins decrypted, "
|
|
|
|
"%lu client-side TLS handshakes, "
|
|
|
|
"%lu server-side TLS handshakes, "
|
|
|
|
"%lu rendezvous client operations, "
|
|
|
|
"%lu rendezvous middle operations, "
|
|
|
|
"%lu rendezvous server operations.",
|
|
|
|
(unsigned long) n_signed_dir_objs,
|
|
|
|
(unsigned long) n_verified_dir_objs,
|
|
|
|
(unsigned long) n_signed_routerdescs,
|
|
|
|
(unsigned long) n_verified_routerdescs,
|
|
|
|
(unsigned long) n_onionskins_encrypted,
|
|
|
|
(unsigned long) n_onionskins_decrypted,
|
|
|
|
(unsigned long) n_tls_client_handshakes,
|
|
|
|
(unsigned long) n_tls_server_handshakes,
|
|
|
|
(unsigned long) n_rend_client_ops,
|
|
|
|
(unsigned long) n_rend_mid_ops,
|
|
|
|
(unsigned long) n_rend_server_ops);
|
|
|
|
}
|
|
|
|
|
2005-06-11 20:52:12 +02:00
|
|
|
/** Free all storage held by the OR/link history caches, by the
|
|
|
|
* bandwidth history arrays, or by the port history. */
|
|
|
|
void
|
|
|
|
rep_hist_free_all(void)
|
2005-02-11 00:18:39 +01:00
|
|
|
{
|
2005-10-18 22:12:22 +02:00
|
|
|
digestmap_free(history_map, free_or_history);
|
2005-02-11 00:18:39 +01:00
|
|
|
tor_free(read_array);
|
|
|
|
tor_free(write_array);
|
2005-02-28 02:59:18 +01:00
|
|
|
predicted_ports_free();
|
2005-02-11 00:18:39 +01:00
|
|
|
}
|
2005-06-09 21:03:31 +02:00
|
|
|
|
2007-04-30 19:46:13 +02:00
|
|
|
/****************** hidden service usage statistics ******************/
|
|
|
|
|
|
|
|
/** How large are the intervals for which we track and report hidden service
|
|
|
|
* use? */
|
|
|
|
#define NUM_SECS_HS_USAGE_SUM_INTERVAL (15*60)
|
|
|
|
/** How far in the past do we remember and publish hidden service use? */
|
|
|
|
#define NUM_SECS_HS_USAGE_SUM_IS_VALID (24*60*60)
|
|
|
|
/** How many hidden service usage intervals do we remember? (derived) */
|
|
|
|
#define NUM_TOTALS_HS_USAGE (NUM_SECS_HS_USAGE_SUM_IS_VALID/ \
|
|
|
|
NUM_SECS_HS_USAGE_SUM_INTERVAL)
|
|
|
|
|
|
|
|
/** List element containing a service id and the count. */
|
|
|
|
typedef struct hs_usage_list_elem_t {
|
|
|
|
/** Service id of this elem. */
|
2007-11-29 16:25:04 +01:00
|
|
|
char service_id[REND_SERVICE_ID_LEN_BASE32+1];
|
2007-04-30 19:46:13 +02:00
|
|
|
/** Number of occurrences for the given service id. */
|
|
|
|
uint32_t count;
|
|
|
|
/* Pointer to next list elem */
|
|
|
|
struct hs_usage_list_elem_t *next;
|
|
|
|
} hs_usage_list_elem_t;
|
|
|
|
|
2008-02-12 21:20:52 +01:00
|
|
|
/** Ordered list that stores service ids and the number of observations. It is
|
2007-04-30 19:46:13 +02:00
|
|
|
* ordered by the number of occurrences in descending order. Its purpose is to
|
|
|
|
* calculate the frequency distribution when the period is over. */
|
|
|
|
typedef struct hs_usage_list_t {
|
|
|
|
/* Pointer to the first element in the list. */
|
|
|
|
hs_usage_list_elem_t *start;
|
|
|
|
/* Number of total occurrences for all list elements. */
|
|
|
|
uint32_t total_count;
|
|
|
|
/* Number of service ids, i.e. number of list elements. */
|
|
|
|
uint32_t total_service_ids;
|
|
|
|
} hs_usage_list_t;
|
|
|
|
|
|
|
|
/** Tracks service-related observations in the current period and their
|
|
|
|
* history. */
|
|
|
|
typedef struct hs_usage_service_related_observation_t {
|
|
|
|
/** Ordered list that stores service ids and the number of observations in
|
|
|
|
* the current period. It is ordered by the number of occurrences in
|
|
|
|
* descending order. Its purpose is to calculate the frequency distribution
|
|
|
|
* when the period is over. */
|
|
|
|
hs_usage_list_t *list;
|
|
|
|
/** Circular arrays that store the history of observations. totals stores all
|
|
|
|
* observations, twenty (ten, five) the number of observations related to a
|
|
|
|
* service id being accounted for the top 20 (10, 5) percent of all
|
|
|
|
* observations. */
|
|
|
|
uint32_t totals[NUM_TOTALS_HS_USAGE];
|
|
|
|
uint32_t five[NUM_TOTALS_HS_USAGE];
|
|
|
|
uint32_t ten[NUM_TOTALS_HS_USAGE];
|
|
|
|
uint32_t twenty[NUM_TOTALS_HS_USAGE];
|
|
|
|
} hs_usage_service_related_observation_t;
|
|
|
|
|
|
|
|
/** Tracks the history of general period-related observations, i.e. those that
|
|
|
|
* cannot be related to a specific service id. */
|
|
|
|
typedef struct hs_usage_general_period_related_observations_t {
|
|
|
|
/** Circular array that stores the history of observations. */
|
|
|
|
uint32_t totals[NUM_TOTALS_HS_USAGE];
|
|
|
|
} hs_usage_general_period_related_observations_t;
|
|
|
|
|
|
|
|
/** Keeps information about the current observation period and its relation to
|
|
|
|
* the histories of observations. */
|
|
|
|
typedef struct hs_usage_current_observation_period_t {
|
|
|
|
/** Where do we write the next history entry? */
|
|
|
|
int next_idx;
|
|
|
|
/** How many values in history have been set ever? (upper bound!) */
|
|
|
|
int num_set;
|
|
|
|
/** When did this period begin? */
|
|
|
|
time_t start_of_current_period;
|
|
|
|
/** When does the next period begin? */
|
|
|
|
time_t start_of_next_period;
|
|
|
|
} hs_usage_current_observation_period_t;
|
|
|
|
|
|
|
|
static hs_usage_current_observation_period_t *current_period = NULL;
|
|
|
|
static hs_usage_service_related_observation_t *publish_total = NULL;
|
|
|
|
static hs_usage_service_related_observation_t *publish_novel = NULL;
|
|
|
|
static hs_usage_service_related_observation_t *fetch_total = NULL;
|
|
|
|
static hs_usage_service_related_observation_t *fetch_successful = NULL;
|
|
|
|
static hs_usage_general_period_related_observations_t *descs = NULL;
|
|
|
|
|
|
|
|
/** Creates an empty ordered list element. */
|
|
|
|
static hs_usage_list_elem_t *
|
|
|
|
hs_usage_list_elem_new(void)
|
|
|
|
{
|
|
|
|
hs_usage_list_elem_t *e;
|
|
|
|
e = tor_malloc_zero(sizeof(hs_usage_list_elem_t));
|
|
|
|
rephist_total_alloc += sizeof(hs_usage_list_elem_t);
|
|
|
|
e->count = 1;
|
|
|
|
e->next = NULL;
|
|
|
|
return e;
|
|
|
|
}
|
|
|
|
|
|
|
|
/** Creates an empty ordered list. */
|
|
|
|
static hs_usage_list_t *
|
|
|
|
hs_usage_list_new(void)
|
|
|
|
{
|
|
|
|
hs_usage_list_t *l;
|
|
|
|
l = tor_malloc_zero(sizeof(hs_usage_list_t));
|
|
|
|
rephist_total_alloc += sizeof(hs_usage_list_t);
|
|
|
|
l->start = NULL;
|
|
|
|
l->total_count = 0;
|
|
|
|
l->total_service_ids = 0;
|
|
|
|
return l;
|
|
|
|
}
|
|
|
|
|
|
|
|
/** Creates an empty structure for storing service-related observations. */
|
|
|
|
static hs_usage_service_related_observation_t *
|
|
|
|
hs_usage_service_related_observation_new(void)
|
|
|
|
{
|
|
|
|
hs_usage_service_related_observation_t *h;
|
|
|
|
h = tor_malloc_zero(sizeof(hs_usage_service_related_observation_t));
|
|
|
|
rephist_total_alloc += sizeof(hs_usage_service_related_observation_t);
|
|
|
|
h->list = hs_usage_list_new();
|
|
|
|
return h;
|
|
|
|
}
|
|
|
|
|
|
|
|
/** Creates an empty structure for storing general period-related
|
|
|
|
* observations. */
|
|
|
|
static hs_usage_general_period_related_observations_t *
|
|
|
|
hs_usage_general_period_related_observations_new(void)
|
|
|
|
{
|
|
|
|
hs_usage_general_period_related_observations_t *p;
|
|
|
|
p = tor_malloc_zero(sizeof(hs_usage_general_period_related_observations_t));
|
|
|
|
rephist_total_alloc+= sizeof(hs_usage_general_period_related_observations_t);
|
|
|
|
return p;
|
|
|
|
}
|
|
|
|
|
|
|
|
/** Creates an empty structure for storing period-specific information. */
|
|
|
|
static hs_usage_current_observation_period_t *
|
|
|
|
hs_usage_current_observation_period_new(void)
|
|
|
|
{
|
|
|
|
hs_usage_current_observation_period_t *c;
|
|
|
|
time_t now;
|
|
|
|
c = tor_malloc_zero(sizeof(hs_usage_current_observation_period_t));
|
|
|
|
rephist_total_alloc += sizeof(hs_usage_current_observation_period_t);
|
|
|
|
now = time(NULL);
|
|
|
|
c->start_of_current_period = now;
|
|
|
|
c->start_of_next_period = now + NUM_SECS_HS_USAGE_SUM_INTERVAL;
|
|
|
|
return c;
|
|
|
|
}
|
|
|
|
|
|
|
|
/** Initializes the structures for collecting hidden service usage data. */
|
|
|
|
static void
|
|
|
|
hs_usage_init(void)
|
|
|
|
{
|
|
|
|
current_period = hs_usage_current_observation_period_new();
|
|
|
|
publish_total = hs_usage_service_related_observation_new();
|
|
|
|
publish_novel = hs_usage_service_related_observation_new();
|
|
|
|
fetch_total = hs_usage_service_related_observation_new();
|
|
|
|
fetch_successful = hs_usage_service_related_observation_new();
|
|
|
|
descs = hs_usage_general_period_related_observations_new();
|
|
|
|
}
|
|
|
|
|
|
|
|
/** Clears the given ordered list by resetting its attributes and releasing
|
|
|
|
* the memory allocated by its elements. */
|
|
|
|
static void
|
2007-04-30 19:46:19 +02:00
|
|
|
hs_usage_list_clear(hs_usage_list_t *lst)
|
2007-04-30 19:46:13 +02:00
|
|
|
{
|
|
|
|
/* walk through elements and free memory */
|
2007-04-30 19:46:19 +02:00
|
|
|
hs_usage_list_elem_t *current = lst->start;
|
2007-04-30 19:46:13 +02:00
|
|
|
hs_usage_list_elem_t *tmp;
|
|
|
|
while (current != NULL) {
|
|
|
|
tmp = current->next;
|
|
|
|
rephist_total_alloc -= sizeof(hs_usage_list_elem_t);
|
|
|
|
tor_free(current);
|
|
|
|
current = tmp;
|
|
|
|
}
|
|
|
|
/* reset attributes */
|
2007-04-30 19:46:19 +02:00
|
|
|
lst->start = NULL;
|
|
|
|
lst->total_count = 0;
|
|
|
|
lst->total_service_ids = 0;
|
2007-04-30 19:46:13 +02:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
/** Frees the memory used by the given list. */
|
|
|
|
static void
|
2007-04-30 19:46:19 +02:00
|
|
|
hs_usage_list_free(hs_usage_list_t *lst)
|
2007-04-30 19:46:13 +02:00
|
|
|
{
|
2007-04-30 19:46:19 +02:00
|
|
|
if (!lst)
|
|
|
|
return;
|
|
|
|
hs_usage_list_clear(lst);
|
2007-04-30 19:46:13 +02:00
|
|
|
rephist_total_alloc -= sizeof(hs_usage_list_t);
|
2007-04-30 19:46:19 +02:00
|
|
|
tor_free(lst);
|
2007-04-30 19:46:13 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/** Frees the memory used by the given service-related observations. */
|
|
|
|
static void
|
|
|
|
hs_usage_service_related_observation_free(
|
|
|
|
hs_usage_service_related_observation_t *s)
|
|
|
|
{
|
2007-04-30 19:46:19 +02:00
|
|
|
if (!s)
|
|
|
|
return;
|
2007-04-30 19:46:13 +02:00
|
|
|
hs_usage_list_free(s->list);
|
|
|
|
rephist_total_alloc -= sizeof(hs_usage_service_related_observation_t);
|
|
|
|
tor_free(s);
|
|
|
|
}
|
|
|
|
|
|
|
|
/** Frees the memory used by the given period-specific observations. */
|
|
|
|
static void
|
|
|
|
hs_usage_general_period_related_observations_free(
|
|
|
|
hs_usage_general_period_related_observations_t *s)
|
|
|
|
{
|
|
|
|
rephist_total_alloc-=sizeof(hs_usage_general_period_related_observations_t);
|
|
|
|
tor_free(s);
|
|
|
|
}
|
|
|
|
|
|
|
|
/** Frees the memory used by period-specific information. */
|
|
|
|
static void
|
|
|
|
hs_usage_current_observation_period_free(
|
|
|
|
hs_usage_current_observation_period_t *s)
|
|
|
|
{
|
|
|
|
rephist_total_alloc -= sizeof(hs_usage_current_observation_period_t);
|
|
|
|
tor_free(s);
|
|
|
|
}
|
|
|
|
|
|
|
|
/** Frees all memory that was used for collecting hidden service usage data. */
|
|
|
|
void
|
|
|
|
hs_usage_free_all(void)
|
|
|
|
{
|
|
|
|
hs_usage_general_period_related_observations_free(descs);
|
2007-04-30 19:46:19 +02:00
|
|
|
descs = NULL;
|
2007-04-30 19:46:13 +02:00
|
|
|
hs_usage_service_related_observation_free(fetch_successful);
|
|
|
|
hs_usage_service_related_observation_free(fetch_total);
|
|
|
|
hs_usage_service_related_observation_free(publish_novel);
|
|
|
|
hs_usage_service_related_observation_free(publish_total);
|
2007-04-30 19:46:19 +02:00
|
|
|
fetch_successful = fetch_total = publish_novel = publish_total = NULL;
|
2007-04-30 19:46:13 +02:00
|
|
|
hs_usage_current_observation_period_free(current_period);
|
2007-04-30 19:46:19 +02:00
|
|
|
current_period = NULL;
|
2007-04-30 19:46:13 +02:00
|
|
|
}
|
|
|
|
|
2007-05-01 01:25:22 +02:00
|
|
|
/** Inserts a new occurrence for the given service id to the given ordered
|
2007-04-30 19:46:13 +02:00
|
|
|
* list. */
|
|
|
|
static void
|
2007-04-30 19:46:19 +02:00
|
|
|
hs_usage_insert_value(hs_usage_list_t *lst, const char *service_id)
|
2007-04-30 19:46:13 +02:00
|
|
|
{
|
|
|
|
/* search if there is already an elem with same service_id in list */
|
2007-04-30 19:46:19 +02:00
|
|
|
hs_usage_list_elem_t *current = lst->start;
|
2007-04-30 19:46:13 +02:00
|
|
|
hs_usage_list_elem_t *previous = NULL;
|
2007-05-01 01:25:22 +02:00
|
|
|
while (current != NULL && strcasecmp(current->service_id,service_id)) {
|
2007-04-30 19:46:13 +02:00
|
|
|
previous = current;
|
|
|
|
current = current->next;
|
|
|
|
}
|
|
|
|
/* found an element with same service_id? */
|
|
|
|
if (current == NULL) {
|
|
|
|
/* not found! append to end (which could also be the end of a zero-length
|
|
|
|
* list), don't need to sort (1 is smallest value). */
|
|
|
|
/* create elem */
|
|
|
|
hs_usage_list_elem_t *e = hs_usage_list_elem_new();
|
2007-05-01 01:25:22 +02:00
|
|
|
/* update list attributes (one new elem, one new occurrence) */
|
2007-04-30 19:46:19 +02:00
|
|
|
lst->total_count++;
|
|
|
|
lst->total_service_ids++;
|
2007-04-30 19:46:13 +02:00
|
|
|
/* copy service id to elem */
|
|
|
|
strlcpy(e->service_id,service_id,sizeof(e->service_id));
|
|
|
|
/* let either l->start or previously last elem point to new elem */
|
2007-04-30 19:46:19 +02:00
|
|
|
if (lst->start == NULL) {
|
2007-04-30 19:46:13 +02:00
|
|
|
/* this is the first elem */
|
2007-04-30 19:46:19 +02:00
|
|
|
lst->start = e;
|
2007-04-30 19:46:13 +02:00
|
|
|
} else {
|
|
|
|
/* there were elems in the list before */
|
|
|
|
previous->next = e;
|
|
|
|
}
|
|
|
|
} else {
|
2007-05-01 01:25:22 +02:00
|
|
|
/* found! add occurrence to elem and consider resorting */
|
|
|
|
/* update list attributes (no new elem, but one new occurrence) */
|
2007-04-30 19:46:19 +02:00
|
|
|
lst->total_count++;
|
2007-05-01 01:25:22 +02:00
|
|
|
/* add occurrence to elem */
|
2007-04-30 19:46:13 +02:00
|
|
|
current->count++;
|
|
|
|
/* is it another than the first list elem? and has previous elem fewer
|
|
|
|
* count than current? then we need to resort */
|
|
|
|
if (previous != NULL && previous->count < current->count) {
|
|
|
|
/* yes! we need to resort */
|
|
|
|
/* remove current elem first */
|
|
|
|
previous->next = current->next;
|
|
|
|
/* can we prepend elem to all other elements? */
|
2007-04-30 19:46:19 +02:00
|
|
|
if (lst->start->count <= current->count) {
|
2007-04-30 19:46:13 +02:00
|
|
|
/* yes! prepend elem */
|
2007-04-30 19:46:19 +02:00
|
|
|
current->next = lst->start;
|
|
|
|
lst->start = current;
|
2007-04-30 19:46:13 +02:00
|
|
|
} else {
|
|
|
|
/* no! walk through list a second time and insert at correct place */
|
2007-04-30 19:46:19 +02:00
|
|
|
hs_usage_list_elem_t *insert_current = lst->start->next;
|
|
|
|
hs_usage_list_elem_t *insert_previous = lst->start;
|
2007-04-30 19:46:13 +02:00
|
|
|
while (insert_current != NULL &&
|
|
|
|
insert_current->count > current->count) {
|
|
|
|
insert_previous = insert_current;
|
|
|
|
insert_current = insert_current->next;
|
|
|
|
}
|
|
|
|
/* insert here */
|
|
|
|
current->next = insert_current;
|
|
|
|
insert_previous->next = current;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/** Writes the current service-related observations to the history array and
|
|
|
|
* clears the observations of the current period. */
|
|
|
|
static void
|
|
|
|
hs_usage_write_service_related_observations_to_history(
|
|
|
|
hs_usage_current_observation_period_t *p,
|
|
|
|
hs_usage_service_related_observation_t *h)
|
|
|
|
{
|
|
|
|
/* walk through the first 20 % of list elements and calculate frequency
|
|
|
|
* distributions */
|
|
|
|
/* maximum indices for the three frequencies */
|
|
|
|
int five_percent_idx = h->list->total_service_ids/20;
|
|
|
|
int ten_percent_idx = h->list->total_service_ids/10;
|
|
|
|
int twenty_percent_idx = h->list->total_service_ids/5;
|
|
|
|
/* temp values */
|
|
|
|
uint32_t five_percent = 0;
|
|
|
|
uint32_t ten_percent = 0;
|
|
|
|
uint32_t twenty_percent = 0;
|
|
|
|
/* walk through list */
|
|
|
|
hs_usage_list_elem_t *current = h->list->start;
|
|
|
|
int i=0;
|
|
|
|
while (current != NULL && i <= twenty_percent_idx) {
|
|
|
|
twenty_percent += current->count;
|
|
|
|
if (i <= ten_percent_idx)
|
|
|
|
ten_percent += current->count;
|
|
|
|
if (i <= five_percent_idx)
|
|
|
|
five_percent += current->count;
|
|
|
|
current = current->next;
|
|
|
|
i++;
|
|
|
|
}
|
|
|
|
/* copy frequencies */
|
|
|
|
h->twenty[p->next_idx] = twenty_percent;
|
|
|
|
h->ten[p->next_idx] = ten_percent;
|
|
|
|
h->five[p->next_idx] = five_percent;
|
|
|
|
/* copy total number of observations */
|
|
|
|
h->totals[p->next_idx] = h->list->total_count;
|
|
|
|
/* free memory of old list */
|
|
|
|
hs_usage_list_clear(h->list);
|
|
|
|
}
|
|
|
|
|
2007-08-17 03:29:58 +02:00
|
|
|
/** Advances to next observation period. */
|
2007-04-30 19:46:13 +02:00
|
|
|
static void
|
|
|
|
hs_usage_advance_current_observation_period(void)
|
|
|
|
{
|
|
|
|
/* aggregate observations to history, including frequency distribution
|
|
|
|
* arrays */
|
|
|
|
hs_usage_write_service_related_observations_to_history(
|
|
|
|
current_period, publish_total);
|
|
|
|
hs_usage_write_service_related_observations_to_history(
|
|
|
|
current_period, publish_novel);
|
|
|
|
hs_usage_write_service_related_observations_to_history(
|
|
|
|
current_period, fetch_total);
|
|
|
|
hs_usage_write_service_related_observations_to_history(
|
|
|
|
current_period, fetch_successful);
|
|
|
|
/* write current number of descriptors to descs history */
|
|
|
|
descs->totals[current_period->next_idx] = rend_cache_size();
|
|
|
|
/* advance to next period */
|
|
|
|
current_period->next_idx++;
|
|
|
|
if (current_period->next_idx == NUM_TOTALS_HS_USAGE)
|
|
|
|
current_period->next_idx = 0;
|
|
|
|
if (current_period->num_set < NUM_TOTALS_HS_USAGE)
|
|
|
|
++current_period->num_set;
|
|
|
|
current_period->start_of_current_period=current_period->start_of_next_period;
|
|
|
|
current_period->start_of_next_period += NUM_SECS_HS_USAGE_SUM_INTERVAL;
|
|
|
|
}
|
|
|
|
|
|
|
|
/** Checks if the current period is up to date, and if not, advances it. */
|
|
|
|
static void
|
|
|
|
hs_usage_check_if_current_period_is_up_to_date(time_t now)
|
|
|
|
{
|
|
|
|
while (now > current_period->start_of_next_period) {
|
|
|
|
hs_usage_advance_current_observation_period();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/** Adds a service-related observation, maybe after advancing to next
|
|
|
|
* observation period. */
|
|
|
|
static void
|
|
|
|
hs_usage_add_service_related_observation(
|
|
|
|
hs_usage_service_related_observation_t *h,
|
|
|
|
time_t now,
|
|
|
|
const char *service_id)
|
|
|
|
{
|
|
|
|
if (now < current_period->start_of_current_period) {
|
|
|
|
/* don't record old data */
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
/* check if we are up-to-date */
|
|
|
|
hs_usage_check_if_current_period_is_up_to_date(now);
|
|
|
|
/* add observation */
|
|
|
|
hs_usage_insert_value(h->list, service_id);
|
|
|
|
}
|
|
|
|
|
|
|
|
/** Adds the observation of storing a rendezvous service descriptor to our
|
|
|
|
* cache in our role as HS authoritative directory. */
|
|
|
|
void
|
|
|
|
hs_usage_note_publish_total(const char *service_id, time_t now)
|
|
|
|
{
|
|
|
|
hs_usage_add_service_related_observation(publish_total, now, service_id);
|
|
|
|
}
|
|
|
|
|
|
|
|
/** Adds the observation of storing a novel rendezvous service descriptor to
|
|
|
|
* our cache in our role as HS authoritative directory. */
|
|
|
|
void
|
|
|
|
hs_usage_note_publish_novel(const char *service_id, time_t now)
|
|
|
|
{
|
|
|
|
hs_usage_add_service_related_observation(publish_novel, now, service_id);
|
|
|
|
}
|
|
|
|
|
|
|
|
/** Adds the observation of being requested for a rendezvous service descriptor
|
2007-08-17 03:29:58 +02:00
|
|
|
* in our role as HS authoritative directory. */
|
2007-04-30 19:46:13 +02:00
|
|
|
void
|
|
|
|
hs_usage_note_fetch_total(const char *service_id, time_t now)
|
|
|
|
{
|
|
|
|
hs_usage_add_service_related_observation(fetch_total, now, service_id);
|
|
|
|
}
|
|
|
|
|
|
|
|
/** Adds the observation of being requested for a rendezvous service descriptor
|
2007-08-17 03:29:58 +02:00
|
|
|
* in our role as HS authoritative directory and being able to answer that
|
|
|
|
* request successfully. */
|
2007-04-30 19:46:13 +02:00
|
|
|
void
|
|
|
|
hs_usage_note_fetch_successful(const char *service_id, time_t now)
|
|
|
|
{
|
|
|
|
hs_usage_add_service_related_observation(fetch_successful, now, service_id);
|
|
|
|
}
|
|
|
|
|
2007-08-17 03:29:58 +02:00
|
|
|
/** Writes the given circular array to a string. */
|
2007-04-30 19:46:13 +02:00
|
|
|
static size_t
|
|
|
|
hs_usage_format_history(char *buf, size_t len, uint32_t *data)
|
|
|
|
{
|
|
|
|
char *cp = buf; /* pointer where we are in the buffer */
|
|
|
|
int i, n;
|
|
|
|
if (current_period->num_set <= current_period->next_idx) {
|
|
|
|
i = 0; /* not been through circular array */
|
|
|
|
} else {
|
|
|
|
i = current_period->next_idx;
|
|
|
|
}
|
|
|
|
for (n = 0; n < current_period->num_set; ++n,++i) {
|
2007-06-06 15:02:22 +02:00
|
|
|
if (i >= NUM_TOTALS_HS_USAGE)
|
|
|
|
i -= NUM_TOTALS_HS_USAGE;
|
|
|
|
tor_assert(i < NUM_TOTALS_HS_USAGE);
|
2007-04-30 19:46:13 +02:00
|
|
|
if (n == (current_period->num_set-1))
|
|
|
|
tor_snprintf(cp, len-(cp-buf), "%d", data[i]);
|
|
|
|
else
|
|
|
|
tor_snprintf(cp, len-(cp-buf), "%d,", data[i]);
|
|
|
|
cp += strlen(cp);
|
|
|
|
}
|
|
|
|
return cp-buf;
|
|
|
|
}
|
|
|
|
|
|
|
|
/** Writes the complete usage history as hidden service authoritative directory
|
2007-08-17 03:29:58 +02:00
|
|
|
* to a string. */
|
2007-04-30 19:46:13 +02:00
|
|
|
static char *
|
|
|
|
hs_usage_format_statistics(void)
|
|
|
|
{
|
|
|
|
char *buf, *cp, *s = NULL;
|
|
|
|
char t[ISO_TIME_LEN+1];
|
|
|
|
int r;
|
|
|
|
uint32_t *data = NULL;
|
|
|
|
size_t len;
|
|
|
|
len = (70+20*NUM_TOTALS_HS_USAGE)*11;
|
|
|
|
buf = tor_malloc_zero(len);
|
|
|
|
cp = buf;
|
|
|
|
for (r = 0; r < 11; ++r) {
|
|
|
|
switch (r) {
|
|
|
|
case 0:
|
|
|
|
s = (char*) "publish-total-history";
|
|
|
|
data = publish_total->totals;
|
|
|
|
break;
|
|
|
|
case 1:
|
|
|
|
s = (char*) "publish-novel-history";
|
|
|
|
data = publish_novel->totals;
|
|
|
|
break;
|
|
|
|
case 2:
|
|
|
|
s = (char*) "publish-top-5-percent-history";
|
|
|
|
data = publish_total->five;
|
|
|
|
break;
|
|
|
|
case 3:
|
|
|
|
s = (char*) "publish-top-10-percent-history";
|
|
|
|
data = publish_total->ten;
|
|
|
|
break;
|
|
|
|
case 4:
|
|
|
|
s = (char*) "publish-top-20-percent-history";
|
|
|
|
data = publish_total->twenty;
|
|
|
|
break;
|
|
|
|
case 5:
|
|
|
|
s = (char*) "fetch-total-history";
|
|
|
|
data = fetch_total->totals;
|
|
|
|
break;
|
|
|
|
case 6:
|
|
|
|
s = (char*) "fetch-successful-history";
|
|
|
|
data = fetch_successful->totals;
|
|
|
|
break;
|
|
|
|
case 7:
|
|
|
|
s = (char*) "fetch-top-5-percent-history";
|
|
|
|
data = fetch_total->five;
|
|
|
|
break;
|
|
|
|
case 8:
|
|
|
|
s = (char*) "fetch-top-10-percent-history";
|
|
|
|
data = fetch_total->ten;
|
|
|
|
break;
|
|
|
|
case 9:
|
|
|
|
s = (char*) "fetch-top-20-percent-history";
|
|
|
|
data = fetch_total->twenty;
|
|
|
|
break;
|
|
|
|
case 10:
|
|
|
|
s = (char*) "desc-total-history";
|
|
|
|
data = descs->totals;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
format_iso_time(t, current_period->start_of_current_period);
|
|
|
|
tor_snprintf(cp, len-(cp-buf), "%s %s (%d s) ", s, t,
|
|
|
|
NUM_SECS_HS_USAGE_SUM_INTERVAL);
|
|
|
|
cp += strlen(cp);
|
|
|
|
cp += hs_usage_format_history(cp, len-(cp-buf), data);
|
|
|
|
strlcat(cp, "\n", len-(cp-buf));
|
|
|
|
++cp;
|
|
|
|
}
|
|
|
|
return buf;
|
|
|
|
}
|
|
|
|
|
2007-12-19 05:58:58 +01:00
|
|
|
/** Write current statistics about hidden service usage to file. */
|
2007-04-30 19:46:13 +02:00
|
|
|
void
|
|
|
|
hs_usage_write_statistics_to_file(time_t now)
|
|
|
|
{
|
|
|
|
char *buf;
|
|
|
|
size_t len;
|
|
|
|
char *fname;
|
2007-12-19 05:58:58 +01:00
|
|
|
or_options_t *options = get_options();
|
2007-04-30 19:46:13 +02:00
|
|
|
/* check if we are up-to-date */
|
|
|
|
hs_usage_check_if_current_period_is_up_to_date(now);
|
|
|
|
buf = hs_usage_format_statistics();
|
|
|
|
len = strlen(options->DataDirectory) + 16;
|
|
|
|
fname = tor_malloc(len);
|
2007-12-19 05:58:58 +01:00
|
|
|
tor_snprintf(fname, len, "%s"PATH_SEPARATOR"hsusage",
|
|
|
|
options->DataDirectory);
|
2007-04-30 19:46:13 +02:00
|
|
|
write_str_to_file(fname,buf,0);
|
|
|
|
tor_free(buf);
|
|
|
|
tor_free(fname);
|
|
|
|
}
|
|
|
|
|