diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-11-18 18:42:49 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-11-18 18:42:49 -0500 |
| commit | b88db7573cc342793b65e792649dca5c466bea9c (patch) | |
| tree | e8526a60fe067f719c04a6428e34633e45afb5c8 /src/or | |
| parent | 6a6233b70b4b496834196960aef896da33d13331 (diff) | |
| parent | ce51887291decd1654fed6e745fb8f625bf52292 (diff) | |
| download | tor-b88db7573cc342793b65e792649dca5c466bea9c.tar.gz tor-b88db7573cc342793b65e792649dca5c466bea9c.zip | |
Merge remote-tracking branch 'public/benchmark'
Diffstat (limited to 'src/or')
| -rw-r--r-- | src/or/relay.c | 6 | ||||
| -rw-r--r-- | src/or/relay.h | 5 |
2 files changed, 7 insertions, 4 deletions
diff --git a/src/or/relay.c b/src/or/relay.c index 51a29a20ee..ac3114bda5 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -11,6 +11,7 @@ **/ #include <math.h> +#define RELAY_PRIVATE #include "or.h" #include "buffers.h" #include "circuitbuild.h" @@ -33,9 +34,6 @@ #include "routerlist.h" #include "routerparse.h" -static int relay_crypt(circuit_t *circ, cell_t *cell, - cell_direction_t cell_direction, - crypt_path_t **layer_hint, char *recognized); static edge_connection_t *relay_lookup_conn(circuit_t *circ, cell_t *cell, cell_direction_t cell_direction, crypt_path_t *layer_hint); @@ -297,7 +295,7 @@ circuit_receive_relay_cell(cell_t *cell, circuit_t *circ, * Return -1 to indicate that we should mark the circuit for close, * else return 0. */ -static int +int relay_crypt(circuit_t *circ, cell_t *cell, cell_direction_t cell_direction, crypt_path_t **layer_hint, char *recognized) { diff --git a/src/or/relay.h b/src/or/relay.h index 7fce8edcaf..1cd4008bb9 100644 --- a/src/or/relay.h +++ b/src/or/relay.h @@ -66,5 +66,10 @@ void circuit_clear_cell_queue(circuit_t *circ, or_connection_t *orconn); void tor_gettimeofday_cache_clear(void); +#ifdef RELAY_PRIVATE +int relay_crypt(circuit_t *circ, cell_t *cell, cell_direction_t cell_direction, + crypt_path_t **layer_hint, char *recognized); +#endif + #endif |