[or-cvs] r10077: more cleanups on the hsusage patch (tor/trunk/src/or)

[arma@xxxxxxxx]

Author: arma
Date: 2007-04-30 19:25:22 -0400 (Mon, 30 Apr 2007)
New Revision: 10077

Modified:
   tor/trunk/src/or/main.c
   tor/trunk/src/or/or.h
   tor/trunk/src/or/rendcommon.c
   tor/trunk/src/or/rephist.c
Log:
more cleanups on the hsusage patch


Modified: tor/trunk/src/or/main.c
===================================================================
--- tor/trunk/src/or/main.c	2007-04-30 23:24:38 UTC (rev 10076)
+++ tor/trunk/src/or/main.c	2007-04-30 23:25:22 UTC (rev 10077)
@@ -141,7 +141,7 @@
 /** 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 ************/

Modified: tor/trunk/src/or/or.h
===================================================================
--- tor/trunk/src/or/or.h	2007-04-30 23:24:38 UTC (rev 10076)
+++ tor/trunk/src/or/or.h	2007-04-30 23:25:22 UTC (rev 10077)
@@ -2800,7 +2800,7 @@
 
 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);

Modified: tor/trunk/src/or/rendcommon.c
===================================================================
--- tor/trunk/src/or/rendcommon.c	2007-04-30 23:24:38 UTC (rev 10076)
+++ tor/trunk/src/or/rendcommon.c	2007-04-30 23:25:22 UTC (rev 10077)
@@ -399,7 +399,7 @@
   }
   /* 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 @@
     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);

Modified: tor/trunk/src/or/rephist.c
===================================================================
--- tor/trunk/src/or/rephist.c	2007-04-30 23:24:38 UTC (rev 10076)
+++ tor/trunk/src/or/rephist.c	2007-04-30 23:25:22 UTC (rev 10077)
@@ -1271,7 +1271,7 @@
   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 @@
   /* 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 @@
      * 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 @@
       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 */