diff options
| author | George Kadianakis <desnacked@riseup.net> | 2020-10-20 13:26:19 +0300 |
|---|---|---|
| committer | George Kadianakis <desnacked@riseup.net> | 2020-10-20 13:26:19 +0300 |
| commit | 19302a1dfd8da73ff86b0c36534221b71c501c32 (patch) | |
| tree | 22fab1d6f4fbc963a0c263b2ea19357a92efdea5 /src/core/or/channel.h | |
| parent | f7adf3653ff313d45d70bed7c0fdcdd0d64f29ab (diff) | |
| parent | cb4cedae686bd227d42997840b3a6b0b3bc5e936 (diff) | |
| download | tor-19302a1dfd8da73ff86b0c36534221b71c501c32.tar.gz tor-19302a1dfd8da73ff86b0c36534221b71c501c32.zip | |
Merge remote-tracking branch 'tor-gitlab/mr/148' into master
Diffstat (limited to 'src/core/or/channel.h')
| -rw-r--r-- | src/core/or/channel.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/core/or/channel.h b/src/core/or/channel.h index 606b0730b8..206d0fdc97 100644 --- a/src/core/or/channel.h +++ b/src/core/or/channel.h @@ -526,6 +526,7 @@ void channel_mark_for_close(channel_t *chan); int channel_write_packed_cell(channel_t *chan, packed_cell_t *cell); void channel_listener_mark_for_close(channel_listener_t *chan_l); +void channel_mark_as_used_for_origin_circuit(channel_t *chan); /* Channel callback registrations */ @@ -661,6 +662,7 @@ MOCK_DECL(channel_t *, channel_get_for_extend,( const struct ed25519_public_key_t *ed_id, const tor_addr_t *target_ipv4_addr, const tor_addr_t *target_ipv6_addr, + bool for_origin_circ, const char **msg_out, int *launch_out)); |