summaryrefslogtreecommitdiff
path: root/src/or/control.c
diff options
context:
space:
mode:
authorSebastian Hahn <sebastian@torproject.org>2011-04-14 20:04:39 -0700
committerSebastian Hahn <sebastian@torproject.org>2011-04-15 05:35:30 +0200
commit5114e3e44235ea39447eea37213c65413cdb1a2c (patch)
tree6988b9253e11316bf848997c19447600df2323b7 /src/or/control.c
parent4cbbb92e7fc7c9c4d374b35211c216a5419e3da2 (diff)
downloadtor-5114e3e44235ea39447eea37213c65413cdb1a2c.tar.gz
tor-5114e3e44235ea39447eea37213c65413cdb1a2c.zip
Make SIGNAL DUMP work on FreeBSD
While doing so, get rid of the now unnecessary function control_signal_act(). Fixes bug 2917, reported by Robert Ransom. Bugfix on commit 9b4aa8d2abbce71398e58188209a1b1d04885b96. This patch is loosely based on a patch by Robert (Changelog entry).
Diffstat (limited to 'src/or/control.c')
-rw-r--r--src/or/control.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/or/control.c b/src/or/control.c
index 8f3af0bda1..bb1c3307af 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);
- control_signal_act(sig);
+ signal_callback(0,0,(void*)(uintptr_t)sig);
+
return 0;
}