summaryrefslogtreecommitdiff
path: root/one.cpp
diff options
context:
space:
mode:
authorGrant Limberg <grant.limberg@zerotier.com>2018-11-13 16:00:17 -0800
committerGrant Limberg <grant.limberg@zerotier.com>2018-11-13 16:00:17 -0800
commit01e6df4d46df280b3ad2ae158cb87b5ee98f10d7 (patch)
tree231f4ef754a3871456f72895a9ae4899bb4588b8 /one.cpp
parent882b03436d7b40a788f060e0d83a4027f86e73ef (diff)
parent690bd933d52c7dbbcddde7c0aff30f7fee91a6d9 (diff)
downloadinfinitytier-01e6df4d46df280b3ad2ae158cb87b5ee98f10d7.tar.gz
infinitytier-01e6df4d46df280b3ad2ae158cb87b5ee98f10d7.zip
Merge branch 'dev' of http://git.int.zerotier.com/ZeroTier/ZeroTierOne into dev
Diffstat (limited to 'one.cpp')
-rw-r--r--one.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/one.cpp b/one.cpp
index b48e4396..7ee818af 100644
--- a/one.cpp
+++ b/one.cpp
@@ -1354,12 +1354,14 @@ int main(int argc,char **argv)
#ifdef __UNIX_LIKE__
signal(SIGHUP,&_sighandlerHup);
signal(SIGPIPE,SIG_IGN);
+ signal(SIGIO,SIG_IGN);
signal(SIGUSR1,SIG_IGN);
signal(SIGUSR2,SIG_IGN);
signal(SIGALRM,SIG_IGN);
signal(SIGINT,&_sighandlerQuit);
signal(SIGTERM,&_sighandlerQuit);
signal(SIGQUIT,&_sighandlerQuit);
+ signal(SIGINT,&_sighandlerQuit);
/* Ensure that there are no inherited file descriptors open from a previous
* incarnation. This is a hack to ensure that GitHub issue #61 or variants