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

cosmetic fix: only have one local to hold smartlist_len(downloadable), not too.

Browse Source 
svn:r5183
This commit is contained in:
Nick Mathewson 2005-10-04 20:18:26 +00:00
parent e4a6a03249
commit b10df0d595
1 changed files with 25 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/or/routerlist.c
View File

@ -2521,10 +2521,12 @@ update_router_descriptor_downloads(time_t now)
#define MIN_DL_PER_REQUEST 4 #define MIN_DL_PER_REQUEST 4
#define MIN_REQUESTS 3 #define MIN_REQUESTS 3
#define MAX_DL_TO_DELAY 16 #define MAX_DL_TO_DELAY 16
#define MAX_INTERVAL_WITHOUT_REQUEST 10*60 #define MAX_CLIENT_INTERVAL_WITHOUT_REQUEST 10*60
#define MAX_SERVER_INTERVAL_WITHOUT_REQUEST 1*60
smartlist_t *downloadable = NULL; smartlist_t *downloadable = NULL;
int get_all = 0; int get_all = 0;
int mirror = server_mode(get_options()) && get_options()->DirPort; int dirserv = server_mode(get_options()) && get_options()->DirPort;
int should_delay, n_downloadable;
static time_t last_download_attempted = 0; static time_t last_download_attempted = 0;
if (!networkstatus_list || smartlist_len(networkstatus_list)<2) if (!networkstatus_list || smartlist_len(networkstatus_list)<2)
get_all = 1; get_all = 1;
@ -2537,30 +2539,39 @@ update_router_descriptor_downloads(time_t now)
} }
downloadable = router_list_downloadable(); downloadable = router_list_downloadable();
if (smartlist_len(downloadable) >= MAX_DL_TO_DELAY || n_downloadable = smartlist_len(downloadable);
(smartlist_len(downloadable) && if (n_downloadable >= MAX_DL_TO_DELAY)
(mirror || should_delay = 0;
last_download_attempted + MAX_INTERVAL_WITHOUT_REQUEST < now))) { else if (n_downloadable == 0)
int i, j, n, n_per_request=MAX_DL_PER_REQUEST; should_delay = 1;
else if (dirserv)
should_delay = (last_download_attempted +
MAX_SERVER_INTERVAL_WITHOUT_REQUEST) < now;
else
should_delay = (last_download_attempted +
MAX_CLIENT_INTERVAL_WITHOUT_REQUEST) < now;
if (! should_delay) {
int i, j, n_per_request=MAX_DL_PER_REQUEST;
size_t r_len = MAX_DL_PER_REQUEST*(HEX_DIGEST_LEN+1)+16; size_t r_len = MAX_DL_PER_REQUEST*(HEX_DIGEST_LEN+1)+16;
char *resource = tor_malloc(r_len); char *resource = tor_malloc(r_len);
n = smartlist_len(downloadable); if (! dirserv) {
if (! mirror) { n_per_request = (n_downloadable+MIN_REQUESTS-1) / MIN_REQUESTS;
n_per_request = (n+MIN_REQUESTS-1) / MIN_REQUESTS;
if (n_per_request > MAX_DL_PER_REQUEST) if (n_per_request > MAX_DL_PER_REQUEST)
n_per_request = MAX_DL_PER_REQUEST; n_per_request = MAX_DL_PER_REQUEST;
if (n_per_request < MIN_DL_PER_REQUEST) if (n_per_request < MIN_DL_PER_REQUEST)
n_per_request = MIN_DL_PER_REQUEST; n_per_request = MIN_DL_PER_REQUEST;
} }
log_fn(LOG_NOTICE, "Launching %d request%s for %d router%s, %d at a time", log_fn(LOG_NOTICE, "Launching %d request%s for %d router%s, %d at a time",
(n+n_per_request-1)/n_per_request, n>n_per_request?"s":"", (n_downloadable+n_per_request-1)/n_per_request,
n, n>1?"s":"", n_per_request); n_downloadable>n_per_request?"s":"",
for (i=0; i < n; i += n_per_request) { n_downloadable, n_downloadable>1?"s":"", n_per_request);
for (i=0; i < n_downloadable; i += n_per_request) {
char *cp = resource; char *cp = resource;
memcpy(resource, "fp/", 3); memcpy(resource, "fp/", 3);
cp = resource + 3; cp = resource + 3;
for (j=i; j < i+n_per_request && j < n; ++j) { for (j=i; j < i+n_per_request && j < n_downloadable; ++j) {
memcpy(cp, smartlist_get(downloadable, j), HEX_DIGEST_LEN); memcpy(cp, smartlist_get(downloadable, j), HEX_DIGEST_LEN);
cp += HEX_DIGEST_LEN; cp += HEX_DIGEST_LEN;
*cp++ = '+'; *cp++ = '+';