cleanups, and note a bug

svn:r10022
This commit is contained in:
Roger Dingledine 2007-04-25 06:05:46 +00:00
parent 8f2883e96b
commit 5bdb138d11
5 changed files with 11 additions and 8 deletions

View File

@ -39,7 +39,7 @@ Specification:
Compatibility:
There should be no compatiblity issues due to uptime capping.
There should be no compatibility issues due to uptime capping.
Implementation:

View File

@ -3016,6 +3016,10 @@ control_event_networkstatus_changed(smartlist_t *statuses)
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));

View File

@ -1105,8 +1105,7 @@ connection_dir_client_reached_eof(dir_connection_t *conn)
if (next) {
next[1] = 'n';
cp = next+1;
}
else
} else
break;
}
routers_update_all_from_networkstatus(); /*launches router downloads*/

View File

@ -687,16 +687,16 @@ struct cell_t {
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. */

View File

@ -368,7 +368,7 @@ rend_cache_store(const char *desc, size_t desc_len)
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);