aboutsummaryrefslogtreecommitdiff
path: root/src/or/circuitlist.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2013-07-10 15:07:32 -0400
committerNick Mathewson <nickm@torproject.org>2013-07-10 15:26:34 -0400
commitec6c155f827000e337796f1f1c54299fbc5cf72a (patch)
treee165ed24d0bc530ab25710214e0a63e2f052ed1e /src/or/circuitlist.c
parentb6e8c74667cf723c5ef4d081fc901752e05f9a9b (diff)
downloadtor-ec6c155f827000e337796f1f1c54299fbc5cf72a.tar.gz
tor-ec6c155f827000e337796f1f1c54299fbc5cf72a.zip
Add some basic unit tests for the circuit map data structure.
These show off the new mocking code by mocking the circuitmux code so that we can test the circuit map code in isolation.
Diffstat (limited to 'src/or/circuitlist.c')
-rw-r--r--src/or/circuitlist.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c
index 1912b91ddb..70c8980055 100644
--- a/src/or/circuitlist.c
+++ b/src/or/circuitlist.c
@@ -8,7 +8,7 @@
* \file circuitlist.c
* \brief Manage the global circuit list.
**/
-
+#define CIRCUITLIST_PRIVATE
#include "or.h"
#include "channel.h"
#include "circuitbuild.h"
@@ -41,7 +41,6 @@ circuit_t *global_circuitlist=NULL;
/** A list of all the circuits in CIRCUIT_STATE_CHAN_WAIT. */
static smartlist_t *circuits_pending_chans = NULL;
-static void circuit_free(circuit_t *circ);
static void circuit_free_cpath(crypt_path_t *cpath);
static void circuit_free_cpath_node(crypt_path_t *victim);
static void cpath_ref_decref(crypt_path_reference_t *cpath_ref);
@@ -736,7 +735,7 @@ or_circuit_new(circid_t p_circ_id, channel_t *p_chan)
/** Deallocate space associated with circ.
*/
-static void
+STATIC void
circuit_free(circuit_t *circ)
{
void *mem;