Commit df1f7232 authored by Nick Mathewson's avatar Nick Mathewson 🦀
Browse files

Revert "Refactor tor_event_base_once to do what we actually want" 

This reverts commit 7920ea55.
parent 3a17a1a6

src/common/compat_libevent.c

+5 −40
Original line number Diff line number Diff line
@@ -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);

}



/*

src/common/compat_libevent.h

+2 −1
Original line number Diff line number Diff line
@@ -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,

src/common/tortls.c

+6 −4
Original line number Diff line number Diff line
@@ -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;

src/common/tortls.h

+1 −1
Original line number Diff line number Diff line
@@ -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);

src/common/util.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

  }