From: Roger Dingledine <arma@torproject.org>
Date: Wed, 24 Nov 2004 04:35:28 +0000 (+0000)
Subject: bugfix: let socks do multiple rounds of negotiation again
X-Git-Tag: tor-0.0.9rc2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0eebfe355879498b50c02cf8233f3174888ac5d6;p=thirdparty%2Ftor.git

bugfix: let socks do multiple rounds of negotiation again
(which is needed for socks5)


svn:r2970
---

diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c
index 4ba528c488..b119089c25 100644
--- a/src/or/connection_edge.c
+++ b/src/or/connection_edge.c
@@ -365,6 +365,7 @@ static int connection_ap_handshake_process_socks(connection_t *conn) {
     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);