Remove some resolved "XXXX prop271" comments.

This commit is contained in:
Nick Mathewson 2016-11-29 14:31:24 -05:00
parent 6c3f555a8c
commit f4e64c04f4
4 changed files with 6 additions and 5 deletions

View File

@ -1652,9 +1652,10 @@ circuit_build_failed(origin_circuit_t *circ)
"Our circuit died before the first hop with no connection");
}
if (n_chan_id && !already_marked) {
/* New guard API: we failed. */
if (circ->guard_state)
entry_guard_failed(&circ->guard_state);
/* XXXX prop271 -- old API */
/* Old guard API: we failed. */
entry_guard_register_connect_status(n_chan_id, 0, 1, time(NULL));
/* if there are any one-hop streams waiting on this circuit, fail
* them now so they can retry elsewhere. */

View File

@ -735,8 +735,9 @@ connection_or_about_to_close(or_connection_t *or_conn)
const or_options_t *options = get_options();
connection_or_note_state_when_broken(or_conn);
rep_hist_note_connect_failed(or_conn->identity_digest, now);
/* Tell the new guard API about the channel failure */
entry_guard_chan_failed(TLS_CHAN_TO_BASE(or_conn->chan));
/* XXXX prop271 -- old API */
/* Tell the old guard API about the channel failure */
entry_guard_register_connect_status(or_conn->identity_digest,0,
!options->HTTPSProxy, now);
if (conn->state >= OR_CONN_STATE_TLS_HANDSHAKING) {
@ -1675,8 +1676,9 @@ connection_or_client_learned_peer_id(or_connection_t *conn,
"Tried connecting to router at %s:%d, but identity key was not "
"as expected: wanted %s but got %s.%s",
conn->base_.address, conn->base_.port, expected, seen, extra_log);
/* Tell the new guard API about the channel failure */
entry_guard_chan_failed(TLS_CHAN_TO_BASE(conn->chan));
/* XXXX prop271 old API */
/* Tell the old guard API about the channel failure */
entry_guard_register_connect_status(conn->identity_digest, 0, 1,
time(NULL));
control_event_or_conn_status(conn, OR_CONN_EVENT_FAILED,

View File

@ -1928,7 +1928,6 @@ entry_guard_has_higher_priority(entry_guard_t *a, entry_guard_t *b)
void
circuit_guard_state_free(circuit_guard_state_t *state)
{
/* XXXX prop271 -- do we want to inline this structure? */
if (!state)
return;
entry_guard_handle_free(state->guard);

View File

@ -226,7 +226,6 @@ typedef enum guard_selection_type_t {
/**
* All of the the context for guard selection on a particular client.
*
* (XXXX prop271 this paragraph below is not actually implemented yet.)
* We maintain multiple guard selection contexts for a client, depending
* aspects on its current configuration -- whether an extremely
* restrictive EntryNodes is used, whether UseBridges is enabled, and so