nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-09-21 13:34:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

stop trying to print a NULL

Browse Source 
plus make router_nickname_is_approved() more obviously unused


svn:r2469
This commit is contained in:
Roger Dingledine 2004-10-13 20:17:45 +00:00
parent e0cce8fba8
commit 2b7b86f5e6
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/or/connection.c
View File

@ -739,7 +739,7 @@ int connection_handle_read(connection_t *conn) {
/* XXX I suspect pollerr may make Windows not get to this point. :( */
router_mark_as_down(conn->identity_digest);
if(conn->purpose == DIR_PURPOSE_FETCH_DIR && !all_directory_servers_down()) {
log_fn(LOG_INFO,"Giving up on dirserver %s; trying another.", conn->nickname);
log_fn(LOG_INFO,"Giving up on dirserver %s; trying another.", conn->address);
directory_get_from_dirserver(DIR_PURPOSE_FETCH_DIR, NULL, 0);
}
}

2
src/or/dirserv.c
View File

@ -200,6 +200,7 @@ const char *dirserv_get_nickname_by_digest(const char *digest)
return NULL;
}
#if 0
/** Return true iff any router named <b>nickname</b> with <b>digest</b>
* is in the verified fingerprint list. */
static int
@ -213,6 +214,7 @@ router_nickname_is_approved(const char *nickname, const char *digest)
else
return 0;
}
#endif
/** Clear the current fingerprint list. */
void