Commit 731d37f7 authored by Roger Dingledine's avatar Roger Dingledine
Browse files

more useful log messages when we give up on a stream 


svn:r9552
parent a1c80551

src/or/connection.c

+4 −4
Original line number Diff line number Diff line
@@ -99,13 +99,13 @@ conn_state_to_string(int type, int state) 
      break;

    case CONN_TYPE_AP:

      switch (state) {

        case AP_CONN_STATE_SOCKS_WAIT: return "waiting for dest info";

        case AP_CONN_STATE_SOCKS_WAIT: return "waiting for socks info";

        case AP_CONN_STATE_NATD_WAIT: return "waiting for natd dest info";

        case AP_CONN_STATE_RENDDESC_WAIT: return "waiting for rendezvous desc";

        case AP_CONN_STATE_CONTROLLER_WAIT: return "waiting for controller";

        case AP_CONN_STATE_CIRCUIT_WAIT: return "waiting for safe circuit";

        case AP_CONN_STATE_CONNECT_WAIT: return "waiting for connect";

        case AP_CONN_STATE_RESOLVE_WAIT: return "waiting for resolve";

        case AP_CONN_STATE_CIRCUIT_WAIT: return "waiting for circuit";

        case AP_CONN_STATE_CONNECT_WAIT: return "waiting for connect response";

        case AP_CONN_STATE_RESOLVE_WAIT: return "waiting for resolve response";

        case AP_CONN_STATE_OPEN: return "open";

      }

      break;

src/or/connection_edge.c

+18 −21
Original line number Diff line number Diff line
@@ -372,14 +372,12 @@ connection_ap_expire_beginning(void) 


    if (AP_CONN_STATE_IS_UNATTACHED(conn->_base.state)) {

      if (seconds_idle >= options->SocksTimeout) {

        if (conn->_base.state == AP_CONN_STATE_CIRCUIT_WAIT) {

        log_fn(severity, LD_APP,

            "Tried for %d seconds to get a connection to %s:%d. Giving up.",

            "Tried for %d seconds to get a connection to %s:%d. "

            "Giving up. (%s)",

            seconds_idle, safe_str(conn->socks_request->address),

            conn->socks_request->port);

        } else {

          log_fn(severity, LD_APP, "Closing unattached stream (state %d).",

                 conn->_base.state);

            conn->socks_request->port,

            conn_state_to_string(CONN_TYPE_AP, conn->_base.state));

        /* XXX012 remove the below clause before stable release -RD */

        if (conn->_base.state == AP_CONN_STATE_SOCKS_WAIT) {

          /* extra debugging */
@@ -394,7 +392,6 @@ connection_ap_expire_beginning(void) 
                 conn->socks_request->address,

                 (int)conn->socks_request->port);

        }

        }

        connection_mark_unattached_ap(conn, END_STREAM_REASON_TIMEOUT);

      }

      continue;