fix two assert triggers (darn it, I hate releasing software)

when connecting to a dirserver or OR and the network is down,
we would crash.

svn:r1340

diff --git a/src/or/connection_or.c b/src/or/connection_or.c
index 5fb4ac183d41b3d6808d8fff714d16095c9d845b..833965250c9d25cbf2a187d42258d1ac1793a25c 100644 (file)
--- a/src/or/connection_or.c
+++ b/src/or/connection_or.c
@@ -111,6 +111,7 @@ 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);
+  conn->state = OR_CONN_STATE_CONNECTING;
 
   if(connection_add(conn) < 0) { /* no space, forget it */
     connection_free(conn);
@@ -126,7 +127,6 @@ connection_t *connection_or_connect(routerinfo_t *router) {
       connection_watch_events(conn, POLLIN | POLLOUT | POLLERR);
       /* writable indicates finish, readable indicates broken link,
          error indicates broken link on windows */
-      conn->state = OR_CONN_STATE_CONNECTING;
       return conn;
     /* case 1: fall through */
   }

diff --git a/src/or/directory.c b/src/or/directory.c
index 4506cf945ab049a2cff03498b84f9a20ec72e92f..9c2d7943382e04bef97fc04abe98bc7809fab166 100644 (file)
--- a/src/or/directory.c
+++ b/src/or/directory.c
@@ -40,6 +40,8 @@ void directory_initiate_command(routerinfo_t *router, int command) {
   assert(router->identity_pkey);
   conn->identity_pkey = crypto_pk_dup_key(router->identity_pkey);
 
+  conn->state = command;
+
   if(connection_add(conn) < 0) { /* no space, forget it */
     connection_free(conn);
     return;
@@ -55,7 +57,6 @@ void directory_initiate_command(routerinfo_t *router, int command) {
       connection_watch_events(conn, POLLIN | POLLOUT | POLLERR);
       /* writable indicates finish, readable indicates broken link,
          error indicates broken link in windowsland. */
-      conn->state = command;
       return;
     /* case 1: fall through */
   }
@@ -76,7 +77,6 @@ static int directory_send_command(connection_t *conn, int command) {
   switch(command) {
     case DIR_CONN_STATE_CONNECTING_FETCH:
       connection_write_to_buf(fetchstring, strlen(fetchstring), conn);
-      conn->state = DIR_CONN_STATE_CLIENT_SENDING_FETCH;
       break;
     case DIR_CONN_STATE_CONNECTING_UPLOAD:
       s = router_get_my_descriptor();
@@ -87,7 +87,6 @@ static int directory_send_command(connection_t *conn, int command) {
       snprintf(tmp, sizeof(tmp), "POST / HTTP/1.0\r\nContent-Length: %d\r\n\r\n%s",
                (int)strlen(s), s);
       connection_write_to_buf(tmp, strlen(tmp), conn);
-      conn->state = DIR_CONN_STATE_CLIENT_SENDING_UPLOAD;
       break;
   }
   return 0;