summaryrefslogtreecommitdiff
path: root/src/or/or.h
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2004-03-27 05:45:52 +0000
committerRoger Dingledine <arma@torproject.org>2004-03-27 05:45:52 +0000
commit56dfc3151ffd246e66697a02635c202bbdc31558 (patch)
tree670199ed04d3b36900c56d95e661089437b18b71 /src/or/or.h
parent9ab5f3c067eb9b35aada9ee377927ca6b340c03b (diff)
downloadtor-56dfc3151ffd246e66697a02635c202bbdc31558.tar.gz
tor-56dfc3151ffd246e66697a02635c202bbdc31558.zip
work around a tsocks bug
when an AP connection dies early, be sure to do a socks reject for it. if you just hang up, tsocks goes into an infinite loop. svn:r1352
Diffstat (limited to 'src/or/or.h')
-rw-r--r--src/or/or.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/or/or.h b/src/or/or.h
index feb2d0fd84..f19817e6af 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -554,6 +554,7 @@ struct socks_request_t {
char socks_version;
int replylen;
char reply[MAX_SOCKS_REPLY_LEN];
+ int has_finished; /* has the socks handshake finished? */
char address[MAX_SOCKS_ADDR_LEN];
uint16_t port;
};
@@ -750,6 +751,9 @@ int connection_edge_finished_flushing(connection_t *conn);
int connection_edge_package_raw_inbuf(connection_t *conn);
+void connection_ap_handshake_socks_reply(connection_t *conn, char *reply,
+ int replylen, char success);
+
void connection_exit_connect(connection_t *conn);
int connection_ap_can_use_exit(connection_t *conn, routerinfo_t *exit);
void connection_ap_expire_beginning(void);