static bool install_service(void) {
char command[4096] = "\"";
- char **argp;
- bool space;
SERVICE_DESCRIPTION description = {"Virtual Private Network daemon"};
manager = OpenSCManager(NULL, NULL, SC_MANAGER_ALL_ACCESS);
if(!manager) {
- logger(LOG_ERR, "Could not open service manager: %s", winerror(GetLastError()));
+ logger(DEBUG_ALWAYS, LOG_ERR, "Could not open service manager: %s", winerror(GetLastError()));
return false;
}
strncat(command, "\"", sizeof command - strlen(command));
- for(argp = g_argv + 1; *argp; argp++) {
- space = strchr(*argp, ' ');
+ for(char **argp = g_argv + 1; *argp; argp++) {
+ char &space = strchr(*argp, ' ');
strncat(command, " ", sizeof command - strlen(command));
-
+
if(space)
strncat(command, "\"", sizeof command - strlen(command));
-
+
strncat(command, *argp, sizeof command - strlen(command));
if(space)
service = CreateService(manager, identname, identname,
SERVICE_ALL_ACCESS, SERVICE_WIN32_OWN_PROCESS, SERVICE_AUTO_START, SERVICE_ERROR_NORMAL,
command, NULL, NULL, NULL, NULL, NULL);
-
+
if(!service) {
DWORD lasterror = GetLastError();
- logger(LOG_ERR, "Could not create %s service: %s", identname, winerror(lasterror));
+ logger(DEBUG_ALWAYS, LOG_ERR, "Could not create %s service: %s", identname, winerror(lasterror));
if(lasterror != ERROR_SERVICE_EXISTS)
return false;
}
if(service) {
ChangeServiceConfig2(service, SERVICE_CONFIG_DESCRIPTION, &description);
- logger(LOG_INFO, "%s service installed", identname);
+ logger(DEBUG_ALWAYS, LOG_INFO, "%s service installed", identname);
} else {
service = OpenService(manager, identname, SERVICE_ALL_ACCESS);
}
if(!StartService(service, 0, NULL))
- logger(LOG_WARNING, "Could not start %s service: %s", identname, winerror(GetLastError()));
+ logger(DEBUG_ALWAYS, LOG_WARNING, "Could not start %s service: %s", identname, winerror(GetLastError()));
else
- logger(LOG_INFO, "%s service started", identname);
+ logger(DEBUG_ALWAYS, LOG_INFO, "%s service started", identname);
return true;
}
SetServiceStatus(statushandle, &status);
return NO_ERROR;
case SERVICE_CONTROL_STOP:
- logger(LOG_NOTICE, "Got %s request", "SERVICE_CONTROL_STOP");
+ logger(DEBUG_ALWAYS, LOG_NOTICE, "Got %s request", "SERVICE_CONTROL_STOP");
break;
case SERVICE_CONTROL_SHUTDOWN:
- logger(LOG_NOTICE, "Got %s request", "SERVICE_CONTROL_SHUTDOWN");
+ logger(DEBUG_ALWAYS, LOG_NOTICE, "Got %s request", "SERVICE_CONTROL_SHUTDOWN");
break;
default:
- logger(LOG_WARNING, "Got unexpected request %d", request);
+ logger(DEBUG_ALWAYS, LOG_WARNING, "Got unexpected request %d", request);
return ERROR_CALL_NOT_IMPLEMENTED;
}
event_loopexit(NULL);
- status.dwWaitHint = 30000;
- status.dwCurrentState = SERVICE_STOP_PENDING;
+ status.dwWaitHint = 30000;
+ status.dwCurrentState = SERVICE_STOP_PENDING;
SetServiceStatus(statushandle, &status);
return NO_ERROR;
}
extern int main2(int argc, char **argv);
- status.dwServiceType = SERVICE_WIN32;
+ status.dwServiceType = SERVICE_WIN32;
status.dwControlsAccepted = SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_SHUTDOWN;
- status.dwWin32ExitCode = 0;
- status.dwServiceSpecificExitCode = 0;
- status.dwCheckPoint = 0;
+ status.dwWin32ExitCode = 0;
+ status.dwServiceSpecificExitCode = 0;
+ status.dwCheckPoint = 0;
- statushandle = RegisterServiceCtrlHandlerEx(identname, controlhandler, NULL);
+ statushandle = RegisterServiceCtrlHandlerEx(identname, controlhandler, NULL);
if (!statushandle) {
- logger(LOG_ERR, "System call `%s' failed: %s", "RegisterServiceCtrlHandlerEx", winerror(GetLastError()));
+ logger(DEBUG_ALWAYS, LOG_ERR, "System call `%s' failed: %s", "RegisterServiceCtrlHandlerEx", winerror(GetLastError()));
err = 1;
} else {
- status.dwWaitHint = 30000;
- status.dwCurrentState = SERVICE_START_PENDING;
+ status.dwWaitHint = 30000;
+ status.dwCurrentState = SERVICE_START_PENDING;
SetServiceStatus(statushandle, &status);
- status.dwWaitHint = 0;
+ status.dwWaitHint = 0;
status.dwCurrentState = SERVICE_RUNNING;
SetServiceStatus(statushandle, &status);
err = main2(argc, argv);
status.dwWaitHint = 0;
- status.dwCurrentState = SERVICE_STOPPED;
- //status.dwWin32ExitCode = err;
+ status.dwCurrentState = SERVICE_STOPPED;
+ //status.dwWin32ExitCode = err;
SetServiceStatus(statushandle, &status);
}
return false;
}
else
- logger(LOG_ERR, "System call `%s' failed: %s", "StartServiceCtrlDispatcher", winerror(GetLastError()));
+ logger(DEBUG_ALWAYS, LOG_ERR, "System call `%s' failed: %s", "StartServiceCtrlDispatcher", winerror(GetLastError()));
}
return true;
}
#else
if(!statushandle)
- exit(install_service());
+ exit(!install_service());
#endif
}
openlogger(identname, use_logfile?LOGMODE_FILE:(do_detach?LOGMODE_SYSLOG:LOGMODE_STDERR));
- logger(LOG_NOTICE, "tincd %s (%s %s) starting, debug level %d",
+ logger(DEBUG_ALWAYS, LOG_NOTICE, "tincd %s (%s %s) starting, debug level %d",
VERSION, __DATE__, __TIME__, debug_level);
return true;
bool execute_script(const char *name, char **envp) {
#ifdef HAVE_SYSTEM
- int status, len;
char *scriptname;
- int i;
+ char *command;
-#ifndef HAVE_MINGW
- len = xasprintf(&scriptname, "\"%s/%s\"", confbase, name);
-#else
- len = xasprintf(&scriptname, "\"%s/%s.bat\"", confbase, name);
-#endif
- if(len < 0)
- return false;
-
- scriptname[len - 1] = '\0';
+ xasprintf(&scriptname, "%s" SLASH "%s%s", confbase, name, scriptextension);
-#ifndef HAVE_TUNEMU
/* First check if there is a script */
- if(access(scriptname + 1, F_OK)) {
+ if(access(scriptname, F_OK)) {
free(scriptname);
return true;
}
-#endif
- ifdebug(STATUS) logger(LOG_INFO, "Executing script %s", name);
+ logger(DEBUG_STATUS, LOG_INFO, "Executing script %s", name);
#ifdef HAVE_PUTENV
/* Set environment */
-
- for(i = 0; envp[i]; i++)
+
+ for(int i = 0; envp[i]; i++)
putenv(envp[i]);
#endif
- scriptname[len - 1] = '\"';
- status = system(scriptname);
+ if(scriptinterpreter)
+ xasprintf(&command, "%s \"%s\"", scriptinterpreter, scriptname);
+ else
+ xasprintf(&command, "\"%s\"", scriptname);
+
+ int status = system(command);
+ free(command);
free(scriptname);
/* Unset environment */
- for(i = 0; envp[i]; i++) {
+ for(int i = 0; envp[i]; i++) {
char *e = strchr(envp[i], '=');
if(e) {
char p[e - envp[i] + 1];
#ifdef WEXITSTATUS
if(status != -1) {
- if(WIFEXITED(status)) { /* Child exited by itself */
+ if(WIFEXITED(status)) { /* Child exited by itself */
if(WEXITSTATUS(status)) {
- logger(LOG_ERR, "Script %s exited with non-zero status %d",
+ logger(DEBUG_ALWAYS, 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 */
- logger(LOG_ERR, "Script %s was killed by signal %d (%s)",
+ } else if(WIFSIGNALED(status)) { /* Child was killed by a signal */
+ logger(DEBUG_ALWAYS, LOG_ERR, "Script %s was killed by signal %d (%s)",
name, WTERMSIG(status), strsignal(WTERMSIG(status)));
return false;
- } else { /* Something strange happened */
- logger(LOG_ERR, "Script %s terminated abnormally", name);
+ } else { /* Something strange happened */
+ logger(DEBUG_ALWAYS, LOG_ERR, "Script %s terminated abnormally", name);
return false;
}
} else {
- logger(LOG_ERR, "System call `%s' failed: %s", "system", strerror(errno));
+ logger(DEBUG_ALWAYS, LOG_ERR, "System call `%s' failed: %s", "system", strerror(errno));
return false;
}
#endif
projects / tinc / blobdiff