diff options
| author | Nick Mathewson <nickm@torproject.org> | 2020-01-14 13:31:20 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2020-01-14 13:31:20 -0500 |
| commit | 08bbb6b8d921233e8d4780b4bc544022b91f1087 (patch) | |
| tree | 151412e33fbbaf24fe35538110a1e8ade19515f0 /src/core/or/channel.h | |
| parent | c948db425280f6d132fe0415617e73c63607d904 (diff) | |
| parent | 59dac38ebe4e6489c2a06d07470023ed5fbdd0aa (diff) | |
| download | tor-08bbb6b8d921233e8d4780b4bc544022b91f1087.tar.gz tor-08bbb6b8d921233e8d4780b4bc544022b91f1087.zip | |
Merge branch 'ticket32892_043_01_squashed'
Diffstat (limited to 'src/core/or/channel.h')
| -rw-r--r-- | src/core/or/channel.h | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/src/core/or/channel.h b/src/core/or/channel.h index 51bb2f7fae..2e2936a69a 100644 --- a/src/core/or/channel.h +++ b/src/core/or/channel.h @@ -23,7 +23,6 @@ struct tor_timer_t; /* Channel handler function pointer typedefs */ typedef void (*channel_listener_fn_ptr)(channel_listener_t *, channel_t *); typedef void (*channel_cell_handler_fn_ptr)(channel_t *, cell_t *); -typedef void (*channel_var_cell_handler_fn_ptr)(channel_t *, var_cell_t *); /** * This enum is used by channelpadding to decide when to pad channels. @@ -321,7 +320,6 @@ struct channel_t { /** Registered handlers for incoming cells */ channel_cell_handler_fn_ptr cell_handler; - channel_var_cell_handler_fn_ptr var_cell_handler; /* Methods implemented by the lower layer */ @@ -543,13 +541,8 @@ void channel_listener_set_listener_fn(channel_listener_t *chan, /* Incoming cell callbacks */ channel_cell_handler_fn_ptr channel_get_cell_handler(channel_t *chan); -channel_var_cell_handler_fn_ptr -channel_get_var_cell_handler(channel_t *chan); - void channel_set_cell_handlers(channel_t *chan, - channel_cell_handler_fn_ptr cell_handler, - channel_var_cell_handler_fn_ptr - var_cell_handler); + channel_cell_handler_fn_ptr cell_handler); /* Clean up closed channels and channel listeners periodically; these are * called from run_scheduled_events() in main.c. |