summaryrefslogtreecommitdiff
path: root/src/or/connection_or.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2011-12-06 19:49:20 -0500
committerNick Mathewson <nickm@torproject.org>2011-12-06 19:49:20 -0500
commitdf1f72329acf5f555618a5309f2621e584c0d763 (patch)
tree322a3115843ddb041192acf8f66294fe342254de /src/or/connection_or.c
parent3a17a1a62f242f3aa64891407d3d64aa040d6d02 (diff)
downloadtor-df1f72329acf5f555618a5309f2621e584c0d763.tar.gz
tor-df1f72329acf5f555618a5309f2621e584c0d763.zip
Revert "Refactor tor_event_base_once to do what we actually want"
This reverts commit 7920ea55b8d994268d2b07f27316b0f34d8f27e5.
Diffstat (limited to 'src/or/connection_or.c')
-rw-r--r--src/or/connection_or.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/or/connection_or.c b/src/or/connection_or.c
index 44f559c744..ff696f8c31 100644
--- a/src/or/connection_or.c
+++ b/src/or/connection_or.c
@@ -1160,9 +1160,11 @@ connection_or_tls_renegotiated_cb(tor_tls_t *tls, void *_conn)
* tor_tls_got_client_hello() when the server receives excess
* renegotiation attempts; probably indicating a DoS. */
static void
-connection_or_close_connection_cb(void *_conn)
+connection_or_close_connection_cb(evutil_socket_t fd, short what, void *_conn)
{
or_connection_t *conn = _conn;
+ (void) what;
+ (void) fd;
connection_stop_reading(TO_CONN(conn));
connection_mark_for_close(TO_CONN(conn));