nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-10 21:23:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

tls works with onion proxies now.

Browse Source 
svn:r449
This commit is contained in:
Roger Dingledine 2003-09-12 06:20:36 +00:00
parent 556bea4b6d
commit b1078b7a3c
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/or/connection.c
View File

@ -308,6 +308,7 @@ static int connection_tls_finish_handshake(connection_t *conn) {
conn->state = OR_CONN_STATE_OPEN;
directory_set_dirty();
connection_watch_events(conn, POLLIN);
log_fn(LOG_DEBUG,"tls handshake done. verifying.");
if(options.OnionRouter) { /* I'm an OR */
if(tor_tls_peer_has_cert(conn->tls)) { /* it's another OR */
pk = tor_tls_verify(conn->tls);
@ -368,7 +369,6 @@ static int connection_tls_finish_handshake(connection_t *conn) {
conn->bandwidth = DEFAULT_BANDWIDTH_OP;
circuit_n_conn_open(conn); /* send the pending create */
}
log_fn(LOG_DEBUG,"tls handshake done, now open.");
return 0;
}
#endif

5
src/or/connection_or.c
View File

@ -36,7 +36,8 @@ int connection_or_process_inbuf(connection_t *conn) {
}
#ifdef USE_TLS
assert(conn->state == OR_CONN_STATE_OPEN);
if(conn->state != OR_CONN_STATE_OPEN)
return 0; /* don't do anything */
return connection_process_cell_from_inbuf(conn);
#else
// log(LOG_DEBUG,"connection_or_process_inbuf(): state %d.",conn->state);
@ -81,7 +82,7 @@ int connection_or_finished_flushing(connection_t *conn) {
}
/* the connect has finished. */
log_fn(LOG_DEBUG,"OR connection to router %s:%u established.",
log_fn(LOG_DEBUG,"OR connect() to router %s:%u finished.",
conn->address,conn->port);
#ifdef USE_TLS