commit df1f72329acf5f555618a5309f2621e584c0d763 Author: Nick Mathewson <nickm@torproject.org> Date: Tue Dec 6 19:49:20 2011 -0500 Revert "Refactor tor_event_base_once to do what we actually want" This reverts commit 7920ea55b8d994268d2b07f27316b0f34d8f27e5. --- src/common/compat_libevent.c | 45 ++++------------------------------------- src/common/compat_libevent.h | 3 +- src/common/tortls.c | 10 +++++--- src/common/tortls.h | 2 +- src/common/util.c | 4 +- src/or/connection_or.c | 4 ++- 6 files changed, 19 insertions(+), 49 deletions(-) diff --git a/src/common/compat_libevent.c b/src/common/compat_libevent.c index c3a4746..b709b4a 100644 --- a/src/common/compat_libevent.c +++ b/src/common/compat_libevent.c @@ -558,48 +558,13 @@ tor_check_libevent_header_compatibility(void) #endif } -typedef struct runnable_t { - struct event *ev; - void (*cb)(void *arg); - void *arg; -} runnable_t; - -/** Callback for tor_run_in_libevent_loop */ -static void -run_runnable_cb(evutil_socket_t s, short what, void *arg) -{ - runnable_t *r = arg; - void (*cb)(void *) = r->cb; - void *cb_arg = r->arg; - (void)what; - (void)s; - event_free(r->ev); - tor_free(r); - - cb(cb_arg); -} - -/** Cause cb(arg) to run later on this iteration of the libevent loop, or in - * the next iteration of the libevent loop. This is useful for when you're - * deep inside a no-reentrant code and there's some function you want to call - * without worrying about whether it might cause reeentrant invocation. - */ +/** Wrapper around libevent's event_base_once(). Sets a + * timeout-triggered event with no associated file descriptor. */ int -tor_run_in_libevent_loop(void (*cb)(void *arg), void *arg) +tor_event_base_once(void (*cb)(evutil_socket_t, short, void *), + void *arg, struct timeval *timer) { - runnable_t *r = tor_malloc(sizeof(runnable_t)); - r->cb = cb; - r->arg = arg; - r->ev = tor_event_new(tor_libevent_get_base(), -1, EV_TIMEOUT, - run_runnable_cb, r); - if (!r->ev) { - tor_free(r); - return -1; - } - /* Make the event active immediately. */ - event_active(r->ev, EV_TIMEOUT, 1); - - return 0; + return event_base_once(tor_libevent_get_base(), -1, EV_TIMEOUT, cb, arg, timer); } /* diff --git a/src/common/compat_libevent.h b/src/common/compat_libevent.h index 3f916d1..897eddb 100644 --- a/src/common/compat_libevent.h +++ b/src/common/compat_libevent.h @@ -46,7 +46,8 @@ void tor_event_free(struct event *ev); typedef struct periodic_timer_t periodic_timer_t; -int tor_run_in_libevent_loop(void (*cb)(void *arg), void *arg); +int tor_event_base_once(void (*cb)(evutil_socket_t, short, void *), + void *arg, struct timeval *timer); periodic_timer_t *periodic_timer_new(struct event_base *base, const struct timeval *tv, diff --git a/src/common/tortls.c b/src/common/tortls.c index 4592514..2ef2803 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -160,7 +160,7 @@ struct tor_tls_t { /** Callback to invoke whenever a client tries to renegotiate more than once. */ - void (*excess_renegotiations_callback)(void *); + void (*excess_renegotiations_callback)(evutil_socket_t, short, void *); /** Argument to pass to negotiated_callback. */ void *callback_arg; @@ -1341,8 +1341,10 @@ tor_tls_got_client_hello(tor_tls_t *tls) callback, so we set a libevent timer that triggers in the next event loop and closes the connection. */ - if (tor_run_in_libevent_loop(tls->excess_renegotiations_callback, - tls->callback_arg) < 0) { + struct timeval zero_seconds_timer = {0,0}; + + if (tor_event_base_once(tls->excess_renegotiations_callback, + tls->callback_arg, &zero_seconds_timer) < 0) { log_warn(LD_GENERAL, "Didn't manage to set a renegotiation limiting callback."); } } @@ -1570,7 +1572,7 @@ tor_tls_set_logged_address(tor_tls_t *tls, const char *address) void tor_tls_set_renegotiate_callbacks(tor_tls_t *tls, void (*cb)(tor_tls_t *, void *arg), - void (*cb2)(void *), + void (*cb2)(evutil_socket_t, short, void *), void *arg) { tls->negotiated_callback = cb; diff --git a/src/common/tortls.h b/src/common/tortls.h index 9f86e37..5874881 100644 --- a/src/common/tortls.h +++ b/src/common/tortls.h @@ -63,7 +63,7 @@ tor_tls_t *tor_tls_new(int sock, int is_server); void tor_tls_set_logged_address(tor_tls_t *tls, const char *address); void tor_tls_set_renegotiate_callbacks(tor_tls_t *tls, void (*cb)(tor_tls_t *, void *arg), - void (*cb2)(void *), + void (*cb2)(evutil_socket_t, short, void *), void *arg); int tor_tls_is_server(tor_tls_t *tls); void tor_tls_free(tor_tls_t *tls); diff --git a/src/common/util.c b/src/common/util.c index 6d488d9..a59cab0 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -3661,8 +3661,8 @@ tor_get_exit_code(const process_handle_t *process_handle, /* Process has not exited */ return PROCESS_EXIT_RUNNING; } else if (retval != process_handle->pid) { - log_warn(LD_GENERAL, "waitpid() failed for PID %d: %s", - process_handle->pid, strerror(errno)); + log_warn(LD_GENERAL, "waitpid() failed for PID %d: %s", process_handle->pid, + strerror(errno)); return PROCESS_EXIT_ERROR; } diff --git a/src/or/connection_or.c b/src/or/connection_or.c index 44f559c..ff696f8 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));