Commit 1155ae9b authored by Nick Mathewson's avatar Nick Mathewson 🦀
Browse files

Bring assert_connection_ok up to date 


svn:r863
parent 5e9ba094

src/or/connection.c

+5 −8
Original line number Diff line number Diff line
@@ -717,8 +717,10 @@ void assert_connection_ok(connection_t *conn, time_t now) 
   * marked_for_close. */

  

  /* buffers */

  if (!connection_is_listener(conn)) {

    assert(conn->inbuf);

    assert(conn->outbuf);

  }



  assert(!now || conn->timestamp_lastread <= now);

  assert(!now || conn->timestamp_lastwritten <= now);
@@ -788,12 +790,7 @@ void assert_connection_ok(connection_t *conn, time_t now) 
    case CONN_TYPE_AP:

      assert(conn->state >= _AP_CONN_STATE_MIN &&

             conn->state <= _AP_CONN_STATE_MAX);

      if (conn->state == AP_CONN_STATE_SOCKS_WAIT ||

          conn->state == AP_CONN_STATE_CIRCUIT_WAIT) {

      assert(conn->socks_request);

      } else {

        assert(!conn->socks_request);

      }

      break;

    case CONN_TYPE_DIR:

      assert(conn->state >= _DIR_CONN_STATE_MIN &&