projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Various small fixes.
[tinc]
/
src
/
process.c
diff --git
a/src/process.c
b/src/process.c
index
013b24d
..
35793a2
100644
(file)
--- a/
src/process.c
+++ b/
src/process.c
@@
-1,7
+1,7
@@
/*
process.c -- process management functions
/*
process.c -- process management functions
- Copyright (C) 1999
,2000
Ivo Timmermans <itimmermans@bigfoot.com>,
-
2000
Guus Sliepen <guus@sliepen.warande.net>
+ Copyright (C) 1999
-2001
Ivo Timmermans <itimmermans@bigfoot.com>,
+
2000,2001
Guus Sliepen <guus@sliepen.warande.net>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-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.
16 2000/11/26 22:42:34 zarq
Exp $
+ $Id: process.c,v 1.1.2.
21 2001/03/01 21:32:04 guus
Exp $
*/
#include "config.h"
*/
#include "config.h"
@@
-35,7
+35,6
@@
#include <unistd.h>
#include <termios.h>
#include <unistd.h>
#include <termios.h>
-#include <list.h>
#include <pidfile.h>
#include <utils.h>
#include <xalloc.h>
#include <pidfile.h>
#include <utils.h>
#include <xalloc.h>
@@
-54,6
+53,8
@@
extern char *identname;
extern char *pidfilename;
extern char **g_argv;
extern char *pidfilename;
extern char **g_argv;
+sigset_t emptysigset;
+
void memory_full(int size)
{
syslog(LOG_ERR, _("Memory exhausted (couldn't allocate %d bytes), exiting."), size);
void memory_full(int size)
{
syslog(LOG_ERR, _("Memory exhausted (couldn't allocate %d bytes), exiting."), size);
@@
-157,6
+158,8
@@
cp
/* If we succeeded in doing that, detach */
/* If we succeeded in doing that, detach */
+ closelog();
+
if(do_detach)
{
if(daemon(0, 0) < 0)
if(do_detach)
{
if(daemon(0, 0) < 0)
@@
-218,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);
}
@@
-263,7
+266,7
@@
cp
}
else /* Something strange happened */
{
}
else /* Something strange happened */
{
- syslog(LOG_ERR, _("Process %d (%s) terminated abnormaly"), pid, name);
+ syslog(LOG_ERR, _("Process %d (%s) terminated abnormal
l
y"), pid, name);
return -1;
}
}
return -1;
}
}
@@
-285,7
+288,7
@@
cp
*/
RETSIGTYPE
*/
RETSIGTYPE
-sigterm_handler(int a, siginfo_t *info, void *)
+sigterm_handler(int a, siginfo_t *info, void *
b
)
{
if(debug_lvl > DEBUG_NOTHING)
syslog(LOG_NOTICE, _("Got TERM signal"));
{
if(debug_lvl > DEBUG_NOTHING)
syslog(LOG_NOTICE, _("Got TERM signal"));
@@
-294,7
+297,7
@@
sigterm_handler(int a, siginfo_t *info, void *)
}
RETSIGTYPE
}
RETSIGTYPE
-sigquit_handler(int a, siginfo_t *info, void *)
+sigquit_handler(int a, siginfo_t *info, void *
b
)
{
if(debug_lvl > DEBUG_NOTHING)
syslog(LOG_NOTICE, _("Got QUIT signal"));
{
if(debug_lvl > DEBUG_NOTHING)
syslog(LOG_NOTICE, _("Got QUIT signal"));
@@
-302,23
+305,29
@@
sigquit_handler(int a, siginfo_t *info, void *)
}
RETSIGTYPE
}
RETSIGTYPE
-sigsegv_square(int a, siginfo_t *info, void *)
+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
-sigsegv_handler(int a, siginfo_t *info, void *)
+sigsegv_handler(int a, siginfo_t *info, void *
b
)
{
{
+ struct sigaction act;
syslog(LOG_ERR, _("Got SEGV signal"));
cp_trace();
if(do_detach)
{
syslog(LOG_NOTICE, _("Trying to re-execute in 5 seconds..."));
syslog(LOG_ERR, _("Got SEGV signal"));
cp_trace();
if(do_detach)
{
syslog(LOG_NOTICE, _("Trying to re-execute in 5 seconds..."));
- signal(SIGSEGV, sigsegv_square);
+
+ act.sa_handler = NULL;
+ act.sa_mask = emptysigset;
+ act.sa_flags = SA_SIGINFO;
+ act.sa_sigaction = sigsegv_square;
+
close_network_connections();
sleep(5);
remove_pid(pidfilename);
close_network_connections();
sleep(5);
remove_pid(pidfilename);
@@
-332,7
+341,7
@@
sigsegv_handler(int a, siginfo_t *info, void *)
}
RETSIGTYPE
}
RETSIGTYPE
-sighup_handler(int a, siginfo_t *info, void *)
+sighup_handler(int a, siginfo_t *info, void *
b
)
{
if(debug_lvl > DEBUG_NOTHING)
syslog(LOG_NOTICE, _("Got HUP signal"));
{
if(debug_lvl > DEBUG_NOTHING)
syslog(LOG_NOTICE, _("Got HUP signal"));
@@
-340,7
+349,7
@@
sighup_handler(int a, siginfo_t *info, void *)
}
RETSIGTYPE
}
RETSIGTYPE
-sigint_handler(int a, siginfo_t *info, void *)
+sigint_handler(int a, siginfo_t *info, void *
b
)
{
if(debug_lvl > DEBUG_NOTHING)
syslog(LOG_NOTICE, _("Got INT signal, exiting"));
{
if(debug_lvl > DEBUG_NOTHING)
syslog(LOG_NOTICE, _("Got INT signal, exiting"));
@@
-348,19
+357,19
@@
sigint_handler(int a, siginfo_t *info, void *)
}
RETSIGTYPE
}
RETSIGTYPE
-sigusr1_handler(int a, siginfo_t *info, void *)
+sigusr1_handler(int a, siginfo_t *info, void *
b
)
{
dump_connection_list();
}
RETSIGTYPE
{
dump_connection_list();
}
RETSIGTYPE
-sigusr2_handler(int a, siginfo_t *info, void *)
+sigusr2_handler(int a, siginfo_t *info, void *
b
)
{
dump_subnet_list();
}
RETSIGTYPE
{
dump_subnet_list();
}
RETSIGTYPE
-
sighuh(int a, siginfo_t *info, void *
)
+
unexpected_signal_handler(int a, siginfo_t *info, void *b
)
{
syslog(LOG_WARNING, _("Got unexpected signal %d (%s)"), a, strsignal(a));
cp_trace();
{
syslog(LOG_WARNING, _("Got unexpected signal %d (%s)"), a, strsignal(a));
cp_trace();
@@
-386,19
+395,18
@@
void
setup_signals(void)
{
int i;
setup_signals(void)
{
int i;
- sigset_t a;
struct sigaction act;
struct sigaction act;
- sigemptyset(&
a
);
+ sigemptyset(&
emptysigset
);
act.sa_handler = NULL;
act.sa_handler = NULL;
- act.sa_mask =
a
;
+ act.sa_mask =
emptysigset
;
act.sa_flags = SA_SIGINFO;
/* Set a default signal handler for every signal, errors will be
ignored. */
for(i = 0; i < NSIG; i++)
{
act.sa_flags = SA_SIGINFO;
/* Set a default signal handler for every signal, errors will be
ignored. */
for(i = 0; i < NSIG; i++)
{
- act.sa_sigaction =
sighuh
_handler;
+ act.sa_sigaction =
unexpected_signal
_handler;
sigaction(sighandlers[i].signal, &act, NULL);
}
sigaction(sighandlers[i].signal, &act, NULL);
}