aboutsummaryrefslogtreecommitdiff
path: root/src/or
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2003-10-06 21:22:12 +0000
committerRoger Dingledine <arma@torproject.org>2003-10-06 21:22:12 +0000
commitb51d2c05a0ab2363b6a49c2451f0627696adff31 (patch)
treefad25b8de3694c79ce453a123e83e75dc4ade89f /src/or
parent767ff716c3672ed9d0953166673be4584a289481 (diff)
downloadtor-b51d2c05a0ab2363b6a49c2451f0627696adff31.tar
tor-b51d2c05a0ab2363b6a49c2451f0627696adff31.tar.gz
no need to trigger an assert if socks handshake is malformed
svn:r542
Diffstat (limited to 'src/or')
-rw-r--r--src/or/connection_edge.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c
index 051ba16d9..82336e5fa 100644
--- a/src/or/connection_edge.c
+++ b/src/or/connection_edge.c
@@ -524,7 +524,7 @@ static int connection_ap_handshake_socks_reply(connection_t *conn, char *reply,
connection_write_to_buf(buf,10,conn);
return connection_flush_buf(conn); /* try to flush it */
}
- assert(0);
+ return 0; /* if socks_version isn't 4 or 5, don't send anything */
}
/*ENDCLOSE*/ static int connection_exit_begin_conn(cell_t *cell, circuit_t *circ) {