diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-09-07 14:13:57 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-09-07 14:13:57 -0400 |
| commit | 0cb01f5c971e497706b209c3fe75aedd089e3c8a (patch) | |
| tree | ce8a48e2255289d2c513dd1b7b8336f56dc9a37e /src/or/directory.c | |
| parent | 8aad677bb7542376b053ecd12a0c6943e8cfa3c0 (diff) | |
| parent | 569fe936b8349082d6f9dcd4e55f7d5758d236be (diff) | |
| download | tor-0cb01f5c971e497706b209c3fe75aedd089e3c8a.tar tor-0cb01f5c971e497706b209c3fe75aedd089e3c8a.tar.gz | |
Merge remote-tracking branch 'public/split_entry_conn'
Conflicts:
src/or/connection.c
src/or/connection_edge.c
src/or/connection_edge.h
src/or/dnsserv.c
Some of these were a little tricky, since they touched code that
changed because of the prop171 fixes.
Diffstat (limited to 'src/or/directory.c')
| -rw-r--r-- | src/or/directory.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/or/directory.c b/src/or/directory.c index c3865eda8..cd0b9b4de 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -972,7 +972,7 @@ directory_initiate_command_rend(const char *address, const tor_addr_t *_addr, error indicates broken link in windowsland. */ } } else { /* we want to connect via a tor connection */ - edge_connection_t *linked_conn; + entry_connection_t *linked_conn; /* Anonymized tunneled connections can never share a circuit. * One-hop directory connections can share circuits with each other * but nothing else. */ @@ -1014,10 +1014,11 @@ directory_initiate_command_rend(const char *address, const tor_addr_t *_addr, if_modified_since); connection_watch_events(TO_CONN(conn), READ_EVENT|WRITE_EVENT); - IF_HAS_BUFFEREVENT(TO_CONN(linked_conn), { - connection_watch_events(TO_CONN(linked_conn), READ_EVENT|WRITE_EVENT); + IF_HAS_BUFFEREVENT(ENTRY_TO_CONN(linked_conn), { + connection_watch_events(ENTRY_TO_CONN(linked_conn), + READ_EVENT|WRITE_EVENT); }) ELSE_IF_NO_BUFFEREVENT - connection_start_reading(TO_CONN(linked_conn)); + connection_start_reading(ENTRY_TO_CONN(linked_conn)); } } |