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

Use a more meaningful variable name

Browse Source
This commit is contained in:
Robert Ransom 2011-10-15 12:16:27 -07:00
parent 68331cbd81
commit 290b4dc3d6
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/or/rendservice.c
View File

@ -1912,7 +1912,7 @@ rend_services_introduce(void)
routerinfo_t *router; routerinfo_t *router;
rend_service_t *service; rend_service_t *service;
rend_intro_point_t *intro; rend_intro_point_t *intro;
int changed, prev_intro_nodes; int intro_point_set_changed, prev_intro_nodes;
unsigned int n_intro_points_to_open; unsigned int n_intro_points_to_open;
smartlist_t *intro_routers; smartlist_t *intro_routers;
time_t now; time_t now;
@ -1926,7 +1926,7 @@ rend_services_introduce(void)
service = smartlist_get(rend_service_list, i); service = smartlist_get(rend_service_list, i);
tor_assert(service); tor_assert(service);
changed = 0; intro_point_set_changed = 0;
if (now > service->intro_period_started+INTRO_CIRC_RETRY_PERIOD) { if (now > service->intro_period_started+INTRO_CIRC_RETRY_PERIOD) {
/* One period has elapsed; we can try building circuits again. */ /* One period has elapsed; we can try building circuits again. */
service->intro_period_started = now; service->intro_period_started = now;
@ -1955,7 +1955,7 @@ rend_services_introduce(void)
} }
rend_intro_point_free(intro); rend_intro_point_free(intro);
smartlist_del(service->intro_nodes,j--); smartlist_del(service->intro_nodes,j--);
changed = 1; intro_point_set_changed = 1;
} }
if (router) if (router)
smartlist_add(intro_routers, router); smartlist_add(intro_routers, router);
@ -1964,7 +1964,8 @@ 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) >= if (!intro_point_set_changed &&
(smartlist_len(service->intro_nodes) >=
(int)service->n_intro_points_wanted)) { /*XXX023 remove cast*/ (int)service->n_intro_points_wanted)) { /*XXX023 remove cast*/
/* We have all our intro points! Start a fresh period and reset the /* We have all our intro points! Start a fresh period and reset the
* circuit count. */ * circuit count. */
@ -2001,7 +2002,7 @@ rend_services_introduce(void)
n_intro_points_to_open); n_intro_points_to_open);
break; break;
} }
changed = 1; intro_point_set_changed = 1;
smartlist_add(intro_routers, router); smartlist_add(intro_routers, router);
intro = tor_malloc_zero(sizeof(rend_intro_point_t)); intro = tor_malloc_zero(sizeof(rend_intro_point_t));
intro->extend_info = extend_info_from_router(router); intro->extend_info = extend_info_from_router(router);
@ -2015,7 +2016,7 @@ rend_services_introduce(void)
} }
/* If there's no need to launch new circuits, stop here. */ /* If there's no need to launch new circuits, stop here. */
if (!changed) if (!intro_point_set_changed)
continue; continue;
/* Establish new introduction points. */ /* Establish new introduction points. */