[or-cvs] bugfix: let socks do multiple rounds of negotiation again

[arma@seul.org (Roger Dingledine)]

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

Modified Files:
	connection_edge.c 
Log Message:
bugfix: let socks do multiple rounds of negotiation again
(which is needed for socks5)


Index: connection_edge.c
===================================================================
RCS file: /home2/or/cvsroot/tor/src/or/connection_edge.c,v
retrieving revision 1.238
retrieving revision 1.239
diff -u -d -r1.238 -r1.239
--- connection_edge.c	22 Nov 2004 23:28:26 -0000	1.238
+++ connection_edge.c	24 Nov 2004 04:35:28 -0000	1.239
@@ -365,6 +365,7 @@
     if(socks->replylen) { /* we should send reply back */
       log_fn(LOG_DEBUG,"reply is already set for us. Using it.");
       connection_ap_handshake_socks_reply(conn, socks->reply, socks->replylen, 0);
+      socks->replylen = 0; /* zero it out so we can do another round of negotiation */
     } else if(sockshere == -1) { /* send normal reject */
       log_fn(LOG_WARN,"Fetching socks handshake failed. Closing.");
       connection_ap_handshake_socks_reply(conn, NULL, 0, -1);