nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-09-21 13:34:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix SOCKS5 bug: Set replylen to 0 after sending hanshake back

Browse Source 
svn:r3850
This commit is contained in:
Nick Mathewson 2005-03-24 01:11:28 +00:00
parent 0cfdeb01c8
commit 8e8915f3ca
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/or/connection_edge.c
View File

@ -840,6 +840,7 @@ static int connection_ap_handshake_process_socks(connection_t *conn) {
if (sockshere == 0) { if (sockshere == 0) {
if (socks->replylen) { if (socks->replylen) {
connection_write_to_buf(socks->reply, socks->replylen, conn); connection_write_to_buf(socks->reply, socks->replylen, conn);
socks->replylen = 0; /* zero it out so we can do another round of negotiation */
} else { } else {
log_fn(LOG_DEBUG,"socks handshake not all here yet."); log_fn(LOG_DEBUG,"socks handshake not all here yet.");
} }
@ -1238,8 +1239,7 @@ void connection_ap_handshake_socks_reply(connection_t *conn, char *reply,
buf[1] = (status==SOCKS5_SUCCEEDED ? SOCKS4_GRANTED : SOCKS4_REJECT); buf[1] = (status==SOCKS5_SUCCEEDED ? SOCKS4_GRANTED : SOCKS4_REJECT);
/* leave version, destport, destip zero */ /* leave version, destport, destip zero */
connection_write_to_buf(buf, SOCKS4_NETWORK_LEN, conn); connection_write_to_buf(buf, SOCKS4_NETWORK_LEN, conn);
} } else if (conn->socks_request->socks_version == 5) {
if (conn->socks_request->socks_version == 5) {
buf[0] = 5; /* version 5 */ buf[0] = 5; /* version 5 */
buf[1] = (char)status; buf[1] = (char)status;
buf[2] = 0; buf[2] = 0;