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

clean up the log lines more, and note a future work.

Browse Source 
svn:r6324
This commit is contained in:
Roger Dingledine 2006-04-08 21:12:07 +00:00
parent b5737aab91
commit 24b2e0530a
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/or/dirserv.c
View File

@ -1637,18 +1637,19 @@ dirserv_orconn_tls_done(const char *address,
int drop = 0;
if (strcasecmp(address, ri->address) || or_port != ri->or_port)
continue;
/* XXX For 0.1.2.x, we should do something smarter here than !is_valid. */
if (!ri->is_valid) {
/* We have a router at the same address! */
if (strcasecmp(ri->nickname, nickname_rcvd)) {
log_notice(LD_DIRSERV,
"Dropping old descriptor: nickname '%s' does not match "
"nickname '%s' in new cert from %s:%d",
"Dropping old invalid descriptor: nickname '%s' does "
"not match nickname '%s' in new cert from %s:%d",
ri->nickname, nickname_rcvd, address, or_port);
drop = 1;
} else if (memcmp(ri->cache_info.identity_digest, digest_rcvd,
DIGEST_LEN)) {
log_notice(LD_DIRSERV,
"Dropping old descriptor for nickname '%s': "
"Dropping old invalid descriptor for nickname '%s': "
"identity key does not match key in new cert from %s:%d",
ri->nickname, address, or_port);
drop = 1;