diff options
| author | Nick Mathewson <nickm@torproject.org> | 2007-04-09 21:34:03 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2007-04-09 21:34:03 +0000 |
| commit | 9c3df07b56ac2f3c1272d6234726c0b6e263e359 (patch) | |
| tree | a35d4c415777b26a74b9d922bff59bfbaed02b50 /src/or/connection_edge.c | |
| parent | 32506ad2827b45bb960cf252aa0d08c426801010 (diff) | |
| download | tor-9c3df07b56ac2f3c1272d6234726c0b6e263e359.tar.gz tor-9c3df07b56ac2f3c1272d6234726c0b6e263e359.zip | |
r12687@Kushana: nickm | 2007-04-09 17:05:57 -0400
Try to fix bug 410: move responsibility for attaching/detaching initial streams from circuits into dns_resolve. Needs refactoring a little.
svn:r9931
Diffstat (limited to 'src/or/connection_edge.c')
| -rw-r--r-- | src/or/connection_edge.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index 79192b594f..6583b97f1f 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -2245,12 +2245,7 @@ connection_exit_begin_conn(cell_t *cell, circuit_t *circ) /* send it off to the gethostbyname farm */ switch (dns_resolve(n_stream)) { case 1: /* resolve worked */ - - /* add it into the linked list of n_streams on this circuit */ - n_stream->next_stream = TO_OR_CIRCUIT(circ)->n_streams; - TO_OR_CIRCUIT(circ)->n_streams = n_stream; assert_circuit_ok(circ); - log_debug(LD_EXIT,"about to call connection_exit_connect()."); connection_exit_connect(n_stream); return 0; @@ -2262,8 +2257,6 @@ connection_exit_begin_conn(cell_t *cell, circuit_t *circ) break; case 0: /* resolve added to pending list */ /* add it into the linked list of resolving_streams on this circuit */ - n_stream->next_stream = TO_OR_CIRCUIT(circ)->resolving_streams; - TO_OR_CIRCUIT(circ)->resolving_streams = n_stream; assert_circuit_ok(circ); ; } @@ -2310,8 +2303,6 @@ connection_exit_begin_resolve(cell_t *cell, or_circuit_t *circ) connection_free(TO_CONN(dummy_conn)); return 0; case 0: /* resolve added to pending list */ - dummy_conn->next_stream = circ->resolving_streams; - circ->resolving_streams = dummy_conn; assert_circuit_ok(TO_CIRCUIT(circ)); break; } |