tls works with onion proxies now.

svn:r449

diff --git a/src/or/connection.c b/src/or/connection.c
index 74d2f3cb352729760076957503a7b384ac2d90b1..2a51264e24e7fbb39766728ab40523a1d939069a 100644 (file)
--- a/src/or/connection.c
+++ b/src/or/connection.c
@@ -308,6 +308,7 @@ static int connection_tls_finish_handshake(connection_t *conn) {
   conn->state = OR_CONN_STATE_OPEN;
   directory_set_dirty();
   connection_watch_events(conn, POLLIN);
+  log_fn(LOG_DEBUG,"tls handshake done. verifying.");
   if(options.OnionRouter) { /* I'm an OR */
     if(tor_tls_peer_has_cert(conn->tls)) { /* it's another OR */
       pk = tor_tls_verify(conn->tls);
@@ -368,7 +369,6 @@ static int connection_tls_finish_handshake(connection_t *conn) {
     conn->bandwidth = DEFAULT_BANDWIDTH_OP;
     circuit_n_conn_open(conn); /* send the pending create */
   }
-  log_fn(LOG_DEBUG,"tls handshake done, now open.");
   return 0;
 }
 #endif

diff --git a/src/or/connection_or.c b/src/or/connection_or.c
index 231a62ac94ac128345a4dc581cbeff45e433dbbb..832330d93d89a7d4bcc08dd43e773efbb5d57c48 100644 (file)
--- a/src/or/connection_or.c
+++ b/src/or/connection_or.c
@@ -36,7 +36,8 @@ int connection_or_process_inbuf(connection_t *conn) {
   }
 
 #ifdef USE_TLS
-  assert(conn->state == OR_CONN_STATE_OPEN);
+  if(conn->state != OR_CONN_STATE_OPEN)
+    return 0; /* don't do anything */
   return connection_process_cell_from_inbuf(conn);
 #else
 //  log(LOG_DEBUG,"connection_or_process_inbuf(): state %d.",conn->state);
@@ -81,7 +82,7 @@ int connection_or_finished_flushing(connection_t *conn) {
       }
       /* the connect has finished. */
 
-      log_fn(LOG_DEBUG,"OR connection to router %s:%u established.",
+      log_fn(LOG_DEBUG,"OR connect() to router %s:%u finished.",
           conn->address,conn->port);
 
 #ifdef USE_TLS