From 166c70e4db64c8f69c99b2e2856641b992b78f9e Mon Sep 17 00:00:00 2001 From: Roger Dingledine Date: Sat, 17 Apr 2004 20:19:43 +0000 Subject: [PATCH] bugfix: give dir_conn a state before building the bridge, so it has a state if things fail svn:r1660 --- trunk/src/or/directory.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/trunk/src/or/directory.c b/trunk/src/or/directory.c index b7bcf3c909..a8aa296a25 100644 --- a/trunk/src/or/directory.c +++ b/trunk/src/or/directory.c @@ -58,12 +58,12 @@ void directory_initiate_command(routerinfo_t *router, int purpose, /* queue the command on the outbuf */ directory_send_command(conn, purpose, payload, payload_len); + /* give it an initial state */ + conn->state = DIR_CONN_STATE_CONNECTING; + if(purpose == DIR_PURPOSE_FETCH_DIR || purpose == DIR_PURPOSE_UPLOAD_DIR) { - /* then we want to connect directly */ - conn->state = DIR_CONN_STATE_CONNECTING; - switch(connection_connect(conn, conn->address, conn->addr, conn->port)) { case -1: router_mark_as_down(conn->nickname); /* don't try him again */