[or-cvs] bugfix: hidden services were broken in cvs

[arma@seul.org (Roger Dingledine)]

Update of /home/or/cvsroot/src/or
In directory moria.mit.edu:/home2/arma/work/onion/cvs/src/or

Modified Files:
	connection_edge.c 
Log Message:
bugfix: hidden services were broken in cvs


Index: connection_edge.c
===================================================================
RCS file: /home/or/cvsroot/src/or/connection_edge.c,v
retrieving revision 1.195
retrieving revision 1.196
diff -u -d -r1.195 -r1.196
--- connection_edge.c	17 Jun 2004 21:11:09 -0000	1.195
+++ connection_edge.c	17 Jul 2004 19:50:29 -0000	1.196
@@ -367,7 +367,7 @@
       log_fn(LOG_DEBUG,"socks handshake not all here yet.");
     }
     if (sockshere == -1)
-      conn->socks_request->has_finished = 1;
+      socks->has_finished = 1;
     return sockshere;
   } /* else socks handshake is done, continue processing */
 
@@ -397,6 +397,8 @@
     return connection_ap_handshake_attach_circuit(conn);
   } else {
     /* it's a hidden-service request */
+    /* XXX008 what does it mean to socks-resolve a hidden service? should
+     * we fail those right here? */
     rend_cache_entry_t *entry;
     int r;
 
@@ -577,6 +579,7 @@
   conn->socks_request->has_finished = 0; /* waiting for 'connected' */
   strcpy(conn->socks_request->address, address);
   conn->socks_request->port = port;
+  conn->socks_request->command = SOCKS_COMMAND_CONNECT;
 
   conn->address = tor_strdup("(local bridge)");
   conn->addr = ntohs(0);