/*
process.c -- process management functions
Copyright (C) 1999-2005 Ivo Timmermans,
- 2000-2009 Guus Sliepen <guus@tinc-vpn.org>
+ 2000-2015 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
#include "device.h"
#include "edge.h"
#include "logger.h"
+#include "net.h"
#include "node.h"
#include "pidfile.h"
#include "process.h"
extern char *pidfilename;
extern char **g_argv;
extern bool use_logfile;
-extern volatile bool running;
#ifndef HAVE_MINGW
-sigset_t emptysigset;
+static sigset_t emptysigset;
#endif
-static int saved_debug_level = -1;
-
static void memory_full(int size) {
logger(LOG_ERR, "Memory exhausted (couldn't allocate %d bytes), exitting.", size);
exit(1);
logger(LOG_NOTICE, "Got %s request", "SERVICE_CONTROL_SHUTDOWN");
break;
default:
- logger(LOG_WARNING, "Got unexpected request %d", request);
+ logger(LOG_WARNING, "Got unexpected request %d", (int)request);
return ERROR_CALL_NOT_IMPLEMENTED;
}
}
VOID WINAPI run_service(DWORD argc, LPTSTR* argv) {
- int err = 1;
extern int main2(int argc, char **argv);
-
status.dwServiceType = SERVICE_WIN32;
status.dwControlsAccepted = SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_SHUTDOWN;
status.dwWin32ExitCode = 0;
if (!statushandle) {
logger(LOG_ERR, "System call `%s' failed: %s", "RegisterServiceCtrlHandlerEx", winerror(GetLastError()));
- err = 1;
} else {
status.dwWaitHint = 30000;
status.dwCurrentState = SERVICE_START_PENDING;
status.dwCurrentState = SERVICE_RUNNING;
SetServiceStatus(statushandle, &status);
- err = main2(argc, argv);
+ main2(argc, argv);
status.dwWaitHint = 0;
status.dwCurrentState = SERVICE_STOPPED;
- //status.dwWin32ExitCode = err;
SetServiceStatus(statushandle, &status);
}
/* if it's locked, write-protected, or whatever */
if(!write_pid(pidfilename)) {
- fprintf(stderr, "Could write pid file %s: %s\n", pidfilename, strerror(errno));
+ fprintf(stderr, "Couldn't write pid file %s: %s\n", pidfilename, strerror(errno));
return false;
}
return true;
}
+#ifdef HAVE_PUTENV
+void unputenv(char *p) {
+ char *e = strchr(p, '=');
+ if(!e)
+ return;
+ int len = e - p;
+#ifndef HAVE_UNSETENV
+#ifdef HAVE_MINGW
+ // Windows requires putenv("FOO=") to unset %FOO%
+ len++;
+#endif
+#endif
+ char var[len + 1];
+ memcpy(var, p, len);
+ var[len] = 0;
+#ifdef HAVE_UNSETENV
+ unsetenv(var);
+#else
+ // We must keep what we putenv() around in memory.
+ // To do this without memory leaks, keep things in a list and reuse if possible.
+ static list_t list = {};
+ for(list_node_t *node = list.head; node; node = node->next) {
+ char *data = node->data;
+ if(!strcmp(data, var)) {
+ putenv(data);
+ return;
+ }
+ }
+ char *data = xstrdup(var);
+ list_insert_tail(&list, data);
+ putenv(data);
+#endif
+}
+#else
+void putenv(const char *p) {}
+void unputenv(const char *p) {}
+#endif
+
bool execute_script(const char *name, char **envp) {
#ifdef HAVE_SYSTEM
- int status, len;
- char *scriptname, *p;
- int i;
+ char *scriptname;
+ char *interpreter = NULL;
+ config_t *cfg_interpreter;
+ int status, len, i;
+ cfg_interpreter = lookup_config(config_tree, "ScriptsInterpreter");
#ifndef HAVE_MINGW
len = xasprintf(&scriptname, "\"%s/%s\"", confbase, name);
#else
- len = xasprintf(&scriptname, "\"%s/%s.bat\"", confbase, name);
+ if(cfg_interpreter)
+ 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';
-#ifndef HAVE_TUNEMU
/* First check if there is a script */
-
if(access(scriptname + 1, F_OK)) {
free(scriptname);
return true;
}
-#endif
+
+ // Custom scripts interpreter
+ if(get_config_string(cfg_interpreter, &interpreter)) {
+ // Force custom scripts interpreter allowing execution of scripts on android without execution flag (such as on /sdcard)
+ free(scriptname);
+ len = xasprintf(&scriptname, "%s \"%s/%s\"", interpreter, confbase, name);
+ free(interpreter);
+ if(len < 0)
+ return false;
+ }
ifdebug(STATUS) logger(LOG_INFO, "Executing script %s", name);
-#ifdef HAVE_PUTENV
/* Set environment */
for(i = 0; envp[i]; i++)
putenv(envp[i]);
-#endif
scriptname[len - 1] = '\"';
status = system(scriptname);
/* 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);
- }
- }
+ for(i = 0; envp[i]; i++)
+ unputenv(envp[i]);
-#ifdef WEXITSTATUS
if(status != -1) {
+#ifdef WEXITSTATUS
if(WIFEXITED(status)) { /* Child exited by itself */
if(WEXITSTATUS(status)) {
logger(LOG_ERR, "Script %s exited with non-zero status %d",
logger(LOG_ERR, "Script %s terminated abnormally", name);
return false;
}
+#endif
} else {
logger(LOG_ERR, "System call `%s' failed: %s", "system", strerror(errno));
return false;
}
-#endif
#endif
return true;
}
}
static RETSIGTYPE sigint_handler(int a) {
+ static int saved_debug_level = -1;
+
logger(LOG_NOTICE, "Got %s signal", "INT");
if(saved_debug_level != -1) {
}
static RETSIGTYPE sigusr2_handler(int a) {
- dump_device_stats();
+ devops.dump_stats();
dump_nodes();
dump_edges();
dump_subnets();
{SIGCHLD, ignore_signal_handler},
{SIGALRM, sigalrm_handler},
{SIGWINCH, sigwinch_handler},
+ {SIGABRT, SIG_DFL},
{0, NULL}
};
#endif
projects / tinc / blobdiff