diff options
| -rw-r--r-- | src/or/main.c | 2 | ||||
| -rw-r--r-- | src/or/or.h | 2 | ||||
| -rw-r--r-- | src/or/rendcommon.c | 4 | ||||
| -rw-r--r-- | src/or/rephist.c | 12 |
4 files changed, 10 insertions, 10 deletions
diff --git a/src/or/main.c b/src/or/main.c index 84bc98e8b..0ab96dd60 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -141,7 +141,7 @@ static char* nt_strerror(uint32_t errnum); /** How long do we let OR connections handshake before we decide that * they are obsolete? */ #define TLS_HANDSHAKE_TIMEOUT (60) -/** How often do we write hidden service usage statistics to disk* */ +/** How often do we write hidden service usage statistics to disk? */ #define WRITE_HSUSAGE_INTERVAL (900) /********* END VARIABLES ************/ diff --git a/src/or/or.h b/src/or/or.h index 00f90ad8b..2fe0faee4 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -2800,7 +2800,7 @@ void dump_pk_ops(int severity); void rep_hist_free_all(void); -/* for hidden service usage statistic */ +/* for hidden service usage statistics */ void hs_usage_note_publish_total(const char *service_id, time_t now); void hs_usage_note_publish_novel(const char *service_id, time_t now); void hs_usage_note_fetch_total(const char *service_id, time_t now); diff --git a/src/or/rendcommon.c b/src/or/rendcommon.c index f9a237bb2..ebc84eb2c 100644 --- a/src/or/rendcommon.c +++ b/src/or/rendcommon.c @@ -399,7 +399,7 @@ rend_cache_store(const char *desc, size_t desc_len, int published) } /* report novel publication to statistics */ if (published && options->HSAuthorityRecordStats) { - hs_usage_note_publish_total(query, time(NULL)); + hs_usage_note_publish_total(query, now); } e = (rend_cache_entry_t*) strmap_get_lc(rend_cache, key); if (e && e->parsed->timestamp > parsed->timestamp) { @@ -420,7 +420,7 @@ rend_cache_store(const char *desc, size_t desc_len, int published) strmap_set_lc(rend_cache, key, e); /* report novel publication to statistics */ if (published && options->HSAuthorityRecordStats) { - hs_usage_note_publish_novel(query, time(NULL)); + hs_usage_note_publish_novel(query, now); } } else { rend_service_descriptor_free(e->parsed); diff --git a/src/or/rephist.c b/src/or/rephist.c index 1243fa3eb..802458c56 100644 --- a/src/or/rephist.c +++ b/src/or/rephist.c @@ -1271,7 +1271,7 @@ hs_usage_free_all(void) current_period = NULL; } -/** Inserts a new occurence for the given service id to the given ordered +/** Inserts a new occurrence for the given service id to the given ordered * list. */ static void hs_usage_insert_value(hs_usage_list_t *lst, const char *service_id) @@ -1279,7 +1279,7 @@ hs_usage_insert_value(hs_usage_list_t *lst, const char *service_id) /* search if there is already an elem with same service_id in list */ hs_usage_list_elem_t *current = lst->start; hs_usage_list_elem_t *previous = NULL; - while (current != NULL && strcmp(current->service_id,service_id)) { + while (current != NULL && strcasecmp(current->service_id,service_id)) { previous = current; current = current->next; } @@ -1289,7 +1289,7 @@ hs_usage_insert_value(hs_usage_list_t *lst, const char *service_id) * list), don't need to sort (1 is smallest value). */ /* create elem */ hs_usage_list_elem_t *e = hs_usage_list_elem_new(); - /* update list attributes (one new elem, one new occurence) */ + /* update list attributes (one new elem, one new occurrence) */ lst->total_count++; lst->total_service_ids++; /* copy service id to elem */ @@ -1303,10 +1303,10 @@ hs_usage_insert_value(hs_usage_list_t *lst, const char *service_id) previous->next = e; } } else { - /* found! add occurence to elem and consider resorting */ - /* update list attributes (no new elem, but one new occurence) */ + /* found! add occurrence to elem and consider resorting */ + /* update list attributes (no new elem, but one new occurrence) */ lst->total_count++; - /* add occurence to elem */ + /* add occurrence to elem */ current->count++; /* is it another than the first list elem? and has previous elem fewer * count than current? then we need to resort */ |