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

fix typo

Browse Source 
svn:r2466
This commit is contained in:
Nick Mathewson 2004-10-13 19:55:40 +00:00
parent f14117bffd
commit 508970f85d
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/or/config.c
View File

@ -397,6 +397,10 @@ int config_assign_default_dirservers(void) {
return -1;
}
return 0;
}
static void add_default_trusted_dirservers(void) {
/* moria1 */
parse_dir_server_line("18.244.0.188:9031 "
"FFCB 46DB 1339 DA84 674C 70D7 CB58 6434 C437 0441");
@ -406,8 +410,6 @@ int config_assign_default_dirservers(void) {
/* tor26 */
parse_dir_server_line("62.116.124.106:9030 "
"847B 1F85 0344 D787 6491 A548 92F9 0493 4E4E B85D");
return 0;
}
/** Set <b>options</b> to a reasonable default.
@ -892,9 +894,15 @@ int getconfig(int argc, char **argv, or_options_t *options) {
}
}
for (cl = options->DirServers; cl; cl = cl->next) {
if (parse_dir_server_line(cl->value)<0)
return -1;
clear_trusted_dir_servers();
if (!options->DirServers) {
add_default_trusted_dirservers();
} else {
for (cl = options->DirServers; cl; cl = cl->next) {
if (parse_dir_server_line(cl->value)<0)
return -1;
}
}
/* XXX look at the various nicknamelists and make sure they're

1
src/or/connection.c
View File

@ -198,7 +198,6 @@ void connection_about_to_close_connection(connection_t *conn)
/* XXX We only set conn->nickname when we initiate the connection, or
* when the handshake is complete; so conn->nickname is a good test
* for "we initiated the connection", right? -NM */
*/
if(conn->nickname)
rep_hist_note_connect_failed(conn->identity_digest, time(NULL));
} else if (0) { // XXX reason == CLOSE_REASON_UNUSED_OR_CONN) {