aboutsummaryrefslogtreecommitdiff
path: root/src/or/connection_or.c
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2003-10-07 23:54:02 +0000
committerRoger Dingledine <arma@torproject.org>2003-10-07 23:54:02 +0000
commit543e4e8fd5852a745a37c70c2459776b7a239b12 (patch)
treef408e25c7e976623e9c6d4f70f8274700bca2b43 /src/or/connection_or.c
parentaca4bc5126cc3b32e8f431ebd0e7d12625fb01d9 (diff)
downloadtor-543e4e8fd5852a745a37c70c2459776b7a239b12.tar
tor-543e4e8fd5852a745a37c70c2459776b7a239b12.tar.gz
more details to track a warning in tls handshakes
plus make exit policy comparisons not always reject svn:r559
Diffstat (limited to 'src/or/connection_or.c')
-rw-r--r--src/or/connection_or.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/src/or/connection_or.c b/src/or/connection_or.c
index 5ee63b27d..7819ca884 100644
--- a/src/or/connection_or.c
+++ b/src/or/connection_or.c
@@ -188,12 +188,14 @@ static int connection_tls_finish_handshake(connection_t *conn) {
if(tor_tls_peer_has_cert(conn->tls)) { /* it's another OR */
pk = tor_tls_verify(conn->tls);
if(!pk) {
- log_fn(LOG_WARNING,"Other side has a cert but it's invalid. Closing.");
+ log_fn(LOG_WARNING,"Other side (%s:%p) has a cert but it's invalid. Closing.",
+ conn->address, conn->port);
return -1;
}
router = router_get_by_link_pk(pk);
if (!router) {
- log_fn(LOG_WARNING,"Unrecognized public key from peer. Closing.");
+ log_fn(LOG_WARNING,"Unrecognized public key from peer (%s:%d). Closing.",
+ conn->address, conn->port);
crypto_free_pk_env(pk);
return -1;
}
@@ -223,12 +225,14 @@ static int connection_tls_finish_handshake(connection_t *conn) {
}
pk = tor_tls_verify(conn->tls);
if(!pk) {
- log_fn(LOG_WARNING,"Other side has a cert but it's invalid. Closing.");
+ log_fn(LOG_WARNING,"Other side (%s:%d) has a cert but it's invalid. Closing.",
+ conn->address, conn->port);
return -1;
}
router = router_get_by_link_pk(pk);
if (!router) {
- log_fn(LOG_WARNING,"Unrecognized public key from peer. Closing.");
+ log_fn(LOG_WARNING,"Unrecognized public key from peer (%s:%d). Closing.",
+ conn->address, conn->port);
crypto_free_pk_env(pk);
return -1;
}