diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/or/circuitbuild.c | 8 | ||||
| -rw-r--r-- | src/or/dns.c | 2 | ||||
| -rw-r--r-- | src/or/routerlist.c | 7 |
3 files changed, 11 insertions, 6 deletions
diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 2160ecb9af..579b202f95 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -649,15 +649,17 @@ circuit_send_next_onion_skin(origin_circuit_t *circ) return 0; } -/** Our clock just jumped forward by <b>seconds_elapsed</b>. Assume +/** Our clock just jumped by <b>seconds_elapsed</b>. Assume * something has also gone wrong with our network: notify the user, * and abandon all not-yet-used circuits. */ void circuit_note_clock_jumped(int seconds_elapsed) { int severity = server_mode(get_options()) ? LOG_WARN : LOG_NOTICE; - log(severity, LD_GENERAL, "Your clock just jumped %d seconds forward; " - "assuming established circuits no longer work.", seconds_elapsed); + log(severity, LD_GENERAL, "Your clock just jumped %d seconds %s; " + "assuming established circuits no longer work.", + seconds_elapsed >=0 ? seconds_elapsed : -seconds_elapsed, + seconds_elapsed >=0 ? "forward" : "backward"); control_event_general_status(LOG_WARN, "CLOCK_JUMPED TIME=%d", seconds_elapsed); has_completed_circuit=0; /* so it'll log when it works again */ diff --git a/src/or/dns.c b/src/or/dns.c index 537d5ff80a..19397e535c 100644 --- a/src/or/dns.c +++ b/src/or/dns.c @@ -321,7 +321,7 @@ dns_free_all(void) if (cached_resolve_pqueue) { SMARTLIST_FOREACH(cached_resolve_pqueue, cached_resolve_t *, res, { - /* XXXX012 The hach lookups here could be quite slow; remove them + /* XXXX012 The hash lookups here could be quite slow; remove them * once we're happy. */ if (res->state == CACHE_STATE_DONE) { cached_resolve_t *removed = HT_REMOVE(cache_map, &cache_root, res); diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 800cb7fcae..0f31a1f5e9 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -186,7 +186,7 @@ router_should_rebuild_store(void) } /** Add the <b>len</b>-type router descriptor in <b>s</b> to the router - * journal; change its saved_locatino to SAVED_IN_JOURNAL and set its + * journal; change its saved_location to SAVED_IN_JOURNAL and set its * offset appropriately. */ static int router_append_to_journal(signed_descriptor_t *desc) @@ -1319,7 +1319,7 @@ router_get_by_descriptor_digest(const char *digest) /** Return a pointer to the signed textual representation of a descriptor. * The returned string is not guaranteed to be NUL-terminated: the string's - * length will be in desc->signed_descriptor_len. */ + * length will be in desc-\>signed_descriptor_len. */ const char * signed_descriptor_get_body(signed_descriptor_t *desc) { @@ -3719,6 +3719,9 @@ router_list_client_downloadable(void) * a directory for "all descriptors." * Otherwise, we ask for all descriptors that we think are different * from what we have. + * + * DOCDOC The above comment doesn't match the behavior of the function. + * I guess one of them is wrong, and I guess it's the comment. -RD */ static void update_router_descriptor_client_downloads(time_t now) |