projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Releasing 1.0.9.
[tinc]
/
src
/
process.c
diff --git
a/src/process.c
b/src/process.c
index
b988881
..
c2940bc
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-200
3 Ivo Timmermans <ivo@o2w.nl>
,
- 2000-200
3 Guus Sliepen <guus@sliepen.eu
.org>
+ Copyright (C) 1999-200
5 Ivo Timmermans
,
+ 2000-200
7 Guus Sliepen <guus@tinc-vpn
.org>
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.5 2003/08/24 20:38:25 guus Exp
$
+ $Id$
*/
#include "system.h"
*/
#include "system.h"
@@
-58,19
+58,6
@@
static void memory_full(int size)
/* Some functions the less gifted operating systems might lack... */
/* Some functions the less gifted operating systems might lack... */
-#ifndef HAVE_FCLOSEALL
-static int fcloseall(void)
-{
- fflush(stdin);
- fflush(stdout);
- fflush(stderr);
- fclose(stdin);
- fclose(stdout);
- fclose(stderr);
- return 0;
-}
-#endif
-
#ifdef HAVE_MINGW
extern char *identname;
extern char *program_name;
#ifdef HAVE_MINGW
extern char *identname;
extern char *program_name;
@@
-94,30
+81,30
@@
bool install_service(void) {
}
if(!strchr(program_name, '\\')) {
}
if(!strchr(program_name, '\\')) {
- GetCurrentDirectory(sizeof
(command)
- 1, command + 1);
- strncat(command, "\\", sizeof(command));
+ GetCurrentDirectory(sizeof
command
- 1, command + 1);
+ strncat(command, "\\", sizeof
command - strlen
(command));
}
}
- strncat(command, program_name, sizeof(command));
+ strncat(command, program_name, sizeof
command - strlen
(command));
- strncat(command, "\"", sizeof(command));
+ strncat(command, "\"", sizeof
command - strlen
(command));
for(argp = g_argv + 1; *argp; argp++) {
space = strchr(*argp, ' ');
for(argp = g_argv + 1; *argp; argp++) {
space = strchr(*argp, ' ');
- strncat(command, " ", sizeof(command));
+ strncat(command, " ", sizeof
command - strlen
(command));
if(space)
if(space)
- strncat(command, "\"", sizeof(command));
+ strncat(command, "\"", sizeof
command - strlen
(command));
- strncat(command, *argp, sizeof(command));
+ strncat(command, *argp, sizeof
command - strlen
(command));
if(space)
if(space)
- strncat(command, "\"", sizeof(command));
+ strncat(command, "\"", sizeof
command - strlen
(command));
}
service = CreateService(manager, identname, identname,
SERVICE_ALL_ACCESS, SERVICE_WIN32_OWN_PROCESS, SERVICE_AUTO_START, SERVICE_ERROR_NORMAL,
}
service = CreateService(manager, identname, identname,
SERVICE_ALL_ACCESS, SERVICE_WIN32_OWN_PROCESS, SERVICE_AUTO_START, SERVICE_ERROR_NORMAL,
- command,
"NDIS"
, NULL, NULL, NULL, NULL);
+ command,
NULL
, NULL, NULL, NULL, NULL);
if(!service) {
logger(LOG_ERR, _("Could not create %s service: %s"), identname, winerror(GetLastError()));
if(!service) {
logger(LOG_ERR, _("Could not create %s service: %s"), identname, winerror(GetLastError()));
@@
-167,6
+154,9
@@
bool remove_service(void) {
DWORD WINAPI controlhandler(DWORD request, DWORD type, LPVOID boe, LPVOID bah) {
switch(request) {
DWORD WINAPI controlhandler(DWORD request, DWORD type, LPVOID boe, LPVOID bah) {
switch(request) {
+ case SERVICE_CONTROL_INTERROGATE:
+ SetServiceStatus(statushandle, &status);
+ return NO_ERROR;
case SERVICE_CONTROL_STOP:
logger(LOG_NOTICE, _("Got %s request"), "SERVICE_CONTROL_STOP");
break;
case SERVICE_CONTROL_STOP:
logger(LOG_NOTICE, _("Got %s request"), "SERVICE_CONTROL_STOP");
break;
@@
-254,7
+244,7
@@
bool init_service(void) {
*/
static bool write_pidfile(void)
{
*/
static bool write_pidfile(void)
{
-
in
t pid;
+
pid_
t pid;
cp();
cp();
@@
-262,16
+252,18
@@
static bool write_pidfile(void)
if(pid) {
if(netname)
if(pid) {
if(netname)
- fprintf(stderr, _("A tincd is already running for net `%s' with pid %d.\n"),
- netname, pid);
+ fprintf(stderr, _("A tincd is already running for net `%s' with pid %
l
d.\n"),
+ netname,
(long)
pid);
else
else
- fprintf(stderr, _("A tincd is already running with pid %
d.\n"),
pid);
+ fprintf(stderr, _("A tincd is already running with pid %
ld.\n"), (long)
pid);
return false;
}
/* if it's locked, write-protected, or whatever */
return false;
}
/* if it's locked, write-protected, or whatever */
- if(!write_pid(pidfilename))
+ if(!write_pid(pidfilename)) {
+ fprintf(stderr, _("Could write pid file %s: %s\n"), pidfilename, strerror(errno));
return false;
return false;
+ }
return true;
}
return true;
}
@@
-283,7
+275,7
@@
static bool write_pidfile(void)
bool kill_other(int signal)
{
#ifndef HAVE_MINGW
bool kill_other(int signal)
{
#ifndef HAVE_MINGW
-
in
t pid;
+
pid_
t pid;
cp();
cp();
@@
-348,8
+340,10
@@
bool detach(void)
/* Now UPDATE the pid in the pidfile, because we changed it... */
/* Now UPDATE the pid in the pidfile, because we changed it... */
- if(!write_pid(pidfilename))
+ if(!write_pid(pidfilename)) {
+ fprintf(stderr, _("Could not write pid file %s: %s\n"), pidfilename, strerror(errno));
return false;
return false;
+ }
#else
if(!statushandle)
exit(install_service());
#else
if(!statushandle)
exit(install_service());
@@
-371,7
+365,8
@@
bool execute_script(const char *name, char **envp)
#ifdef HAVE_SYSTEM
int status, len;
struct stat s;
#ifdef HAVE_SYSTEM
int status, len;
struct stat s;
- char *scriptname;
+ char *scriptname, *p;
+ int i;
cp();
cp();
@@
-387,16
+382,18
@@
bool execute_script(const char *name, char **envp)
/* First check if there is a script */
/* First check if there is a script */
- if(stat(scriptname + 1, &s))
+ if(stat(scriptname + 1, &s)) {
+ free(scriptname);
return true;
return true;
+ }
ifdebug(STATUS) logger(LOG_INFO, _("Executing script %s"), name);
#ifdef HAVE_PUTENV
/* Set environment */
ifdebug(STATUS) logger(LOG_INFO, _("Executing script %s"), name);
#ifdef HAVE_PUTENV
/* Set environment */
-
while(*envp
)
- putenv(
*envp++
);
+
for(i = 0; envp[i]; i++
)
+ putenv(
envp[i]
);
#endif
scriptname[len - 1] = '\"';
#endif
scriptname[len - 1] = '\"';
@@
-404,7
+401,17
@@
bool execute_script(const char *name, char **envp)
free(scriptname);
free(scriptname);
- /* Unset environment? */
+ /* Unset environment */
+
+ for(i = 0; envp[i]; i++) {
+ char *e = strchr(envp[i], '=');
+ if(e) {
+ p = alloca(e - envp[i] + 1);
+ strncpy(p, envp[i], e - envp[i]);
+ p[e - envp[i]] = '\0';
+ putenv(p);
+ }
+ }
#ifdef WEXITSTATUS
if(status != -1) {
#ifdef WEXITSTATUS
if(status != -1) {
@@
-440,13
+447,19
@@
bool execute_script(const char *name, char **envp)
static RETSIGTYPE sigterm_handler(int a)
{
logger(LOG_NOTICE, _("Got %s signal"), "TERM");
static RETSIGTYPE sigterm_handler(int a)
{
logger(LOG_NOTICE, _("Got %s signal"), "TERM");
- running = false;
+ if(running)
+ running = false;
+ else
+ exit(1);
}
static RETSIGTYPE sigquit_handler(int a)
{
logger(LOG_NOTICE, _("Got %s signal"), "QUIT");
}
static RETSIGTYPE sigquit_handler(int a)
{
logger(LOG_NOTICE, _("Got %s signal"), "QUIT");
- running = false;
+ if(running)
+ running = false;
+ else
+ exit(1);
}
static RETSIGTYPE fatal_signal_square(int a)
}
static RETSIGTYPE fatal_signal_square(int a)