mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-11-14 07:03:44 +01:00
stop troubling router operators with unapproved router connect attempts
but give the dirserver operator more information svn:r1246
This commit is contained in:
parent
416993afc1
commit
30969421d3
@ -212,7 +212,7 @@ static int connection_tls_finish_handshake(connection_t *conn) {
|
|||||||
}
|
}
|
||||||
router = router_get_by_link_pk(pk);
|
router = router_get_by_link_pk(pk);
|
||||||
if (!router) {
|
if (!router) {
|
||||||
log_fn(LOG_WARN,"Unrecognized public key from peer '%s' (%s:%d). Closing.",
|
log_fn(LOG_INFO,"Unrecognized public key from peer '%s' (%s:%d). Closing.",
|
||||||
nickname, conn->address, conn->port);
|
nickname, conn->address, conn->port);
|
||||||
crypto_free_pk_env(pk);
|
crypto_free_pk_env(pk);
|
||||||
return -1;
|
return -1;
|
||||||
|
@ -229,7 +229,8 @@ dirserv_add_descriptor(const char **desc)
|
|||||||
if(r<1) {
|
if(r<1) {
|
||||||
if(r==0) {
|
if(r==0) {
|
||||||
char fp[FINGERPRINT_LEN+1];
|
char fp[FINGERPRINT_LEN+1];
|
||||||
log_fn(LOG_WARN, "Unknown nickname %s. Not adding.", ri->nickname);
|
log_fn(LOG_WARN, "Unknown nickname %s (%s:%d). Not adding.",
|
||||||
|
ri->nickname, ri->address, ri->or_port);
|
||||||
if (crypto_pk_get_fingerprint(ri->identity_pkey, fp) < 0) {
|
if (crypto_pk_get_fingerprint(ri->identity_pkey, fp) < 0) {
|
||||||
log_fn(LOG_WARN, "Error computing fingerprint for %s", ri->nickname);
|
log_fn(LOG_WARN, "Error computing fingerprint for %s", ri->nickname);
|
||||||
} else {
|
} else {
|
||||||
|
@ -861,7 +861,7 @@ routerinfo_t *router_get_entry_from_string(const char *s,
|
|||||||
|
|
||||||
tok = find_first_by_keyword(tokens, K_BANDWIDTH);
|
tok = find_first_by_keyword(tokens, K_BANDWIDTH);
|
||||||
if (tok && bw_set) {
|
if (tok && bw_set) {
|
||||||
log_fn(LOG_WARN,"Rendundant bandwidth line");
|
log_fn(LOG_WARN,"Redundant bandwidth line");
|
||||||
goto err;
|
goto err;
|
||||||
} else if (tok) {
|
} else if (tok) {
|
||||||
if (tok->n_args < 1) {
|
if (tok->n_args < 1) {
|
||||||
|
Loading…
Reference in New Issue
Block a user