diff options
| author | Roger Dingledine <arma@torproject.org> | 2003-10-07 23:54:02 +0000 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2003-10-07 23:54:02 +0000 |
| commit | 543e4e8fd5852a745a37c70c2459776b7a239b12 (patch) | |
| tree | f408e25c7e976623e9c6d4f70f8274700bca2b43 | |
| parent | aca4bc5126cc3b32e8f431ebd0e7d12625fb01d9 (diff) | |
| download | tor-543e4e8fd5852a745a37c70c2459776b7a239b12.tar.gz tor-543e4e8fd5852a745a37c70c2459776b7a239b12.zip | |
more details to track a warning in tls handshakes
plus make exit policy comparisons not always reject
svn:r559
| -rw-r--r-- | src/or/connection_or.c | 12 | ||||
| -rw-r--r-- | src/or/routers.c | 5 |
2 files changed, 10 insertions, 7 deletions
diff --git a/src/or/connection_or.c b/src/or/connection_or.c index 5ee63b27d2..7819ca884e 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; } diff --git a/src/or/routers.c b/src/or/routers.c index 5d3a2bb9a3..4e0ab24f86 100644 --- a/src/or/routers.c +++ b/src/or/routers.c @@ -1083,7 +1083,8 @@ int router_compare_to_exit_policy(connection_t *conn) { assert(tmpe->port); log_fn(LOG_DEBUG,"Considering exit policy %s:%s",tmpe->address, tmpe->port); - if(inet_aton(tmpe->address,&in) == 0) { /* malformed IP. reject. */ + if(strcmp(tmpe->address,"*") && + inet_aton(tmpe->address,&in) == 0) { /* malformed IP. reject. */ log_fn(LOG_WARNING,"Malformed IP %s in exit policy. Rejecting.",tmpe->address); return -1; } @@ -1287,8 +1288,6 @@ int router_dump_router_to_string(char *s, int maxlen, routerinfo_t *router, return written+1; } - - /* Local Variables: mode:c |