projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Honor the --localstatedir option to configure, instead of hardcoded /var.
[tinc]
/
src
/
process.c
diff --git
a/src/process.c
b/src/process.c
index
5d31b8d
..
eb066ab
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.
4 2000/11/17 10:03:02
guus Exp $
+ $Id: process.c,v 1.1.2.
7 2000/11/20 23:29:47
guus Exp $
*/
#include "config.h"
*/
#include "config.h"
@@
-44,7
+44,7
@@
#include "system.h"
/* A list containing all our children */
#include "system.h"
/* A list containing all our children */
-list_t *child_pids;
+list_t *child_pids
= NULL
;
/* If zero, don't detach from the terminal. */
int do_detach = 1;
/* If zero, don't detach from the terminal. */
int do_detach = 1;
@@
-55,6
+55,13
@@
extern char *identname;
extern char *pidfilename;
extern char **g_argv;
extern char *pidfilename;
extern char **g_argv;
+void init_processes(void)
+{
+cp
+ child_pids = list_new();
+cp
+}
+
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);
@@
-67,6
+74,7
@@
void memory_full(int size)
*/
void cleanup_and_exit(int c)
{
*/
void cleanup_and_exit(int c)
{
+cp
close_network_connections();
if(debug_lvl > DEBUG_NOTHING)
close_network_connections();
if(debug_lvl > DEBUG_NOTHING)
@@
-84,7
+92,7
@@
void cleanup_and_exit(int c)
int write_pidfile(void)
{
int pid;
int write_pidfile(void)
{
int pid;
-
+cp
if((pid = check_pid(pidfilename)))
{
if(netname)
if((pid = check_pid(pidfilename)))
{
if(netname)
@@
-98,7
+106,7
@@
int write_pidfile(void)
/* if it's locked, write-protected, or whatever */
if(!write_pid(pidfilename))
return 1;
/* if it's locked, write-protected, or whatever */
if(!write_pid(pidfilename))
return 1;
-
+cp
return 0;
}
return 0;
}
@@
-108,7
+116,7
@@
int write_pidfile(void)
int kill_other(void)
{
int pid;
int kill_other(void)
{
int pid;
-
+cp
if(!(pid = read_pid(pidfilename)))
{
if(netname)
if(!(pid = read_pid(pidfilename)))
{
if(netname)
@@
-123,7
+131,7
@@
int kill_other(void)
if(kill(pid, SIGTERM) && errno == ESRCH)
fprintf(stderr, _("Removing stale lock file.\n"));
remove_pid(pidfilename);
if(kill(pid, SIGTERM) && errno == ESRCH)
fprintf(stderr, _("Removing stale lock file.\n"));
remove_pid(pidfilename);
-
+cp
return 0;
}
return 0;
}
@@
-134,7
+142,7
@@
int detach(void)
{
int fd;
pid_t pid;
{
int fd;
pid_t pid;
-
+cp
setup_signals();
if(write_pidfile())
setup_signals();
if(write_pidfile())
@@
-152,7
+160,7
@@
int detach(void)
syslog(LOG_NOTICE, _("tincd %s starting"), VERSION);
xalloc_fail_func = memory_full;
syslog(LOG_NOTICE, _("tincd %s starting"), VERSION);
xalloc_fail_func = memory_full;
-
+cp
return 0;
}
return 0;
}
@@
-166,7
+174,7
@@
void _execute_script(const char *name)
int error = 0;
char *scriptname;
char *s;
int error = 0;
char *scriptname;
char *s;
-
+cp
if(netname)
{
asprintf(&s, "NETNAME=%s", netname);
if(netname)
{
asprintf(&s, "NETNAME=%s", netname);
@@
-237,7
+245,7
@@
void _execute_script(const char *name)
int execute_script(const char *name)
{
pid_t pid;
int execute_script(const char *name)
{
pid_t pid;
-
+cp
if((pid = fork()) < 0)
{
syslog(LOG_ERR, _("System call `%s' failed: %m"),
if((pid = fork()) < 0)
{
syslog(LOG_ERR, _("System call `%s' failed: %m"),
@@
-247,10
+255,10
@@
int execute_script(const char *name)
if(pid)
{
if(pid)
{
- list_append(child_pids,
(void*)(int)
pid);
+ list_append(child_pids,
&
pid);
return 0;
}
return 0;
}
-
+cp
/* Child here */
_execute_script(name);
}
/* Child here */
_execute_script(name);
}
@@
-264,7
+272,7
@@
int check_child(void *data)
{
pid_t pid;
int status;
{
pid_t pid;
int status;
-
+cp
pid = (pid_t) data;
pid = waitpid(pid, &status, WNOHANG);
if(WIFEXITED(status))
pid = (pid_t) data;
pid = waitpid(pid, &status, WNOHANG);
if(WIFEXITED(status))
@@
-282,7
+290,7
@@
int check_child(void *data)
}
return -1;
}
}
return -1;
}
-
+cp
/* Child is still running */
return 0;
}
/* Child is still running */
return 0;
}
@@
-365,7
+373,7
@@
sigint_handler(int a)
RETSIGTYPE
sigusr1_handler(int a)
{
RETSIGTYPE
sigusr1_handler(int a)
{
- dump_conn_list();
+ dump_conn
ection
_list();
}
RETSIGTYPE
}
RETSIGTYPE