summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2005-12-06 23:43:52 +0000
committerRoger Dingledine <arma@torproject.org>2005-12-06 23:43:52 +0000
commitb0ffa34219f7899d60b3f8a41c9674b1d3a52fe9 (patch)
tree1b0e263859c840c6b71c48b5a75f29ea3e618a45
parent871d4c997129008ccc95c040789cc54f1b1916aa (diff)
downloadtor-b0ffa34219f7899d60b3f8a41c9674b1d3a52fe9.tar.gz
tor-b0ffa34219f7899d60b3f8a41c9674b1d3a52fe9.zip
tell the controller about new .onion streams too.
svn:r5520
-rw-r--r--src/or/connection_edge.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c
index 685721f282..f376d3df80 100644
--- a/src/or/connection_edge.c
+++ b/src/or/connection_edge.c
@@ -1116,9 +1116,7 @@ connection_ap_handshake_process_socks(connection_t *conn)
info(LD_REND, "Unknown descriptor %s. Fetching.",
safe_str(conn->rend_query));
rend_client_refetch_renddesc(conn->rend_query);
- return 0;
- }
- if (r>0) {
+ } else { /* r > 0 */
#define NUM_SECONDS_BEFORE_REFETCH (60*15)
if (time(NULL) - entry->received < NUM_SECONDS_BEFORE_REFETCH) {
conn->state = AP_CONN_STATE_CIRCUIT_WAIT;
@@ -1127,15 +1125,15 @@ connection_ap_handshake_process_socks(connection_t *conn)
connection_mark_unattached_ap(conn, END_STREAM_REASON_CANT_ATTACH);
return -1;
}
- return 0;
} else {
conn->state = AP_CONN_STATE_RENDDESC_WAIT;
info(LD_REND, "Stale descriptor %s. Refetching.",
safe_str(conn->rend_query));
rend_client_refetch_renddesc(conn->rend_query);
- return 0;
}
}
+ control_event_stream_status(conn, STREAM_EVENT_NEW);
+ return 0;
}
return 0; /* unreached but keeps the compiler happy */
}