note bug in assert_connection_ok

svn:r1159
This commit is contained in:
Roger Dingledine 2004-02-28 07:48:28 +00:00
parent dd632e697e
commit 70c43e152a
2 changed files with 7 additions and 3 deletions

View File

@ -840,9 +840,13 @@ void assert_connection_ok(connection_t *conn, time_t now)
assert(!conn->tls); assert(!conn->tls);
} else { } else {
if(conn->state == OR_CONN_STATE_OPEN) { if(conn->state == OR_CONN_STATE_OPEN) {
assert(conn->bandwidth > 0); /* assert(conn->bandwidth > 0); */
/* the above isn't necessarily true: if we just did a TLS
* handshake but we didn't recognize the other peer, or it
* gave a bad cert/etc, then we won't have assigned bandwidth,
* yet it will be open. -RD
*/
assert(conn->receiver_bucket >= 0); assert(conn->receiver_bucket >= 0);
// assert(conn->receiver_bucket <= 10*conn->bandwidth);
} }
assert(conn->addr && conn->port); assert(conn->addr && conn->port);
assert(conn->address); assert(conn->address);

View File

@ -334,7 +334,7 @@ static routerinfo_t *choose_good_exit_server(routerlist_t *dir)
smartlist_free(sl); smartlist_free(sl);
tor_free(n_supported); tor_free(n_supported);
if(router) { if(router) {
log_fn(LOG_WARN, "Chose exit server '%s'", router->nickname); log_fn(LOG_INFO, "Chose exit server '%s'", router->nickname);
return router; return router;
} }
log_fn(LOG_WARN, "No exit routers seem to be running; can't choose an exit."); log_fn(LOG_WARN, "No exit routers seem to be running; can't choose an exit.");