1 files changed, 73 insertions, 43 deletions

diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c
index b84d7f762..c581365f8 100644
--- a/src/or/circuitlist.c
+++ b/src/or/circuitlist.c
@@ -10,6 +10,21 @@
  **/
 
 #include "or.h"
+#include "circuitbuild.h"
+#include "circuitlist.h"
+#include "circuituse.h"
+#include "connection.h"
+#include "config.h"
+#include "connection_edge.h"
+#include "connection_or.h"
+#include "control.h"
+#include "networkstatus.h"
+#include "onion.h"
+#include "relay.h"
+#include "rendclient.h"
+#include "rendcommon.h"
+#include "rephist.h"
+#include "routerlist.h"
 #include "ht.h"
 
 /********* START VARIABLES **********/
@@ -352,6 +367,8 @@ circuit_purpose_to_controller_string(uint8_t purpose)
 
     case CIRCUIT_PURPOSE_TESTING:
       return "TESTING";
+    case CIRCUIT_PURPOSE_C_MEASURE_TIMEOUT:
+      return "EXPIRED";
     case CIRCUIT_PURPOSE_CONTROLLER:
       return "CONTROLLER";
 
@@ -380,10 +397,17 @@ static void
 init_circuit_base(circuit_t *circ)
 {
   circ->timestamp_created = time(NULL);
+  tor_gettimeofday(&circ->highres_created);
 
   circ->package_window = circuit_initial_package_window();
   circ->deliver_window = CIRCWINDOW_START;
 
+  /* Initialize the cell_ewma_t structure */
+  circ->n_cell_ewma.last_adjusted_tick = cell_ewma_get_tick();
+  circ->n_cell_ewma.cell_count = 0.0;
+  circ->n_cell_ewma.heap_index = -1;
+  circ->n_cell_ewma.is_for_p_conn = 0;
+
   circuit_add(circ);
 }
 
@@ -408,6 +432,8 @@ origin_circuit_new(void)
 
   init_circuit_base(TO_CIRCUIT(circ));
 
+  circ_times.last_circ_at = approx_time();
+
   return circ;
 }
 
@@ -429,6 +455,16 @@ or_circuit_new(circid_t p_circ_id, or_connection_t *p_conn)
 
   init_circuit_base(TO_CIRCUIT(circ));
 
+  /* Initialize the cell_ewma_t structure */
+
+  /* Initialize the cell counts to 0 */
+  circ->p_cell_ewma.cell_count = 0.0;
+  circ->p_cell_ewma.last_adjusted_tick = cell_ewma_get_tick();
+  circ->p_cell_ewma.is_for_p_conn = 1;
+
+  /* It's not in any heap yet. */
+  circ->p_cell_ewma.heap_index = -1;
+
   return circ;
 }
 
@@ -439,39 +475,37 @@ circuit_free(circuit_t *circ)
 {
   void *mem;
   size_t memlen;
-  tor_assert(circ);
+  if (!circ)
+    return;
+
   if (CIRCUIT_IS_ORIGIN(circ)) {
     origin_circuit_t *ocirc = TO_ORIGIN_CIRCUIT(circ);
     mem = ocirc;
     memlen = sizeof(origin_circuit_t);
     tor_assert(circ->magic == ORIGIN_CIRCUIT_MAGIC);
     if (ocirc->build_state) {
-      if (ocirc->build_state->chosen_exit)
         extend_info_free(ocirc->build_state->chosen_exit);
-      if (ocirc->build_state->pending_final_cpath)
         circuit_free_cpath_node(ocirc->build_state->pending_final_cpath);
     }
     tor_free(ocirc->build_state);
 
     circuit_free_cpath(ocirc->cpath);
-    if (ocirc->intro_key)
-      crypto_free_pk_env(ocirc->intro_key);
-    if (ocirc->rend_data)
-      rend_data_free(ocirc->rend_data);
+
+    crypto_free_pk_env(ocirc->intro_key);
+    rend_data_free(ocirc->rend_data);
   } else {
     or_circuit_t *ocirc = TO_OR_CIRCUIT(circ);
+    /* Remember cell statistics for this circuit before deallocating. */
+    if (get_options()->CellStatistics)
+      rep_hist_buffer_stats_add_circ(circ, time(NULL));
     mem = ocirc;
     memlen = sizeof(or_circuit_t);
     tor_assert(circ->magic == OR_CIRCUIT_MAGIC);
 
-    if (ocirc->p_crypto)
-      crypto_free_cipher_env(ocirc->p_crypto);
-    if (ocirc->p_digest)
-      crypto_free_digest_env(ocirc->p_digest);
-    if (ocirc->n_crypto)
-      crypto_free_cipher_env(ocirc->n_crypto);
-    if (ocirc->n_digest)
-      crypto_free_digest_env(ocirc->n_digest);
+    crypto_free_cipher_env(ocirc->p_crypto);
+    crypto_free_digest_env(ocirc->p_digest);
+    crypto_free_cipher_env(ocirc->n_crypto);
+    crypto_free_digest_env(ocirc->n_digest);
 
     if (ocirc->rend_splice) {
       or_circuit_t *other = ocirc->rend_splice;
@@ -487,8 +521,7 @@ circuit_free(circuit_t *circ)
     cell_queue_clear(&ocirc->p_conn_cells);
   }
 
-  if (circ->n_hop)
-    extend_info_free(circ->n_hop);
+  extend_info_free(circ->n_hop);
   tor_free(circ->n_conn_onionskin);
 
   /* Remove from map. */
@@ -498,7 +531,7 @@ circuit_free(circuit_t *circ)
    * "active" checks will be violated. */
   cell_queue_clear(&circ->n_conn_cells);
 
-  memset(circ, 0xAA, memlen); /* poison memory */
+  memset(mem, 0xAA, memlen); /* poison memory */
   tor_free(mem);
 }
 
@@ -541,10 +574,10 @@ circuit_free_all(void)
     circuit_free(global_circuitlist);
     global_circuitlist = next;
   }
