Commit 43701e1e authored by Mike Perry's avatar Mike Perry Committed by George Kadianakis
Browse files

Circuit padding machine creation events. 



These event callbacks allow circuit padding to decide when to attempt to
launch and negotiate new padding machines, and when to tear old ones down.

Co-authored-by: default avatarGeorge Kadianakis <desnacked@riseup.net>
parent 4ca1df6b

src/core/or/circuitbuild.c

+4 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ 
#include "core/or/circuitlist.h"

#include "core/or/circuitstats.h"

#include "core/or/circuituse.h"

#include "core/or/circuitpadding.h"

#include "core/or/command.h"

#include "core/or/connection_edge.h"

#include "core/or/connection_or.h"
@@ -950,12 +951,15 @@ circuit_send_next_onion_skin(origin_circuit_t *circ) 
  crypt_path_t *hop = onion_next_hop_in_cpath(circ->cpath);

  circuit_build_times_handle_completed_hop(circ);



  circpad_machine_event_circ_added_hop(circ);



  if (hop) {

    /* Case two: we're on a hop after the first. */

    return circuit_send_intermediate_onion_skin(circ, hop);

  }



  /* Case three: the circuit is finished. Do housekeeping tasks on it. */

  circpad_machine_event_circ_built(circ);

  return circuit_build_no_more_hops(circ);

}

src/core/or/circuituse.c

+14 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ 
#include "core/or/circuitlist.h"

#include "core/or/circuitstats.h"

#include "core/or/circuituse.h"

#include "core/or/circuitpadding.h"

#include "core/or/connection_edge.h"

#include "core/or/policies.h"

#include "feature/client/addressmap.h"
@@ -1419,6 +1420,11 @@ circuit_detach_stream(circuit_t *circ, edge_connection_t *conn) 
      if (circ->purpose == CIRCUIT_PURPOSE_S_REND_JOINED) {

        hs_dec_rdv_stream_counter(origin_circ);

      }



      /* If there are no more streams on this circ, tell circpad */

      if (!origin_circ->p_streams)

        circpad_machine_event_circ_has_no_streams(origin_circ);



      return;

    }

  } else {
@@ -2587,6 +2593,12 @@ link_apconn_to_circ(entry_connection_t *apconn, origin_circuit_t *circ, 
  /* add it into the linked list of streams on this circuit */

  log_debug(LD_APP|LD_CIRC, "attaching new conn to circ. n_circ_id %u.",

            (unsigned)circ->base_.n_circ_id);



  /* If this is the first stream on this circuit, tell circpad

   * that streams are attached */

  if (!circ->p_streams)

    circpad_machine_event_circ_has_streams(circ);



  /* reset it, so we can measure circ timeouts */

  ENTRY_TO_CONN(apconn)->timestamp_last_read_allowed = time(NULL);

  ENTRY_TO_EDGE_CONN(apconn)->next_stream = circ->p_streams;
@@ -3065,6 +3077,8 @@ circuit_change_purpose(circuit_t *circ, uint8_t new_purpose) 
  if (CIRCUIT_IS_ORIGIN(circ)) {

    control_event_circuit_purpose_changed(TO_ORIGIN_CIRCUIT(circ),

                                          old_purpose);



    circpad_machine_event_circ_purpose_changed(TO_ORIGIN_CIRCUIT(circ));

  }

}

src/core/or/connection_edge.c

+5 −0
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@ 
#include "core/or/circuitbuild.h"

#include "core/or/circuitlist.h"

#include "core/or/circuituse.h"

#include "core/or/circuitpadding.h"

#include "core/or/connection_edge.h"

#include "core/or/connection_or.h"

#include "core/or/policies.h"
@@ -3694,6 +3695,10 @@ handle_hs_exit_conn(circuit_t *circ, edge_connection_t *conn) 
  /* Link the circuit and the connection crypt path. */

  conn->cpath_layer = origin_circ->cpath->prev;



  /* If this is the first stream on this circuit, tell circpad */

  if (!origin_circ->p_streams)

    circpad_machine_event_circ_has_streams(origin_circ);



  /* Add it into the linked list of p_streams on this circuit */

  conn->next_stream = origin_circ->p_streams;

  origin_circ->p_streams = conn;

src/core/or/relay.c

+3 −1
Original line number Diff line number Diff line
@@ -602,7 +602,9 @@ relay_send_command_from_edge_,(streamid_t stream_id, circuit_t *circ, 
       * one of them.  Don't worry about the conn protocol version:

       * append_cell_to_circuit_queue will fix it up. */

      cell.command = CELL_RELAY_EARLY;

      --origin_circ->remaining_relay_early_cells;

      /* If we're out of relay early cells, tell circpad */

      if (--origin_circ->remaining_relay_early_cells == 0)

        circpad_machine_event_circ_has_no_relay_early(origin_circ);

      log_debug(LD_OR, "Sending a RELAY_EARLY cell; %d remaining.",

                (int)origin_circ->remaining_relay_early_cells);

      /* Memorize the command that is sent as RELAY_EARLY cell; helps debug