already contained a large portion of what should have gone in this
one.
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.17 2000/11/28 08:59:27 zarq Exp $
extern char *pidfilename;
extern char **g_argv;
extern char *pidfilename;
extern char **g_argv;
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);
}
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 abnormally"), pid, name);
-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"));
-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"));
-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();
-sigsegv_handler(int a, siginfo_t *info, void *)
+sigsegv_handler(int a, siginfo_t *info, void *b)
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);
-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"));
-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"));
-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();
setup_signals(void)
{
int i;
setup_signals(void)
{
int i;
+ sigemptyset(&emptysigset);
+ 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);
}