-  if (circuits_pending_or_conns) {
-    smartlist_free(circuits_pending_or_conns);
-    circuits_pending_or_conns = NULL;
-  }
+
+  smartlist_free(circuits_pending_or_conns);
+  circuits_pending_or_conns = NULL;
+
   HT_CLEAR(orconn_circid_map, &orconn_circid_circuit_map);
 }
 
@@ -552,18 +585,15 @@ circuit_free_all(void)
 static void
 circuit_free_cpath_node(crypt_path_t *victim)
 {
-  if (victim->f_crypto)
-    crypto_free_cipher_env(victim->f_crypto);
-  if (victim->b_crypto)
-    crypto_free_cipher_env(victim->b_crypto);
-  if (victim->f_digest)
-    crypto_free_digest_env(victim->f_digest);
-  if (victim->b_digest)
-    crypto_free_digest_env(victim->b_digest);
-  if (victim->dh_handshake_state)
-    crypto_dh_free(victim->dh_handshake_state);
-  if (victim->extend_info)
-    extend_info_free(victim->extend_info);
+  if (!victim)
+    return;
+
+  crypto_free_cipher_env(victim->f_crypto);
+  crypto_free_cipher_env(victim->b_crypto);
+  crypto_free_digest_env(victim->f_digest);
+  crypto_free_digest_env(victim->b_digest);
+  crypto_dh_free(victim->dh_handshake_state);
+  extend_info_free(victim->extend_info);
 
   memset(victim, 0xBB, sizeof(crypt_path_t)); /* poison memory */
   tor_free(victim);
@@ -892,6 +922,10 @@ circuit_find_to_cannibalize(uint8_t purpose, extend_info_t *info,
   int need_capacity = (flags & CIRCLAUNCH_NEED_CAPACITY) != 0;
   int internal = (flags & CIRCLAUNCH_IS_INTERNAL) != 0;
 
+  /* Make sure we're not trying to create a onehop circ by
+   * cannibalization. */
+  tor_assert(!(flags & CIRCLAUNCH_ONEHOP_TUNNEL));
+
   log_debug(LD_CIRC,
             "Hunting for a circ to cannibalize: purpose %d, uptime %d, "
             "capacity %d, internal %d",
@@ -907,7 +941,8 @@ circuit_find_to_cannibalize(uint8_t purpose, extend_info_t *info,
       if ((!need_uptime || circ->build_state->need_uptime) &&
           (!need_capacity || circ->build_state->need_capacity) &&
           (internal == circ->build_state->is_internal) &&
-          circ->remaining_relay_early_cells) {
+          circ->remaining_relay_early_cells &&
+          !circ->build_state->onehop_tunnel) {
         if (info) {
           /* need to make sure we don't duplicate hops */
           crypt_path_t *hop = circ->cpath;
@@ -1083,9 +1118,9 @@ _circuit_mark_for_close(circuit_t *circ, int reason, int line,
     tor_assert(ocirc->rend_data);
     /* treat this like getting a nack from it */
     log_info(LD_REND, "Failed intro circ %s to %s (awaiting ack). "
-             "Removing from descriptor.",
-             safe_str(ocirc->rend_data->onion_address),
-             safe_str(build_state_get_exit_nickname(ocirc->build_state)));
+           "Removing from descriptor.",
+           safe_str_client(ocirc->rend_data->onion_address),
+           safe_str_client(build_state_get_exit_nickname(ocirc->build_state)));
     rend_client_remove_intro_point(ocirc->build_state->chosen_exit,
                                    ocirc->rend_data);
   }
@@ -1236,11 +1271,6 @@ assert_circuit_ok(const circuit_t *c)
       tor_assert(c == c2);
     }
   }
-#if 0 /* false now that rendezvous exits are attached to p_streams */
-  if (origin_circ)
-    for (conn = origin_circ->p_streams; conn; conn = conn->next_stream)
-      tor_assert(conn->_base.type == CONN_TYPE_AP);
-#endif
   if (or_circ)
     for (conn = or_circ->n_streams; conn; conn = conn->next_stream)
       tor_assert(conn->_base.type == CONN_TYPE_EXIT);