[or-cvs] set rend exit connection state _before_ calling rend_servic...

Nick Mathewson nickm at seul.org
Fri Apr 9 17:52:00 UTC 2004


Update of /home/or/cvsroot/src/or
In directory moria.mit.edu:/tmp/cvs-serv25359/src/or

Modified Files:
	connection_edge.c 
Log Message:
set rend exit connection state _before_ calling rend_service_set_connection_addr_port and maybe eventually assert_connection_ok. This solves the other half of the bug weasel found.

Index: connection_edge.c
===================================================================
RCS file: /home/or/cvsroot/src/or/connection_edge.c,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -d -r1.154 -r1.155
--- connection_edge.c	8 Apr 2004 09:41:28 -0000	1.154
+++ connection_edge.c	9 Apr 2004 17:51:57 -0000	1.155
@@ -1134,13 +1134,13 @@
 
   if(circ->purpose == CIRCUIT_PURPOSE_S_REND_JOINED) {
     n_stream->address = tor_strdup("(rendezvous)");
+    n_stream->state = EXIT_CONN_STATE_CONNECTING;
     strcpy(n_stream->rend_query, circ->rend_query);
     if(rend_service_set_connection_addr_port(n_stream, circ) < 0) {
       log_fn(LOG_WARN,"Didn't find rendezvous service (port %d)",n_stream->port);
       connection_mark_for_close(n_stream,0 /* XXX */);
       return 0;
     }
-    n_stream->state = EXIT_CONN_STATE_CONNECTING;
     n_stream->cpath_layer = circ->cpath->prev; /* link it */
     connection_exit_connect(n_stream);
     return 0;



More information about the tor-commits mailing list