nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-30 15:43:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

bugfix: hidden services were broken in cvs

Browse Source 
svn:r2053
This commit is contained in:
Roger Dingledine 2004-07-17 19:50:29 +00:00
parent df3544422c
commit 87d0948903
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/or/connection_edge.c
View File

@ -367,7 +367,7 @@ static int connection_ap_handshake_process_socks(connection_t *conn) {
log_fn(LOG_DEBUG,"socks handshake not all here yet."); log_fn(LOG_DEBUG,"socks handshake not all here yet.");
} }
if (sockshere == -1) if (sockshere == -1)
conn->socks_request->has_finished = 1; socks->has_finished = 1;
return sockshere; return sockshere;
} /* else socks handshake is done, continue processing */ } /* else socks handshake is done, continue processing */
@ -397,6 +397,8 @@ static int connection_ap_handshake_process_socks(connection_t *conn) {
return connection_ap_handshake_attach_circuit(conn); return connection_ap_handshake_attach_circuit(conn);
} else { } else {
/* it's a hidden-service request */ /* it's a hidden-service request */
/* XXX008 what does it mean to socks-resolve a hidden service? should
* we fail those right here? */
rend_cache_entry_t *entry; rend_cache_entry_t *entry;
int r; int r;
@ -577,6 +579,7 @@ int connection_ap_make_bridge(char *address, uint16_t port) {
conn->socks_request->has_finished = 0; /* waiting for 'connected' */ conn->socks_request->has_finished = 0; /* waiting for 'connected' */
strcpy(conn->socks_request->address, address); strcpy(conn->socks_request->address, address);
conn->socks_request->port = port; conn->socks_request->port = port;
conn->socks_request->command = SOCKS_COMMAND_CONNECT;
conn->address = tor_strdup("(local bridge)"); conn->address = tor_strdup("(local bridge)");
conn->addr = ntohs(0); conn->addr = ntohs(0);