mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-11-10 21:23:58 +01:00
Merge commit 'sebastian/coverity'
This commit is contained in:
commit
d42c689b8e
@ -1997,12 +1997,6 @@ connection_dir_client_reached_eof(dir_connection_t *conn)
|
|||||||
"'%s:%d'. Malformed rendezvous descriptor?",
|
"'%s:%d'. Malformed rendezvous descriptor?",
|
||||||
escaped(reason), conn->_base.address, conn->_base.port);
|
escaped(reason), conn->_base.address, conn->_base.port);
|
||||||
break;
|
break;
|
||||||
case 503:
|
|
||||||
log_info(LD_REND,"http status 503 (%s) response from dirserver "
|
|
||||||
"'%s:%d'. Node is (currently) not acting as v2 hidden "
|
|
||||||
"service directory.",
|
|
||||||
escaped(reason), conn->_base.address, conn->_base.port);
|
|
||||||
break;
|
|
||||||
default:
|
default:
|
||||||
log_warn(LD_REND,"http status %d (%s) response unexpected (server "
|
log_warn(LD_REND,"http status %d (%s) response unexpected (server "
|
||||||
"'%s:%d').",
|
"'%s:%d').",
|
||||||
|
@ -1516,7 +1516,7 @@ networkstatus_set_current_consensus(const char *consensus,
|
|||||||
goto done;
|
goto done;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (c->flavor != flav) {
|
if ((int)c->flavor != flav) {
|
||||||
/* This wasn't the flavor we thought we were getting. */
|
/* This wasn't the flavor we thought we were getting. */
|
||||||
if (require_flavor) {
|
if (require_flavor) {
|
||||||
log_warn(LD_DIR, "Got consensus with unexpected flavor %s (wanted %s)",
|
log_warn(LD_DIR, "Got consensus with unexpected flavor %s (wanted %s)",
|
||||||
|
Loading…
Reference in New Issue
Block a user