diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-07-20 12:55:42 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-07-21 11:15:25 -0400 |
| commit | 569fe936b8349082d6f9dcd4e55f7d5758d236be (patch) | |
| tree | ec9ea9960da15b0f20dd2805f6fea5fa040ed536 /src/or/directory.c | |
| parent | 33e6a3d75054d9dbb945434d9fe5c3f6be162adb (diff) | |
| download | tor-569fe936b8349082d6f9dcd4e55f7d5758d236be.tar tor-569fe936b8349082d6f9dcd4e55f7d5758d236be.tar.gz | |
Move entry-only fields from edge_connection_t to entry_connection_t
Also, refactor the code accordingly.
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 744bc120f..16bea8256 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)); } } |