[or-cvs] and backport the bandaid.

[arma at seul.org]

Update of /home/or/cvsroot/tor/src/or
In directory moria:/home/arma/work/onion/tor-011x/tor/src/or

Modified Files:
      Tag: tor-0_1_1-patches
	connection_or.c 
Log Message:
and backport the bandaid.


Index: connection_or.c
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/connection_or.c,v
retrieving revision 1.216.2.1
retrieving revision 1.216.2.2
diff -u -p -d -r1.216.2.1 -r1.216.2.2
--- connection_or.c	6 Jun 2006 09:04:51 -0000	1.216.2.1
+++ connection_or.c	7 Jun 2006 08:43:41 -0000	1.216.2.2
@@ -691,6 +691,18 @@ connection_tls_finish_handshake(connecti
 #endif
     connection_or_init_conn_from_address(conn,conn->addr,conn->port,
                                          digest_rcvd);
+    /* Annotate that we received a TLS connection.
+     * (Todo: only actually consider ourselves reachable if there
+     * exists a testing circuit using conn.)
+     *
+     * We already consider ourselves reachable if we can ever process
+     * a create cell -- see onionskin_answer() in circuitbuild.c.
+     *
+     * The reason this bandaid is here is because there's a bug in
+     * Tor 0.1.1.x where middle hops don't always send their create
+     * cell; so some servers rarely find themselves reachable. */
+    if (!is_local_IP(conn->addr))
+      router_orport_found_reachable();
   }
 
   if (!server_mode(get_options())) { /* If I'm an OP... */