Commit 93318ba5 authored by Nick Mathewson's avatar Nick Mathewson 🥔 Committed by Mike Perry
Browse files

Convert TODO into TODO-324 for better visibility.

parent 662b9c1c

src/core/crypto/onion_crypto.c

+10 −11
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ 
#include "core/or/crypt_path_st.h"

#include "core/or/extend_info_st.h"



/* TODO: Add this to the specification! */

/* TODO-324: Add this to the specification! */

const uint8_t NTOR3_CIRC_VERIFICATION[] = "circuit extend";

const size_t NTOR3_CIRC_VERIFICATION_LEN = 14;
@@ -233,7 +233,7 @@ onion_skin_server_handshake(int type, 
                      circuit_params_t *params_out)

{

  int r = -1;

  memset(params_out, 0, sizeof(*params_out)); // TODO: actually set.

  memset(params_out, 0, sizeof(*params_out)); // TODO-324: actually set this!



  switch (type) {

  case ONION_HANDSHAKE_TYPE_TAP:
@@ -306,10 +306,10 @@ onion_skin_server_handshake(int type, 
    uint8_t reply_msg[1] = { 0 };

    size_t reply_msg_len = 1;

    {

      /* TODO, Okay, we have a message from the client trying to negotiate

       * parameters.  We need to decide whether the client's request is

       * okay, what we're going to say in response, and what circuit

       * parameters we've just negotiated

      /* TODO-324, Okay, we have a message from the client trying to negotiate

       * parameters.  We need to decide whether the client's request is okay,

       * what we're going to say in response, and what circuit parameters

       * we've just negotiated

       */



      /* NOTE! DANGER, DANGER, DANGER!
@@ -331,12 +331,12 @@ onion_skin_server_handshake(int type, 
               reply_msg, reply_msg_len,

               &server_handshake, &server_handshake_len,

               keys_tmp, keys_tmp_len) < 0) {

      // XXX TODO free some stuff

      // XXX TODO-324 free some stuff

      return -1;

    }



    if (server_handshake_len > reply_out_maxlen) {

      // XXX TODO free that stuff

      // XXX TODO-324 free that stuff

      return -1;

    }
@@ -382,7 +382,7 @@ onion_skin_client_handshake(int type, 
  if (handshake_state->tag != type)

    return -1;



  memset(params_out, 0, sizeof(*params_out)); // TODO: actually set.

  memset(params_out, 0, sizeof(*params_out)); // TODO-324: actually set this!



  switch (type) {

  case ONION_HANDSHAKE_TYPE_TAP:
@@ -450,9 +450,8 @@ onion_skin_client_handshake(int type, 
      return -1;

    }



    // XXXX handle the server message!

    {

      // XXXX TODO: see what the server said, make sure it's okay, see what

      // XXXX TODO-324: see what the server said, make sure it's okay, see what

      // parameters it gave us, make sure we like them, and put them into

      // `params_out`

    }

src/core/mainloop/cpuworker.c

+1 −1
Original line number Diff line number Diff line
@@ -390,7 +390,7 @@ cpuworker_onion_handshake_replyfn(void *work_) 
    goto done_processing;

  }



  /* TODO! We need to use rpl.circ_params here to initialize the congestion

  /* TODO-324! We need to use rpl.circ_params here to initialize the congestion

     control parameters of the circuit. */



  log_debug(LD_OR,"onionskin_answer succeeded. Yay.");

src/core/or/circuitbuild.c

+2 −2
Original line number Diff line number Diff line
@@ -1263,7 +1263,7 @@ circuit_finish_handshake(origin_circuit_t *circ, 


  onion_handshake_state_release(&hop->handshake_state);



  // XXXX TODO: use `params` to initialize the congestion control.

  // XXXX TODO-324: use `params` to initialize the congestion control.



  if (cpath_init_circuit_crypto(hop, keys, sizeof(keys), 0, 0)<0) {

    return -END_CIRC_REASON_TORPROTOCOL;
@@ -2600,6 +2600,6 @@ client_circ_negotiation_message(const extend_info_t *ei, 
  if (! ei->supports_ntor3_and_param_negotiation)

    return -1;



  /* TODO: fill in the client message that gets sent. */

  /* TODO-324: fill in the client message that gets sent. */

  tor_assert_unreached();

}

src/core/or/command.c

+2 −2
Original line number Diff line number Diff line
@@ -381,8 +381,8 @@ command_process_create_cell(cell_t *cell, channel_t *chan) 
    created_cell.cell_type = CELL_CREATED_FAST;

    created_cell.handshake_len = len;



    // TODO: We should in theory look at params here, though it will always

    // tell us to use the old-fashioned congestion control.

    // TODO-324: We should in theory look at params here, though it will

    // always tell us to use the old-fashioned congestion control.



    if (onionskin_answer(circ, &created_cell,

                         (const char *)keys, sizeof(keys),

src/core/or/congestion_control_common.c

+2 −2
Original line number Diff line number Diff line
@@ -277,10 +277,10 @@ congestion_control_new(const circuit_params_t *params) 
{

  congestion_control_t *cc = tor_malloc_zero(sizeof(congestion_control_t));



  /* TODO: Use `params` to pick the algorithm and the window. */

  /* TODO-324: Use `params` to pick the algorithm and the window. */

  (void) params;



  // XXX: the alg and the sendme_inc need to be negotiated during

  // TODO-324: XXX: the alg and the sendme_inc need to be negotiated during

  // circuit handshake

  congestion_control_init(cc, CC_ALG_VEGAS, SENDME_INC_DFLT);