Browse Source

note bug in assert_connection_ok

svn:r1159
Roger Dingledine 22 years ago
parent
commit
70c43e152a
2 changed files with 7 additions and 3 deletions
  1. 6 2
      src/or/connection.c
  2. 1 1
      src/or/onion.c

+ 6 - 2
src/or/connection.c

@@ -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);

+ 1 - 1
src/or/onion.c

@@ -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.");