diff options
| -rw-r--r-- | src/or/directory.c | 6 | ||||
| -rw-r--r-- | src/or/dirserv.c | 12 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/or/directory.c b/src/or/directory.c index bb38df3ac4..c73d4d1e7f 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -198,10 +198,10 @@ int connection_dir_process_inbuf(connection_t *conn) { log_fn(LOG_INFO,"eof (status 200) while reading upload response: finished."); break; case 400: - log_fn(LOG_WARN,"http status 400 (bad request) from dirserver. Is your clock skewed?"); + log_fn(LOG_WARN,"http status 400 (bad request) response from dirserver."); break; case 403: - log_fn(LOG_WARN,"http status 403 (unapproved server) from dirserver. Have you mailed arma your identity fingerprint? Are you using the right key?"); + log_fn(LOG_WARN,"http status 403 (unapproved server) response from dirserver. Is your clock skewed? Have you mailed arma your identity fingerprint? Are you using the right key?"); break; } @@ -258,7 +258,7 @@ static int directory_handle_command_post(connection_t *conn, cp = body; switch(dirserv_add_descriptor(&cp)) { case -1: - /* malformed descriptor, or clock is skewed, or something wrong */ + /* malformed descriptor, or something wrong */ connection_write_to_buf(answer400, strlen(answer400), conn); break; case 0: diff --git a/src/or/dirserv.c b/src/or/dirserv.c index 75dfae3b6f..0f906d47af 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -186,8 +186,8 @@ dirserv_free_descriptors() } /* Return 1 if descriptor is well-formed and accepted; - * 0 if well-formed and server is unapproved; - * -1 if not well-formed or if clock is skewed or other error. + * 0 if well-formed and server or descriptor is unapproved; + * -1 if not well-formed or other error. * * Update *desc to point after the descriptor if the * descriptor is well-formed. @@ -248,16 +248,16 @@ dirserv_add_descriptor(const char **desc) /* Is there too much clock skew? */ now = time(NULL); if (ri->published_on > now+ROUTER_ALLOW_SKEW) { - log_fn(LOG_WARN, "Publication time for nickname %s is too far in the future; possible clock skew. Not adding", ri->nickname); + log_fn(LOG_WARN, "Publication time for nickname %s is too far in the future; possible clock skew. Not adding.", ri->nickname); routerinfo_free(ri); *desc = end; - return -1; + return 0; } if (ri->published_on < now-ROUTER_MAX_AGE) { - log_fn(LOG_WARN, "Publication time for router with nickname %s is too far in the past. Not adding", ri->nickname); + log_fn(LOG_WARN, "Publication time for router with nickname %s is too far in the past. Not adding.", ri->nickname); routerinfo_free(ri); *desc = end; - return -1; + return 0; } /* Do we already have an entry for this router? */ |