diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-04-08 12:06:03 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-04-08 12:06:03 -0400 |
| commit | fffc59b0e941f12e1588e0604c8295ecc0679150 (patch) | |
| tree | e65e5c6e493d5ff6beb4371a0bf8b5f579e3343d /src/or/circuitlist.h | |
| parent | f0bce2dc359dc2b3004af33541b27c495ad731f3 (diff) | |
| parent | 8f16a77d6ae6bfc8f7983decf8269ae70ca1cc5e (diff) | |
| download | tor-fffc59b0e941f12e1588e0604c8295ecc0679150.tar.gz tor-fffc59b0e941f12e1588e0604c8295ecc0679150.zip | |
Merge remote-tracking branch 'public/bug9841_025'
Diffstat (limited to 'src/or/circuitlist.h')
| -rw-r--r-- | src/or/circuitlist.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/or/circuitlist.h b/src/or/circuitlist.h index 54a7ef42fa..2bbd20b83a 100644 --- a/src/or/circuitlist.h +++ b/src/or/circuitlist.h @@ -46,8 +46,10 @@ origin_circuit_t *circuit_get_ready_rend_circ_by_rend_data( const rend_data_t *rend_data); origin_circuit_t *circuit_get_next_by_pk_and_purpose(origin_circuit_t *start, const char *digest, uint8_t purpose); -or_circuit_t *circuit_get_rendezvous(const char *cookie); -or_circuit_t *circuit_get_intro_point(const char *digest); +or_circuit_t *circuit_get_rendezvous(const uint8_t *cookie); +or_circuit_t *circuit_get_intro_point(const uint8_t *digest); +void circuit_set_rendezvous_cookie(or_circuit_t *circ, const uint8_t *cookie); +void circuit_set_intro_point_digest(or_circuit_t *circ, const uint8_t *digest); origin_circuit_t *circuit_find_to_cannibalize(uint8_t purpose, extend_info_t *info, int flags); void circuit_mark_all_unused_circs(void); |