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

misc small fixes

Browse Source 
svn:r13403
This commit is contained in:
Roger Dingledine 2008-02-06 12:46:46 +00:00
parent c054f90f02
commit f76cdc1a61
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/container.c
View File

@ -1174,7 +1174,7 @@ digestmap_size(const digestmap_t *map)
return HT_SIZE(&map->head); return HT_SIZE(&map->head);
} }
/** declare a function called <b>funcname</b> that acts as a find_nth_XXX /** Declare a function called <b>funcname</b> that acts as a find_nth_FOO
* function for an array of type <b>elt_t</b>*. * function for an array of type <b>elt_t</b>*.
* *
* NOTE: The implementation kind of sucks: It's O(n log n), whereas finding * NOTE: The implementation kind of sucks: It's O(n log n), whereas finding

4
src/or/dirserv.c
View File

@ -204,7 +204,7 @@ dirserv_load_fingerprint_file(void)
tor_free(fname); tor_free(fname);
return -1; return -1;
} else { } else {
log_info(LD_FS, "Cannot open fingerprint file '%s'. Returning.", fname); log_info(LD_FS, "Cannot open fingerprint file '%s'. That's ok.", fname);
tor_free(fname); tor_free(fname);
return 0; return 0;
} }
@ -2517,7 +2517,7 @@ dirserv_get_networkstatus_v2_fingerprints(smartlist_t *result,
} }
smartlist_sort_digests(result); smartlist_sort_digests(result);
if (smartlist_len(result) == 0) if (smartlist_len(result) == 0)
log_warn(LD_DIRSERV, log_info(LD_DIRSERV,
"Client requested 'all' network status objects; we have none."); "Client requested 'all' network status objects; we have none.");
} else if (!strcmpstart(key, "fp/")) { } else if (!strcmpstart(key, "fp/")) {
dir_split_resource_into_fingerprints(key+3, result, NULL, 1, 1); dir_split_resource_into_fingerprints(key+3, result, NULL, 1, 1);

3
src/or/dirvote.c
View File

@ -1668,7 +1668,8 @@ dirvote_compute_consensus(void)
n_voters = get_n_authorities(V3_AUTHORITY); n_voters = get_n_authorities(V3_AUTHORITY);
n_votes = smartlist_len(pending_vote_list); n_votes = smartlist_len(pending_vote_list);
if (n_votes <= n_voters/2) { if (n_votes <= n_voters/2) {
log_warn(LD_DIR, "We don't have enough votes to generate a consensus."); log_warn(LD_DIR, "We don't have enough votes to generate a consensus: "
"%d of %d", n_votes, n_voters/2);
goto err; goto err;
} }

2
src/or/relay.c
View File

@ -1375,7 +1375,7 @@ connection_edge_consider_sending_sendme(edge_connection_t *conn)
conn->deliver_window += STREAMWINDOW_INCREMENT; conn->deliver_window += STREAMWINDOW_INCREMENT;
if (connection_edge_send_command(conn, RELAY_COMMAND_SENDME, if (connection_edge_send_command(conn, RELAY_COMMAND_SENDME,
NULL, 0) < 0) { NULL, 0) < 0) {
log_warn(LD_APP,"connection_edge_send_command failed. Returning."); log_warn(LD_APP,"connection_edge_send_command failed. Skipping.");
return; /* the circuit's closed, don't continue */ return; /* the circuit's closed, don't continue */
} }
} }