diff options
| author | Roger Dingledine <arma@torproject.org> | 2004-12-13 00:44:39 +0000 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2004-12-13 00:44:39 +0000 |
| commit | 011ad3cba5dadceb4b204aced00e3cd598465d1d (patch) | |
| tree | 7f6eaf60a5189244ae5b26c0839667451b34c3f0 /src/or/connection_or.c | |
| parent | 972124aab936a9fbfd3a736c903124d89515af78 (diff) | |
| download | tor-011ad3cba5dadceb4b204aced00e3cd598465d1d.tar tor-011ad3cba5dadceb4b204aced00e3cd598465d1d.tar.gz | |
clean up logging,
make it clearer which warns are bugs,
make the control log event match its specification,
point out a bug in how we deal with failure when renewing the tls context.
svn:r3138
Diffstat (limited to 'src/or/connection_or.c')
| -rw-r--r-- | src/or/connection_or.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/connection_or.c b/src/or/connection_or.c index 4770f5d31..3a68fb787 100644 --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@ -210,7 +210,7 @@ connection_t *connection_or_connect(uint32_t addr, uint16_t port, if (server_mode(get_options()) && (me=router_get_my_routerinfo()) && !memcmp(me->identity_digest, id_digest,DIGEST_LEN)) { - log_fn(LOG_WARN,"Request to connect to myself! Failing."); + log_fn(LOG_WARN,"Bug: Request to connect to myself! Failing."); return NULL; } @@ -403,7 +403,7 @@ connection_tls_finish_handshake(connection_t *conn) { if (connection_or_nonopen_was_started_here(conn)) { /* I initiated this connection. */ if (strcasecmp(conn->nickname, nickname)) { - log_fn(options->DirPort ? LOG_WARN : LOG_INFO, + log_fn(authdir_mode(options) ? LOG_WARN : LOG_INFO, "Other side (%s:%d) is '%s', but we tried to connect to '%s'", conn->address, conn->port, nickname, conn->nickname); control_event_or_conn_status(conn, OR_CONN_EVENT_FAILED); |