projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
PIDs are of type pid_t, and use %ld when reading/writing them to the pidfile.
[tinc]
/
src
/
process.c
diff --git
a/src/process.c
b/src/process.c
index
d81fdd6
..
a5abc93
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.
68 2003/08/08 19:56:11
guus Exp $
+ $Id: process.c,v 1.1.2.
76 2003/10/06 16:13:08
guus Exp $
*/
#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;
@@
-82,9
+69,10
@@
static SERVICE_STATUS status = {0};
static SERVICE_STATUS_HANDLE statushandle = 0;
bool install_service(void) {
static SERVICE_STATUS_HANDLE statushandle = 0;
bool install_service(void) {
- char command[4096] = "";
+ char command[4096] = "
\"
";
char **argp;
bool space;
char **argp;
bool space;
+ SERVICE_DESCRIPTION description = {"Virtual Private Network daemon"};
manager = OpenSCManager(NULL, NULL, SC_MANAGER_ALL_ACCESS);
if(!manager) {
manager = OpenSCManager(NULL, NULL, SC_MANAGER_ALL_ACCESS);
if(!manager) {
@@
-93,11
+81,14
@@
bool install_service(void) {
}
if(!strchr(program_name, '\\')) {
}
if(!strchr(program_name, '\\')) {
- GetCurrentDirectory(sizeof(command)
, command
);
+ GetCurrentDirectory(sizeof(command)
- 1, command + 1
);
strncat(command, "\\", sizeof(command));
}
strncat(command, program_name, sizeof(command));
strncat(command, "\\", sizeof(command));
}
strncat(command, program_name, sizeof(command));
+
+ strncat(command, "\"", sizeof(command));
+
for(argp = g_argv + 1; *argp; argp++) {
space = strchr(*argp, ' ');
strncat(command, " ", sizeof(command));
for(argp = g_argv + 1; *argp; argp++) {
space = strchr(*argp, ' ');
strncat(command, " ", sizeof(command));
@@
-120,6
+111,8
@@
bool install_service(void) {
return false;
}
return false;
}
+ ChangeServiceConfig2(service, SERVICE_CONFIG_DESCRIPTION, &description);
+
logger(LOG_INFO, _("%s service installed"), identname);
if(!StartService(service, 0, NULL))
logger(LOG_INFO, _("%s service installed"), identname);
if(!StartService(service, 0, NULL))
@@
-163,24
+156,28
@@
DWORD WINAPI controlhandler(DWORD request, DWORD type, LPVOID boe, LPVOID bah) {
switch(request) {
case SERVICE_CONTROL_STOP:
logger(LOG_NOTICE, _("Got %s request"), "SERVICE_CONTROL_STOP");
switch(request) {
case SERVICE_CONTROL_STOP:
logger(LOG_NOTICE, _("Got %s request"), "SERVICE_CONTROL_STOP");
- running = false;
break;
case SERVICE_CONTROL_SHUTDOWN:
logger(LOG_NOTICE, _("Got %s request"), "SERVICE_CONTROL_SHUTDOWN");
break;
case SERVICE_CONTROL_SHUTDOWN:
logger(LOG_NOTICE, _("Got %s request"), "SERVICE_CONTROL_SHUTDOWN");
- running = false;
break;
default:
logger(LOG_WARNING, _("Got unexpected request %d"), request);
return ERROR_CALL_NOT_IMPLEMENTED;
}
break;
default:
logger(LOG_WARNING, _("Got unexpected request %d"), request);
return ERROR_CALL_NOT_IMPLEMENTED;
}
- if(!running) {
+ if(running) {
+ running = false;
status.dwWaitHint = 30000;
status.dwCurrentState = SERVICE_STOP_PENDING;
SetServiceStatus(statushandle, &status);
status.dwWaitHint = 30000;
status.dwCurrentState = SERVICE_STOP_PENDING;
SetServiceStatus(statushandle, &status);
+ return NO_ERROR;
+ } else {
+ status.dwWaitHint = 0;
+ status.dwCurrentState = SERVICE_STOPPED;
+ SetServiceStatus(statushandle, &status);
+ exit(1);
}
}
- return NO_ERROR;
}
VOID WINAPI run_service(DWORD argc, LPTSTR* argv)
}
VOID WINAPI run_service(DWORD argc, LPTSTR* argv)
@@
-244,7
+241,7
@@
bool init_service(void) {
*/
static bool write_pidfile(void)
{
*/
static bool write_pidfile(void)
{
-
in
t pid;
+
pid_
t pid;
cp();
cp();
@@
-252,10
+249,10
@@
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;
}
return false;
}
@@
-273,7
+270,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();
@@
-359,23
+356,28
@@
bool detach(void)
bool execute_script(const char *name, char **envp)
{
#ifdef HAVE_SYSTEM
bool execute_script(const char *name, char **envp)
{
#ifdef HAVE_SYSTEM
- pid_t pid;
- int status;
+ int status, len;
struct stat s;
char *scriptname;
cp();
struct stat s;
char *scriptname;
cp();
- asprintf(&scriptname, "\"%s/%s\"", confbase, name);
-
#ifndef HAVE_MINGW
#ifndef HAVE_MINGW
+ len = asprintf(&scriptname, "\"%s/%s\"", confbase, name);
+#else
+ len = asprintf(&scriptname, "\"%s/%s.bat\"", confbase, name);
+#endif
+ if(len < 0)
+ return false;
+
+ scriptname[len - 1] = '\0';
+
/* First check if there is a script */
/* First check if there is a script */
- if(stat(scriptname, &s))
+ if(stat(scriptname
+ 1
, &s))
return true;
ifdebug(STATUS) logger(LOG_INFO, _("Executing script %s"), name);
return true;
ifdebug(STATUS) logger(LOG_INFO, _("Executing script %s"), name);
-#endif
#ifdef HAVE_PUTENV
/* Set environment */
#ifdef HAVE_PUTENV
/* Set environment */
@@
-384,6
+386,7
@@
bool execute_script(const char *name, char **envp)
putenv(*envp++);
#endif
putenv(*envp++);
#endif
+ scriptname[len - 1] = '\"';
status = system(scriptname);
free(scriptname);
status = system(scriptname);
free(scriptname);
@@
-394,22
+397,20
@@
bool execute_script(const char *name, char **envp)
if(status != -1) {
if(WIFEXITED(status)) { /* Child exited by itself */
if(WEXITSTATUS(status)) {
if(status != -1) {
if(WIFEXITED(status)) { /* Child exited by itself */
if(WEXITSTATUS(status)) {
- logger(LOG_ERR, _("
Process %d (%s)
exited with non-zero status %d"),
-
pid,
name, WEXITSTATUS(status));
+ logger(LOG_ERR, _("
Script %s
exited with non-zero status %d"),
+ name, WEXITSTATUS(status));
return false;
}
} else if(WIFSIGNALED(status)) { /* Child was killed by a signal */
return false;
}
} else if(WIFSIGNALED(status)) { /* Child was killed by a signal */
- logger(LOG_ERR, _("
Process %d (%s) was killed by signal %d (%s)"), pid
,
+ logger(LOG_ERR, _("
Script %s was killed by signal %d (%s)")
,
name, WTERMSIG(status), strsignal(WTERMSIG(status)));
return false;
} else { /* Something strange happened */
name, WTERMSIG(status), strsignal(WTERMSIG(status)));
return false;
} else { /* Something strange happened */
- logger(LOG_ERR, _("Process %d (%s) terminated abnormally"), pid,
- name);
+ logger(LOG_ERR, _("Script %s terminated abnormally"), name);
return false;
}
} else {
return false;
}
} else {
- logger(LOG_ERR, _("System call `%s' failed: %s"), "system",
- strerror(errno));
+ logger(LOG_ERR, _("System call `%s' failed: %s"), "system", strerror(errno));
return false;
}
#endif
return false;
}
#endif