Prop#324: Add congestion control state to structs

diff --git a/src/core/or/circuit_st.h b/src/core/or/circuit_st.h
index 870bcbf7cf0b83534e6e2ffb067636ea88b62d17..be6429438a5d362c04e4fd63e445c4122f848099 100644 (file)
--- a/src/core/or/circuit_st.h
+++ b/src/core/or/circuit_st.h
@@ -22,6 +22,7 @@
 struct hs_token_t;
 struct circpad_machine_spec_t;
 struct circpad_machine_runtime_t;
+struct congestion_control_t;
 
 /** Number of padding state machines on a circuit. */
 #define CIRCPAD_MAX_MACHINES (2)
@@ -244,6 +245,9 @@ struct circuit_t {
    * that STOP commands actually correspond to the current machine,
    * and not a previous one. */
   uint32_t padding_machine_ctr;
+
+  /** Congestion control fields */
+  struct congestion_control_t *ccontrol;
 };
 
 #endif /* !defined(CIRCUIT_ST_H) */

diff --git a/src/core/or/crypt_path_st.h b/src/core/or/crypt_path_st.h
index 2529b6ee416eb08f61439ab780394a7935660442..ddc85eec14811b117b4284f3bfc8e55d28105418 100644 (file)
--- a/src/core/or/crypt_path_st.h
+++ b/src/core/or/crypt_path_st.h
@@ -29,6 +29,8 @@ struct onion_handshake_state_t {
   } u;
 };
 
+struct congestion_control_t;
+
 /** Macro to encapsulate private members of a struct.
  *
  *  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
                        * at this step? */
 
+  /** Congestion control info */
+  struct congestion_control_t *ccontrol;
+
   /*********************** Private members ****************************/
 
   /** Private member: Cryptographic state used for encrypting and