diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/or/connection_or.c | 8 | ||||
| -rw-r--r-- | src/or/directory.c | 6 |
2 files changed, 4 insertions, 10 deletions
diff --git a/src/or/connection_or.c b/src/or/connection_or.c index c61f3117b..5fb4ac183 100644 --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@ -112,8 +112,6 @@ connection_t *connection_or_connect(routerinfo_t *router) { /* set up conn so it's got all the data we need to remember */ connection_or_init_conn_from_router(conn, router); - /* XXXX Should all this stuff do mark-for-close instead? */ - if(connection_add(conn) < 0) { /* no space, forget it */ connection_free(conn); return NULL; @@ -121,8 +119,7 @@ connection_t *connection_or_connect(routerinfo_t *router) { switch(connection_connect(conn, router->address, router->addr, router->or_port)) { case -1: - connection_remove(conn); - connection_free(conn); + connection_mark_for_close(conn, 0); return NULL; case 0: connection_set_poll_socket(conn); @@ -140,8 +137,7 @@ connection_t *connection_or_connect(routerinfo_t *router) { return conn; /* failure */ - connection_remove(conn); - connection_free(conn); + connection_mark_for_close(conn, 0); return NULL; } diff --git a/src/or/directory.c b/src/or/directory.c index f3f4025cd..4506cf945 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -48,8 +48,7 @@ void directory_initiate_command(routerinfo_t *router, int command) { switch(connection_connect(conn, router->address, router->addr, router->dir_port)) { case -1: router_mark_as_down(conn->nickname); /* don't try him again */ - connection_remove(conn); - connection_free(conn); + connection_mark_for_close(conn, 0); return; case 0: connection_set_poll_socket(conn); @@ -63,8 +62,7 @@ void directory_initiate_command(routerinfo_t *router, int command) { connection_set_poll_socket(conn); if(directory_send_command(conn, command) < 0) { - connection_remove(conn); - connection_free(conn); + connection_mark_for_close(conn, 0); } } |