[or-cvs] r10022: cleanups, and note a bug (in tor/trunk: doc/spec/proposals src/or)

[arma@xxxxxxxx]

Author: arma
Date: 2007-04-25 02:05:46 -0400 (Wed, 25 Apr 2007)
New Revision: 10022

Modified:
   tor/trunk/doc/spec/proposals/107-uptime-sanity-checking.txt
   tor/trunk/src/or/control.c
   tor/trunk/src/or/directory.c
   tor/trunk/src/or/or.h
   tor/trunk/src/or/rendcommon.c
Log:
cleanups, and note a bug


Modified: tor/trunk/doc/spec/proposals/107-uptime-sanity-checking.txt
===================================================================
--- tor/trunk/doc/spec/proposals/107-uptime-sanity-checking.txt	2007-04-25 05:59:30 UTC (rev 10021)
+++ tor/trunk/doc/spec/proposals/107-uptime-sanity-checking.txt	2007-04-25 06:05:46 UTC (rev 10022)
@@ -39,7 +39,7 @@
 
 Compatibility:
 
-   There should be no compatiblity issues due to uptime capping.
+   There should be no compatibility issues due to uptime capping.
 
 Implementation:
 

Modified: tor/trunk/src/or/control.c
===================================================================
--- tor/trunk/src/or/control.c	2007-04-25 05:59:30 UTC (rev 10021)
+++ tor/trunk/src/or/control.c	2007-04-25 06:05:46 UTC (rev 10022)
@@ -3016,6 +3016,10 @@
       smartlist_add(strs, s);
     });
   smartlist_add(strs, tor_strdup("\r\n.\r\n"));
+  /* XXX the above strdup has an extra \r\n in it, resulting in
+   * a blank line in the NS output. Can we remove it, or is that
+   * bad since the output of networkstatus_getinfo_helper_single()
+   * only adds \n, not \r\n? */
 
   s = smartlist_join_strings(strs, "", 0, NULL);
   SMARTLIST_FOREACH(strs, char *, cp, tor_free(cp));

Modified: tor/trunk/src/or/directory.c
===================================================================
--- tor/trunk/src/or/directory.c	2007-04-25 05:59:30 UTC (rev 10021)
+++ tor/trunk/src/or/directory.c	2007-04-25 06:05:46 UTC (rev 10022)
@@ -1105,8 +1105,7 @@
       if (next) {
         next[1] = 'n';
         cp = next+1;
-      }
-      else
+      } else
         break;
     }
     routers_update_all_from_networkstatus(); /*launches router downloads*/

Modified: tor/trunk/src/or/or.h
===================================================================
--- tor/trunk/src/or/or.h	2007-04-25 05:59:30 UTC (rev 10021)
+++ tor/trunk/src/or/or.h	2007-04-25 06:05:46 UTC (rev 10022)
@@ -687,16 +687,16 @@
 typedef struct packed_cell_t packed_cell_t;
 /** A cell as packed for writing to the network. */
 struct packed_cell_t {
-  struct packed_cell_t *next; /**< Next cell queued on a this circuit. */
+  struct packed_cell_t *next; /**< Next cell queued on this circuit. */
   char body[CELL_NETWORK_SIZE]; /**< Cell as packed for network. */
 };
 
 /** A queue of cells on a circuit, waiting to be added to the
  * or_connection_t's outbuf. */
 typedef struct cell_queue_t {
-  packed_cell_t *head; /**< The first cell, or NULL if the queue is empty */
-  packed_cell_t *tail; /**< The last cell, or NULL if the queue is empty */
-  int n; /**< The number of cells in the queue */
+  packed_cell_t *head; /**< The first cell, or NULL if the queue is empty. */
+  packed_cell_t *tail; /**< The last cell, or NULL if the queue is empty. */
+  int n; /**< The number of cells in the queue. */
 } cell_queue_t;
 
 /** Beginning of a RELAY cell payload. */

Modified: tor/trunk/src/or/rendcommon.c
===================================================================
--- tor/trunk/src/or/rendcommon.c	2007-04-25 05:59:30 UTC (rev 10021)
+++ tor/trunk/src/or/rendcommon.c	2007-04-25 06:05:46 UTC (rev 10022)
@@ -368,7 +368,7 @@
   rend_cache_entry_t *e;
   rend_service_descriptor_t *parsed;
   char query[REND_SERVICE_ID_LEN+1];
-  char key[REND_SERVICE_ID_LEN+2]; /* 1<query>\0   or  0<query>\0 */
+  char key[REND_SERVICE_ID_LEN+2]; /* 1<query>\0  or  0<query>\0 */
   time_t now;
 
   tor_assert(rend_cache);