nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-14 07:03:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Only try to launch a fixed number of intro circuits for a service per 15-minute period or before all of the intro circuits succeed, whichever comes first

Browse Source 
svn:r1883
This commit is contained in:
Nick Mathewson 2004-05-18 01:53:53 +00:00
parent 14ba9f9153
commit a782b83c28
1 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/or/rendservice.c
View File

@ -23,6 +23,12 @@ typedef struct rend_service_port_config_t {
/** Try to maintain this many intro points per service if possible. */ /** Try to maintain this many intro points per service if possible. */
#define NUM_INTRO_POINTS 3 #define NUM_INTRO_POINTS 3
/** If we can't build our intro circuits, don't retry for this long. */
#define INTRO_CIRC_RETRY_PERIOD 60*15
/** Don't try to build more than this many circuits before giving up
* for a while.*/
#define MAX_INTRO_CIRCS_PER_PERIOD 20
/** Represents a single hidden service running at this OP. */ /** Represents a single hidden service running at this OP. */
typedef struct rend_service_t { typedef struct rend_service_t {
/** Fields specified in config file */ /** Fields specified in config file */
@ -36,6 +42,9 @@ typedef struct rend_service_t {
char pk_digest[DIGEST_LEN]; char pk_digest[DIGEST_LEN];
smartlist_t *intro_nodes; /**< list of nicknames for intro points we have, smartlist_t *intro_nodes; /**< list of nicknames for intro points we have,
* or are trying to establish. */ * or are trying to establish. */
time_t intro_period_started;
int n_intro_circuits_launched; /**< count of intro circuits we have
* established in this period. */
rend_service_descriptor_t *desc; rend_service_descriptor_t *desc;
int desc_is_dirty; int desc_is_dirty;
} rend_service_t; } rend_service_t;
@ -195,6 +204,7 @@ int rend_config_services(or_options_t *options)
service->directory = tor_strdup(line->value); service->directory = tor_strdup(line->value);
service->ports = smartlist_create(); service->ports = smartlist_create();
service->intro_nodes = smartlist_create(); service->intro_nodes = smartlist_create();
service->intro_period_started = time(NULL);
continue; continue;
} }
if (!service) { if (!service) {
@ -514,6 +524,7 @@ rend_service_launch_establish_intro(rend_service_t *service, const char *nicknam
log_fn(LOG_INFO, "Launching circuit to introduction point %s for service %s", log_fn(LOG_INFO, "Launching circuit to introduction point %s for service %s",
nickname, service->service_id); nickname, service->service_id);
++service->n_intro_circuits_launched;
launched = circuit_launch_new(CIRCUIT_PURPOSE_S_ESTABLISH_INTRO, nickname); launched = circuit_launch_new(CIRCUIT_PURPOSE_S_ESTABLISH_INTRO, nickname);
if (!launched) { if (!launched) {
log_fn(LOG_WARN, "Can't launch circuit to establish introduction at '%s'", log_fn(LOG_WARN, "Can't launch circuit to establish introduction at '%s'",
@ -766,10 +777,12 @@ void rend_services_introduce(void) {
char *intro; char *intro;
int changed, prev_intro_nodes; int changed, prev_intro_nodes;
smartlist_t *intro_routers, *exclude_routers; smartlist_t *intro_routers, *exclude_routers;
time_t now;
router_get_routerlist(&rl); router_get_routerlist(&rl);
intro_routers = smartlist_create(); intro_routers = smartlist_create();
exclude_routers = smartlist_create(); exclude_routers = smartlist_create();
now = time(NULL);
for (i=0; i< smartlist_len(rend_service_list); ++i) { for (i=0; i< smartlist_len(rend_service_list); ++i) {
smartlist_clear(intro_routers); smartlist_clear(intro_routers);
@ -777,6 +790,15 @@ void rend_services_introduce(void) {
tor_assert(service); tor_assert(service);
changed = 0; changed = 0;
if (now > service->intro_period_started+INTRO_CIRC_RETRY_PERIOD) {
/* One period has elapsed; we can try building circuits again. */
service->intro_period_started = now;
service->n_intro_circuits_launched = 0;
} else if (service->n_intro_circuits_launched>=MAX_INTRO_CIRCS_PER_PERIOD){
/* We have failed too many times in this period; wait for the next
* one before we try again. */
continue;
}
/* Find out which introduction points we have in progress for this service. */ /* Find out which introduction points we have in progress for this service. */
for (j=0;j< smartlist_len(service->intro_nodes); ++j) { for (j=0;j< smartlist_len(service->intro_nodes); ++j) {
@ -794,8 +816,13 @@ void rend_services_introduce(void) {
/* We have enough intro points, and the intro points we thought we had were /* We have enough intro points, and the intro points we thought we had were
* all connected. * all connected.
*/ */
if (!changed && smartlist_len(service->intro_nodes) >= NUM_INTRO_POINTS) if (!changed && smartlist_len(service->intro_nodes) >= NUM_INTRO_POINTS) {
/* We have all our intro points! Start a fresh period and reset the
* circuit count. */
service->intro_period_started = now;
service->n_intro_circuits_launched = 0;
continue; continue;
}
/* Remember how many introduction circuits we started with. */ /* Remember how many introduction circuits we started with. */
prev_intro_nodes = smartlist_len(service->intro_nodes); prev_intro_nodes = smartlist_len(service->intro_nodes);