summaryrefslogtreecommitdiff
path: root/src/or/control.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2016-08-02 13:15:10 -0400
committerNick Mathewson <nickm@torproject.org>2016-08-02 13:15:10 -0400
commitc68a23a135369380dad5cb1ff393edee74e6d6ac (patch)
tree07d73988f70fcaf6a61ccf94a87dacd7e68eed5e /src/or/control.c
parent8e9a6543e110eb8f96169f011e18c3e4b6a4f7d1 (diff)
downloadtor-c68a23a135369380dad5cb1ff393edee74e6d6ac.tar.gz
tor-c68a23a135369380dad5cb1ff393edee74e6d6ac.zip
Bufferevent removal: remove HAS_BUFFEREVENT macros and usage
This is another way that we had bufferevents-only code marked.
Diffstat (limited to 'src/or/control.c')
-rw-r--r--src/or/control.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/src/or/control.c b/src/or/control.c
index 21f48aff12..b4fead43d4 100644
--- a/src/or/control.c
+++ b/src/or/control.c
@@ -4798,12 +4798,7 @@ is_valid_initial_command(control_connection_t *conn, const char *cmd)
static int
peek_connection_has_control0_command(connection_t *conn)
{
- IF_HAS_BUFFEREVENT(conn, {
- struct evbuffer *input = bufferevent_get_input(conn->bufev);
- return peek_evbuffer_has_control0_command(input);
- }) ELSE_IF_NO_BUFFEREVENT {
- return peek_buf_has_control0_command(conn->inbuf);
- }
+ return peek_buf_has_control0_command(conn->inbuf);
}
/** Called when data has arrived on a v1 control connection: Try to fetch