projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Log and warn about duplicate subnet_add()'s for the same subnet.
[tinc]
/
src
/
process.c
diff --git
a/src/process.c
b/src/process.c
index
35793a2
..
d618427
100644
(file)
--- a/
src/process.c
+++ b/
src/process.c
@@
-17,7
+17,7
@@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- $Id: process.c,v 1.1.2.2
1 2001/03/01 21:32:0
4 guus Exp $
+ $Id: process.c,v 1.1.2.2
2 2001/03/13 09:55:1
4 guus Exp $
*/
#include "config.h"
*/
#include "config.h"
@@
-375,6
+375,16
@@
unexpected_signal_handler(int a, siginfo_t *info, void *b)
cp_trace();
}
cp_trace();
}
+RETSIGTYPE
+ignore_signal_handler(int a, siginfo_t *info, void *b)
+{
+ if(debug_lvl >= DEBUG_SCARY_THINGS)
+ {
+ syslog(LOG_WARNING, _("Got unexpected signal %d (%s)"), a, strsignal(a));
+ cp_trace();
+ }
+}
+
struct {
int signal;
void (*handler)(int, siginfo_t *, void *);
struct {
int signal;
void (*handler)(int, siginfo_t *, void *);
@@
-383,11
+393,12
@@
struct {
{ SIGTERM, sigterm_handler },
{ SIGQUIT, sigquit_handler },
{ SIGSEGV, sigsegv_handler },
{ SIGTERM, sigterm_handler },
{ SIGQUIT, sigquit_handler },
{ SIGSEGV, sigsegv_handler },
- { SIGPIPE,
NULL
},
+ { SIGPIPE,
ignore_signal_handler
},
{ SIGINT, sigint_handler },
{ SIGUSR1, sigusr1_handler },
{ SIGUSR2, sigusr2_handler },
{ SIGINT, sigint_handler },
{ SIGUSR1, sigusr1_handler },
{ SIGUSR2, sigusr2_handler },
- { SIGCHLD, NULL },
+ { SIGCHLD, ignore_signal_handler },
+ { SIGALRM, ignore_signal_handler },
{ 0, NULL }
};
{ 0, NULL }
};
@@
-407,7
+418,7
@@
setup_signals(void)
for(i = 0; i < NSIG; i++)
{
act.sa_sigaction = unexpected_signal_handler;
for(i = 0; i < NSIG; i++)
{
act.sa_sigaction = unexpected_signal_handler;
- sigaction(
sighandlers[i].signal
, &act, NULL);
+ sigaction(
i
, &act, NULL);
}
/* Then, for each known signal that we want to catch, assign a
}
/* Then, for each known signal that we want to catch, assign a