diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-04-26 15:20:08 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-04-26 15:20:08 -0400 |
| commit | f810a1afe990788cd8f944a515a493902df84ed1 (patch) | |
| tree | 145e947530ebdc09476a7aa018ee76644e5f0eb3 /src/or/control.c | |
| parent | a7a906603e0c7e3c8519a948b5adf43bfecf6f66 (diff) | |
| download | tor-f810a1afe990788cd8f944a515a493902df84ed1.tar.gz tor-f810a1afe990788cd8f944a515a493902df84ed1.zip | |
Expose a new process_signal(uintptr_t), not signal_callback()
This is a tweak to the bug2917 fix. Basically, if we want to simulate
a signal arriving in the controller, we shouldn't have to pretend that
we're Libevent, or depend on how Tor sets up its Libevent callbacks.
Diffstat (limited to 'src/or/control.c')
| -rw-r--r-- | src/or/control.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/or/control.c b/src/or/control.c index bb1c3307af..9f7739a402 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -1222,7 +1222,8 @@ handle_control_signal(control_connection_t *conn, uint32_t len, /* Flush the "done" first if the signal might make us shut down. */ if (sig == SIGTERM || sig == SIGINT) connection_handle_write(TO_CONN(conn), 1); - signal_callback(0,0,(void*)(uintptr_t)sig); + + process_signal(sig); return 0; } |