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/main.c | |
| parent | 33e6a3d75054d9dbb945434d9fe5c3f6be162adb (diff) | |
| download | tor-569fe936b8349082d6f9dcd4e55f7d5758d236be.tar.gz tor-569fe936b8349082d6f9dcd4e55f7d5758d236be.zip | |
Move entry-only fields from edge_connection_t to entry_connection_t
Also, refactor the code accordingly.
Diffstat (limited to 'src/or/main.c')
| -rw-r--r-- | src/or/main.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/or/main.c b/src/or/main.c index 54e6451e6a..6866ccc8ce 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -859,13 +859,13 @@ directory_all_unreachable(time_t now) while ((conn = connection_get_by_type_state(CONN_TYPE_AP, AP_CONN_STATE_CIRCUIT_WAIT))) { - edge_connection_t *edge_conn = TO_EDGE_CONN(conn); + entry_connection_t *entry_conn = TO_ENTRY_CONN(conn); log_notice(LD_NET, "Is your network connection down? " "Failing connection to '%s:%d'.", - safe_str_client(edge_conn->socks_request->address), - edge_conn->socks_request->port); - connection_mark_unattached_ap(edge_conn, + safe_str_client(entry_conn->socks_request->address), + entry_conn->socks_request->port); + connection_mark_unattached_ap(entry_conn, END_STREAM_REASON_NET_UNREACHABLE); } control_event_general_status(LOG_ERR, "DIR_ALL_UNREACHABLE"); |