Commit 802d7e22 authored by Mike Perry's avatar Mike Perry Committed by David Goulet
Browse files

Prop#324: Add congestion control state to structs

parent f1d0c2d8
Loading
Loading
Loading
Loading
+4 −0
Original line number Original line Diff line number Diff line
@@ -22,6 +22,7 @@
struct hs_token_t;
struct hs_token_t;
struct circpad_machine_spec_t;
struct circpad_machine_spec_t;
struct circpad_machine_runtime_t;
struct circpad_machine_runtime_t;
struct congestion_control_t;


/** Number of padding state machines on a circuit. */
/** Number of padding state machines on a circuit. */
#define CIRCPAD_MAX_MACHINES (2)
#define CIRCPAD_MAX_MACHINES (2)
@@ -244,6 +245,9 @@ struct circuit_t {
   * that STOP commands actually correspond to the current machine,
   * that STOP commands actually correspond to the current machine,
   * and not a previous one. */
   * and not a previous one. */
  uint32_t padding_machine_ctr;
  uint32_t padding_machine_ctr;

  /** Congestion control fields */
  struct congestion_control_t *ccontrol;
};
};


#endif /* !defined(CIRCUIT_ST_H) */
#endif /* !defined(CIRCUIT_ST_H) */
+5 −0
Original line number Original line Diff line number Diff line
@@ -29,6 +29,8 @@ struct onion_handshake_state_t {
  } u;
  } u;
};
};


struct congestion_control_t;

/** Macro to encapsulate private members of a struct.
/** Macro to encapsulate private members of a struct.
 *
 *
 *  Renames 'x' to 'x_crypt_path_private_field'.
 *  Renames 'x' to 'x_crypt_path_private_field'.
@@ -80,6 +82,9 @@ struct crypt_path_t {
  int deliver_window; /**< How many cells are we willing to deliver originating
  int deliver_window; /**< How many cells are we willing to deliver originating
                       * at this step? */
                       * at this step? */


  /** Congestion control info */
  struct congestion_control_t *ccontrol;

  /*********************** Private members ****************************/
  /*********************** Private members ****************************/


  /** Private member: Cryptographic state used for encrypting and
  /** Private member: Cryptographic state used for encrypting and