diff options
| author | Taylor Yu <catalyst@torproject.org> | 2019-03-28 17:45:49 -0500 |
|---|---|---|
| committer | David Goulet <dgoulet@torproject.org> | 2019-06-11 11:59:30 -0400 |
| commit | 0bce0c339d5f4c6ddeb90c21502a9716fb6cd17a (patch) | |
| tree | b578ef01c6480ac9bb1eca3fd239e6fd79dd53ed /src/core/or/circuitbuild.c | |
| parent | a8c0f4ddfe3f0a63bd499959c8d921346aa9766e (diff) | |
| download | tor-0bce0c339d5f4c6ddeb90c21502a9716fb6cd17a.tar.gz tor-0bce0c339d5f4c6ddeb90c21502a9716fb6cd17a.zip | |
Rework origin circuit tracking to use pubsub
Part of ticket 29976.
Diffstat (limited to 'src/core/or/circuitbuild.c')
| -rw-r--r-- | src/core/or/circuitbuild.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/core/or/circuitbuild.c b/src/core/or/circuitbuild.c index 3a4e729429..ff809c01cf 100644 --- a/src/core/or/circuitbuild.c +++ b/src/core/or/circuitbuild.c @@ -522,14 +522,13 @@ origin_circuit_get_guard_state(origin_circuit_t *circ) static void circuit_chan_publish(const origin_circuit_t *circ, const channel_t *chan) { - ocirc_event_msg_t msg; + ocirc_chan_msg_t *msg = tor_malloc(sizeof(*msg)); - msg.type = OCIRC_MSGTYPE_CHAN; - msg.u.chan.gid = circ->global_identifier; - msg.u.chan.chan = chan->global_identifier; - msg.u.chan.onehop = circ->build_state->onehop_tunnel; + msg->gid = circ->global_identifier; + msg->chan = chan->global_identifier; + msg->onehop = circ->build_state->onehop_tunnel; - ocirc_event_publish(&msg); + ocirc_chan_publish(msg); } /** Start establishing the first hop of our circuit. Figure out what |