Commit 92ce533f authored by Nick Mathewson's avatar Nick Mathewson 🥔
Browse files

Another round of downgrading removing or postponing XXXX021 issues. Some remain, though. 

svn:r17888
parent 9c94b428

src/or/config.c

+1 −1
Original line number Diff line number Diff line
@@ -3512,7 +3512,7 @@ options_validate(or_options_t *old_options, or_options_t *options, 
           "a non-default set of DirServers.");

  }



  /*XXXX021 checking for defaults manually like this is a bit fragile.*/

  /*XXXX022 checking for defaults manually like this is a bit fragile.*/



  /* Keep changes to hard-coded values synchronous to man page and default

   * values table. */

src/or/connection_edge.c

+3 −3
Original line number Diff line number Diff line
@@ -504,7 +504,7 @@ connection_ap_attach_pending(void) 


/** Tell any AP streams that are waiting for a onehop tunnel to

 * <b>failed_digest</b> that they are going to fail. */

/* XXX021 We should get rid of this function, and instead attach

/* XXX022 We should get rid of this function, and instead attach

 * onehop streams to circ->p_streams so they get marked in

 * circuit_mark_for_close like normal p_streams. */

void
@@ -2294,7 +2294,7 @@ tell_controller_about_resolved_result(edge_connection_t *conn, 
 * certain errors or for values that didn't come via DNS.  <b>expires</b> is

 * a time when the answer expires, or -1 or TIME_MAX if there's a good TTL.

 **/

/* XXXX021 the use of the ttl and expires fields is nutty.  Let's make this

/* XXXX022 the use of the ttl and expires fields is nutty.  Let's make this

 * interface and those that use it less ugly. */

void

connection_ap_handshake_socks_resolved(edge_connection_t *conn,
@@ -2828,7 +2828,7 @@ int 
connection_edge_is_rendezvous_stream(edge_connection_t *conn)

{

  tor_assert(conn);

  if (conn->rend_data) /* XXX */ /* XXXX Why is this XXX? -NM */

  if (conn->rend_data)

    return 1;

  return 0;

}

src/or/directory.c

+2 −2
Original line number Diff line number Diff line
@@ -342,7 +342,7 @@ directory_get_from_dirserver(uint8_t dir_purpose, uint8_t router_purpose, 
  if (!get_via_tor) {

    if (options->UseBridges && type != BRIDGE_AUTHORITY) {

      /* want to ask a running bridge for which we have a descriptor. */

      /* XXX021 we assume that all of our bridges can answer any

      /* XXX022 we assume that all of our bridges can answer any

       * possible directory question. This won't be true forever. -RD */

      /* It certainly is not true with conditional consensus downloading,

       * so, for now, never assume the server supports that. */
@@ -2606,7 +2606,7 @@ directory_handle_command_get(dir_connection_t *conn, const char *headers, 
    ssize_t estimated_len = 0;

    smartlist_t *items = smartlist_create();

    smartlist_t *dir_items = smartlist_create();

    int lifetime = 60; /* XXXX021 should actually use vote intervals. */

    int lifetime = 60; /* XXXX022 should actually use vote intervals. */

    url += strlen("/tor/status-vote/");

    current = !strcmpstart(url, "current/");

    url = strchr(url, '/');

src/or/dirserv.c

+2 −2
Original line number Diff line number Diff line
@@ -1873,8 +1873,8 @@ version_from_platform(const char *platform) 
  if (platform && !strcmpstart(platform, "Tor ")) {

    const char *eos = find_whitespace(platform+4);

    if (eos && !strcmpstart(eos, " (r")) {

      /* XXXX021 Unify this logic with the other version extraction

       * logic */

      /* XXXX Unify this logic with the other version extraction

       * logic in routerparse.c. */

      eos = find_whitespace(eos+1);

    }

    if (eos) {

src/or/routerlist.c

+2 −2
Original line number Diff line number Diff line
@@ -1719,7 +1719,7 @@ smartlist_choose_by_bandwidth(smartlist_t *sl, bandwidth_weight_rule_t rule, 
    }

  }



  /* XXXX021 this is a kludge to expose these values. */

  /* XXXX022 this is a kludge to expose these values. */

  sl_last_total_weighted_bw = total_bw;



  log_debug(LD_CIRC, "Total weighted bw = "U64_FORMAT
@@ -3081,7 +3081,7 @@ router_add_extrainfo_to_routerlist(extrainfo_t *ei, const char **msg, 
  int inserted;

  (void)from_fetch;

  if (msg) *msg = NULL;

  /*XXXX021 Do something with msg */

  /*XXXX022 Do something with msg */



  inserted = extrainfo_insert(router_get_routerlist(), ei);