projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Optional signal number for -k option.
[tinc]
/
src
/
process.c
diff --git
a/src/process.c
b/src/process.c
index
6158fba
..
37b3186
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
0 2001/01/07 17:09:02
guus Exp $
+ $Id: process.c,v 1.1.2.2
4 2001/09/01 12:36:53
guus Exp $
*/
#include "config.h"
*/
#include "config.h"
@@
-121,7
+121,7
@@
cp
/*
kill older tincd for this net
*/
/*
kill older tincd for this net
*/
-int kill_other(
void
)
+int kill_other(
int signal
)
{
int pid;
cp
{
int pid;
cp
@@
-136,7
+136,7
@@
cp
errno = 0; /* No error, sometimes errno is only changed on error */
/* ESRCH is returned when no process with that pid is found */
errno = 0; /* No error, sometimes errno is only changed on error */
/* ESRCH is returned when no process with that pid is found */
- if(kill(pid,
SIGTERM
) && errno == ESRCH)
+ if(kill(pid,
signal
) && errno == ESRCH)
fprintf(stderr, _("Removing stale lock file.\n"));
remove_pid(pidfilename);
cp
fprintf(stderr, _("Removing stale lock file.\n"));
remove_pid(pidfilename);
cp
@@
-164,7
+164,7
@@
cp
{
if(daemon(0, 0) < 0)
{
{
if(daemon(0, 0) < 0)
{
- fprintf(stderr, _("Couldn't detach from terminal: %
m"
));
+ fprintf(stderr, _("Couldn't detach from terminal: %
s"), strerror(errno
));
return -1;
}
return -1;
}
@@
-221,7
+221,7
@@
cp
/* No return on success */
if(errno != ENOENT) /* Ignore if the file does not exist */
/* No return on success */
if(errno != ENOENT) /* Ignore if the file does not exist */
- exit(
-1);
/* Some error while trying execl(). */
+ exit(
1);
/* Some error while trying execl(). */
else
exit(0);
}
else
exit(0);
}
@@
-309,7
+309,7
@@
sigsegv_square(int a, siginfo_t *info, void *b)
{
syslog(LOG_ERR, _("Got another SEGV signal: not restarting"));
cp_trace();
{
syslog(LOG_ERR, _("Got another SEGV signal: not restarting"));
cp_trace();
- exit(
0
);
+ exit(
1
);
}
RETSIGTYPE
}
RETSIGTYPE
@@
-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
@@
-416,7
+427,7
@@
setup_signals(void)
{
act.sa_sigaction = sighandlers[i].handler;
if(sigaction(sighandlers[i].signal, &act, NULL) < 0)
{
act.sa_sigaction = sighandlers[i].handler;
if(sigaction(sighandlers[i].signal, &act, NULL) < 0)
- fprintf(stderr, _("Installing signal handler for signal %d (%s) failed: %
m
\n"),
- sighandlers[i].signal, strsignal(sighandlers[i].signal));
+ fprintf(stderr, _("Installing signal handler for signal %d (%s) failed: %
s
\n"),
+ sighandlers[i].signal, strsignal(sighandlers[i].signal)
, strerror(errno)
);
}
}
}
}