Commit b166a43c authored by Nick Mathewson's avatar Nick Mathewson 🐘
Browse files

Fix another case of refusing to use a chosen exit node because we think it... 

Fix another case of refusing to use a chosen exit node because we think it will reject _mostly_ everything.  Based on patch from rovv.  See bug 752.

svn:r17139
parent 5e762e6a

ChangeLog

+3 −0
Changes for ChangeLog: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -34,6 +34,9 @@ Changes in version 0.2.1.7-alpha - 2008-10-xx 
    - If a broken client asks a non-exit router to connect somewhere,

      do not even do the DNS lookup before rejecting the connection.

      Fixes another case of bug 619.  Patch from rovv.

    - Fix another case of assuming, when a specific exit is requested,

      that we know more than the user about what hosts it allows.

      Fixes another case of bug 752.  Patch from rovv.





Changes in version 0.2.1.6-alpha - 2008-09-30

src/or/circuituse.c

+21 −0
Changes for src/or/circuituse.c: 21 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -1069,6 +1069,7 @@ circuit_get_open_circ_or_launch(edge_connection_t *conn, 


  /* Do we need to check exit policy? */

  if (check_exit_policy) {

    if (!conn->chosen_exit_name) {

      struct in_addr in;

      uint32_t addr = 0;

      if (tor_inet_aton(conn->socks_request->address, &in))
@@ -1081,6 +1082,26 @@ circuit_get_open_circ_or_launch(edge_connection_t *conn, 
                   conn->socks_request->port);

        return -1;

      }

    } else {

      /* XXXX021 Duplicates checks in connection_ap_handshake_attach_circuit

       * XXXX021 Fix this, then backport it? */

      routerinfo_t *router = router_get_by_nickname(conn->chosen_exit_name, 1);

      int opt = conn->_base.chosen_exit_optional;

      if (router && !connection_ap_can_use_exit(conn, router)) {

        log_fn(opt ? LOG_INFO : LOG_WARN, LD_APP,

               "Requested exit point '%s' would refuse request. %s.",

               conn->chosen_exit_name, opt ? "Trying others" : "Closing");

        if (opt) {

          conn->_base.chosen_exit_optional = 0;

          tor_free(conn->chosen_exit_name);

          /* Try again. */

          return circuit_get_open_circ_or_launch(conn,

                                                 desired_circuit_purpose,

                                                 circp);

        }

        return -1;

      }

    }

  }



  /* is one already on the way? */