From: Guus Sliepen Date: Sat, 19 May 2007 14:13:21 +0000 (+0000) Subject: Remove pidfile in favour of control socket. X-Git-Tag: release-1.1pre1~165 X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=commitdiff_plain;h=bf8e3ce13dba6109757c14dc0013a315a75d2ba3 Remove pidfile in favour of control socket. --- diff --git a/lib/Makefile.am b/lib/Makefile.am index 0f597bb7..5dfeda5f 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -5,11 +5,11 @@ noinst_LIBRARIES = libvpn.a INCLUDES = @INCLUDES@ -I. -I$(top_builddir) -libvpn_a_SOURCES = xmalloc.c pidfile.c utils.c getopt.c getopt1.c list.c splay_tree.c dropin.c fake-getaddrinfo.c fake-getnameinfo.c +libvpn_a_SOURCES = xmalloc.c utils.c getopt.c getopt1.c list.c splay_tree.c dropin.c fake-getaddrinfo.c fake-getnameinfo.c libvpn_a_LIBADD = @LIBOBJS@ @ALLOCA@ libvpn_a_DEPENDENCIES = $(libvpn_a_LIBADD) -noinst_HEADERS = xalloc.h pidfile.h utils.h getopt.h list.h splay_tree.h dropin.h fake-getaddrinfo.h fake-getnameinfo.h fake-gai-errnos.h gettext.h ipv6.h ipv4.h ethernet.h +noinst_HEADERS = xalloc.h utils.h getopt.h list.h splay_tree.h dropin.h fake-getaddrinfo.h fake-getnameinfo.h fake-gai-errnos.h gettext.h ipv6.h ipv4.h ethernet.h EXTRA_DIST = diff --git a/lib/pidfile.c b/lib/pidfile.c deleted file mode 100644 index b67e1876..00000000 --- a/lib/pidfile.c +++ /dev/null @@ -1,126 +0,0 @@ -/* - pidfile.c - interact with pidfiles - Copyright (c) 1995 Martin Schulze - - This file is part of the sysklogd package, a kernel and system log daemon. - - 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 - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA -*/ - -/* left unaltered for tinc -- Ivo Timmermans */ -/* - * Sat Aug 19 13:24:33 MET DST 1995: Martin Schulze - * First version (v0.2) released - */ - -#include "system.h" - -#ifndef HAVE_MINGW -/* read_pid - * - * Reads the specified pidfile and returns the read pid. - * 0 is returned if either there's no pidfile, it's empty - * or no pid can be read. - */ -pid_t read_pid (char *pidfile) { - FILE *f; - long pid; - - if (!(f=fopen(pidfile,"r"))) - return 0; - fscanf(f,"%ld", &pid); - fclose(f); - return pid; -} - -/* check_pid - * - * Reads the pid using read_pid and looks up the pid in the process - * table (using /proc) to determine if the process already exists. If - * so the pid is returned, otherwise 0. - */ -pid_t check_pid (char *pidfile) { - pid_t pid = read_pid(pidfile); - - /* Amazing ! _I_ am already holding the pid file... */ - if ((!pid) || (pid == getpid ())) - return 0; - - /* - * The 'standard' method of doing this is to try and do a 'fake' kill - * of the process. If an ESRCH error is returned the process cannot - * be found -- GW - */ - /* But... errno is usually changed only on error.. */ - errno = 0; - if (kill(pid, 0) && errno == ESRCH) - return 0; - - return pid; -} - -/* write_pid - * - * Writes the pid to the specified file. If that fails 0 is - * returned, otherwise the pid. - */ -pid_t write_pid (char *pidfile) { - FILE *f; - int fd; - pid_t pid; - - if ((fd = open(pidfile, O_RDWR|O_CREAT, 0644)) == -1) { - return 0; - } - - if ((f = fdopen(fd, "r+")) == NULL) { - close(fd); - return 0; - } - -#ifdef HAVE_FLOCK - if (flock(fd, LOCK_EX|LOCK_NB) == -1) { - fclose(f); - return 0; - } -#endif - - pid = getpid(); - if (!fprintf(f,"%ld\n", (long)pid)) { - fclose(f); - return 0; - } - fflush(f); - -#ifdef HAVE_FLOCK - if (flock(fd, LOCK_UN) == -1) { - fclose(f); - return 0; - } -#endif - fclose(f); - - return pid; -} - -/* remove_pid - * - * Remove the the specified file. The result from unlink(2) - * is returned - */ -int remove_pid (char *pidfile) { - return unlink (pidfile); -} -#endif diff --git a/lib/pidfile.h b/lib/pidfile.h deleted file mode 100644 index 152ae2c4..00000000 --- a/lib/pidfile.h +++ /dev/null @@ -1,52 +0,0 @@ -/* - pidfile.h - interact with pidfiles - Copyright (c) 1995 Martin Schulze - - This file is part of the sysklogd package, a kernel and system log daemon. - - 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 - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -*/ - -#ifndef HAVE_MINGW -/* read_pid - * - * Reads the specified pidfile and returns the read pid. - * 0 is returned if either there's no pidfile, it's empty - * or no pid can be read. - */ -pid_t read_pid (char *pidfile); - -/* check_pid - * - * Reads the pid using read_pid and looks up the pid in the process - * table (using /proc) to determine if the process already exists. If - * so 1 is returned, otherwise 0. - */ -pid_t check_pid (char *pidfile); - -/* write_pid - * - * Writes the pid to the specified file. If that fails 0 is - * returned, otherwise the pid. - */ -pid_t write_pid (char *pidfile); - -/* remove_pid - * - * Remove the the specified file. The result from unlink(2) - * is returned - */ -int remove_pid (char *pidfile); -#endif diff --git a/src/control.c b/src/control.c index b72ea9ee..1481a2d8 100644 --- a/src/control.c +++ b/src/control.c @@ -30,7 +30,7 @@ static int control_socket = -1; static struct event control_event; static splay_tree_t *control_socket_tree; -extern char *controlfilename; +extern char *controlsocketname; static void handle_control_data(int fd, short events, void *event) { char buf[MAXBUFSIZE]; @@ -70,47 +70,67 @@ static int control_compare(const struct event *a, const struct event *b) { return a < b ? -1 : a > b ? 1 : 0; } -void init_control() { +bool init_control() { + int result; struct sockaddr_un addr; - control_socket_tree = splay_alloc_tree((splay_compare_t)control_compare, (splay_action_t)free); - - if(strlen(controlfilename) >= sizeof addr.sun_path) { + if(strlen(controlsocketname) >= sizeof addr.sun_path) { logger(LOG_ERR, _("Control socket filename too long!")); - return; + return false; } memset(&addr, 0, sizeof addr); addr.sun_family = AF_UNIX; - strncpy(addr.sun_path, controlfilename, sizeof addr.sun_path - 1); + strncpy(addr.sun_path, controlsocketname, sizeof addr.sun_path - 1); control_socket = socket(PF_UNIX, SOCK_STREAM, 0); if(control_socket < 0) { logger(LOG_ERR, _("Creating UNIX socket failed: %s"), strerror(errno)); - return; + return false; } - unlink(controlfilename); - if(bind(control_socket, (struct sockaddr *)&addr, sizeof addr) < 0) { - logger(LOG_ERR, _("Can't bind to %s: %s\n"), controlfilename, strerror(errno)); + //unlink(controlsocketname); + result = bind(control_socket, (struct sockaddr *)&addr, sizeof addr); + + if(result < 0 && errno == EADDRINUSE) { + result = connect(control_socket, (struct sockaddr *)&addr, sizeof addr); + if(result < 0) { + logger(LOG_WARNING, _("Removing old control socket.")); + unlink(controlsocketname); + result = bind(control_socket, (struct sockaddr *)&addr, sizeof addr); + } else { + close(control_socket); + if(netname) + logger(LOG_ERR, _("Another tincd is already running for net `%s'."), netname); + else + logger(LOG_ERR, _("Another tincd is already running.")); + return false; + } + } + + if(result < 0) { + logger(LOG_ERR, _("Can't bind to %s: %s\n"), controlsocketname, strerror(errno)); close(control_socket); - return; + return false; } if(listen(control_socket, 3) < 0) { - logger(LOG_ERR, _("Can't listen on %s: %s\n"), controlfilename, strerror(errno)); + logger(LOG_ERR, _("Can't listen on %s: %s\n"), controlsocketname, strerror(errno)); close(control_socket); - return; + return false; } + control_socket_tree = splay_alloc_tree((splay_compare_t)control_compare, (splay_action_t)free); + event_set(&control_event, control_socket, EV_READ | EV_PERSIST, handle_new_control_socket, NULL); event_add(&control_event, NULL); + + return true; } void exit_control() { - if(control_socket >= 0) { - event_del(&control_event); - close(control_socket); - } + event_del(&control_event); + close(control_socket); + unlink(controlsocketname); } diff --git a/src/control.h b/src/control.h index 94b82aa1..e2020a85 100644 --- a/src/control.h +++ b/src/control.h @@ -22,7 +22,7 @@ #ifndef __TINC_CONTROL_H__ #define __TINC_CONTROL_H__ -extern void init_control(); +extern bool init_control(); extern void exit_control(); #endif diff --git a/src/net_setup.c b/src/net_setup.c index 4407cd4f..b8fb4f02 100644 --- a/src/net_setup.c +++ b/src/net_setup.c @@ -577,7 +577,6 @@ bool setup_network_connections(void) { init_nodes(); init_edges(); init_requests(); - init_control(); if(get_config_int(lookup_config(config_tree, "PingInterval"), &pinginterval)) { if(pinginterval < 1) { @@ -646,7 +645,6 @@ void close_network_connections(void) { asprintf(&envp[3], "NAME=%s", myself->name); envp[4] = NULL; - exit_control(); exit_requests(); exit_edges(); exit_subnets(); diff --git a/src/process.c b/src/process.c index 1b5f00db..e9f65d46 100644 --- a/src/process.c +++ b/src/process.c @@ -24,11 +24,11 @@ #include "conf.h" #include "connection.h" +#include "control.h" #include "device.h" #include "edge.h" #include "logger.h" #include "node.h" -#include "pidfile.h" #include "process.h" #include "subnet.h" #include "utils.h" @@ -39,7 +39,6 @@ bool do_detach = true; bool sigalrm = false; extern char *identname; -extern char *pidfilename; extern char **g_argv; extern bool use_logfile; @@ -221,92 +220,15 @@ bool init_service(void) { } #endif -#ifndef HAVE_MINGW -/* - check for an existing tinc for this net, and write pid to pidfile -*/ -static bool write_pidfile(void) { - pid_t pid; - - cp(); - - pid = check_pid(pidfilename); - - if(pid) { - if(netname) - fprintf(stderr, _("A tincd is already running for net `%s' with pid %ld.\n"), - netname, (long)pid); - else - fprintf(stderr, _("A tincd is already running with pid %ld.\n"), (long)pid); - return false; - } - - /* if it's locked, write-protected, or whatever */ - if(!write_pid(pidfilename)) { - fprintf(stderr, _("Could write pid file %s: %s\n"), pidfilename, strerror(errno)); - return false; - } - - return true; -} -#endif - /* - kill older tincd for this net -*/ -bool kill_other(int signal) { -#ifndef HAVE_MINGW - pid_t pid; - - cp(); - - pid = read_pid(pidfilename); - - if(!pid) { - if(netname) - fprintf(stderr, _("No other tincd is running for net `%s'.\n"), - netname); - else - fprintf(stderr, _("No other tincd is running.\n")); - return false; - } - - errno = 0; /* No error, sometimes errno is only changed on error */ - - /* ESRCH is returned when no process with that pid is found */ - if(kill(pid, signal) && errno == ESRCH) { - if(netname) - fprintf(stderr, _("The tincd for net `%s' is no longer running. "), - netname); - else - fprintf(stderr, _("The tincd is no longer running. ")); - - fprintf(stderr, _("Removing stale lock file.\n")); - remove_pid(pidfilename); - } - - return true; -#else - return remove_service(); -#endif -} - -/* - Detach from current terminal, write pidfile, kill parent + Detach from current terminal */ bool detach(void) { cp(); setup_signals(); - /* First check if we can open a fresh new pidfile */ - #ifndef HAVE_MINGW - if(!write_pidfile()) - return false; - - /* If we succeeded in doing that, detach */ - closelogger(); #endif @@ -317,13 +239,6 @@ bool detach(void) { strerror(errno)); return false; } - - /* Now UPDATE the pid in the pidfile, because we changed it... */ - - if(!write_pid(pidfilename)) { - fprintf(stderr, _("Could not write pid file %s: %s\n"), pidfilename, strerror(errno)); - return false; - } #else if(!statushandle) exit(install_service()); @@ -445,7 +360,7 @@ static RETSIGTYPE fatal_signal_handler(int a) { close_network_connections(); sleep(5); - remove_pid(pidfilename); + exit_control(); execvp(g_argv[0], g_argv); } else { logger(LOG_NOTICE, _("Not restarting.")); diff --git a/src/tincctl.c b/src/tincctl.c index 91d141dd..a90f7a28 100644 --- a/src/tincctl.c +++ b/src/tincctl.c @@ -50,8 +50,7 @@ int kill_tincd = 0; int generate_keys = 0; char *identname = NULL; /* program name for syslog */ -char *pidfilename = NULL; /* pid file location */ -char *controlfilename = NULL; /* pid file location */ +char *controlsocketname = NULL; /* pid file location */ char *confbase = NULL; char *netname = NULL; @@ -62,7 +61,7 @@ static struct option const long_options[] = { {"net", required_argument, NULL, 'n'}, {"help", no_argument, NULL, 1}, {"version", no_argument, NULL, 2}, - {"pidfile", required_argument, NULL, 5}, + {"controlsocket", required_argument, NULL, 5}, {NULL, 0, NULL, 0} }; @@ -73,11 +72,12 @@ static void usage(bool status) { else { printf(_("Usage: %s [options] command\n\n"), program_name); printf(_("Valid options are:\n" - " -c, --config=DIR Read configuration options from DIR.\n" - " -n, --net=NETNAME Connect to net NETNAME.\n" - " --pidfile=FILENAME Write PID to FILENAME.\n" - " --help Display this help and exit.\n" - " --version Output version information and exit.\n" + " -c, --config=DIR Read configuration options from DIR.\n" + " -n, --net=NETNAME Connect to net NETNAME.\n" + " --controlsocket=FILENAME Open control socket at FILENAME.\n" + " --help Display this help and exit.\n" + " --version Output version information and exit.\n" + "\n" "Valid commands are:\n" " start Start tincd.\n" " stop Stop tincd.\n" @@ -120,8 +120,8 @@ static bool parse_options(int argc, char **argv) { show_version = true; break; - case 5: /* write PID to a file */ - pidfilename = xstrdup(optarg); + case 5: /* open control socket here */ + controlsocketname = xstrdup(optarg); break; case '?': @@ -262,10 +262,8 @@ static void make_names(void) { } #endif - if(!pidfilename) - asprintf(&pidfilename, LOCALSTATEDIR "/run/%s.pid", identname); - - asprintf(&controlfilename, LOCALSTATEDIR "/run/%s.control", identname); + if(!controlsocketname) + asprintf(&controlsocketname, LOCALSTATEDIR "/run/%s.control", identname); if(netname) { if(!confbase) @@ -309,7 +307,7 @@ int main(int argc, char **argv) { return 0; } - if(strlen(controlfilename) >= sizeof addr.sun_path) { + if(strlen(controlsocketname) >= sizeof addr.sun_path) { fprintf(stderr, _("Control socket filename too long!\n")); return 1; } @@ -322,14 +320,14 @@ int main(int argc, char **argv) { memset(&addr, 0, sizeof addr); addr.sun_family = AF_UNIX; - strncpy(addr.sun_path, controlfilename, sizeof addr.sun_path - 1); + strncpy(addr.sun_path, controlsocketname, sizeof addr.sun_path - 1); if(connect(fd, (struct sockaddr *)&addr, sizeof addr) < 0) { - fprintf(stderr, _("Cannot connect to %s: %s\n"), controlfilename, strerror(errno)); + fprintf(stderr, _("Cannot connect to %s: %s\n"), controlsocketname, strerror(errno)); return 1; } - printf("Connected to %s.\n", controlfilename); + printf("Connected to %s.\n", controlsocketname); close(fd); diff --git a/src/tincd.c b/src/tincd.c index 9730e211..7efc6324 100644 --- a/src/tincd.c +++ b/src/tincd.c @@ -40,9 +40,9 @@ #include LZO1X_H #include -#include "pidfile.h" #include "conf.h" +#include "control.h" #include "device.h" #include "logger.h" #include "net.h" @@ -61,9 +61,6 @@ bool show_help = false; /* If nonzero, print the version on standard output and exit. */ bool show_version = false; -/* If nonzero, it will attempt to kill a running tincd and exit. */ -int kill_tincd = 0; - /* If nonzero, generate public/private keypair for this host/net. */ int generate_keys = 0; @@ -77,8 +74,7 @@ bool do_mlock = false; bool use_logfile = false; char *identname = NULL; /* program name for syslog */ -char *pidfilename = NULL; /* pid file location */ -char *controlfilename = NULL; /* pid file location */ +char *controlsocketname = NULL; /* control socket location */ char *logfilename = NULL; /* log file location */ char **g_argv; /* a copy of the cmdline arguments */ @@ -86,7 +82,6 @@ static int status; static struct option const long_options[] = { {"config", required_argument, NULL, 'c'}, - {"kill", optional_argument, NULL, 'k'}, {"net", required_argument, NULL, 'n'}, {"help", no_argument, NULL, 1}, {"version", no_argument, NULL, 2}, @@ -96,7 +91,7 @@ static struct option const long_options[] = { {"bypass-security", no_argument, NULL, 3}, {"mlock", no_argument, NULL, 'L'}, {"logfile", optional_argument, NULL, 4}, - {"pidfile", required_argument, NULL, 5}, + {"controlsocket", required_argument, NULL, 5}, {NULL, 0, NULL, 0} }; @@ -111,17 +106,16 @@ static void usage(bool status) program_name); else { printf(_("Usage: %s [option]...\n\n"), program_name); - printf(_(" -c, --config=DIR Read configuration options from DIR.\n" - " -D, --no-detach Don't fork and detach.\n" - " -d, --debug[=LEVEL] Increase debug level or set it to LEVEL.\n" - " -k, --kill[=SIGNAL] Attempt to kill a running tincd and exit.\n" - " -n, --net=NETNAME Connect to net NETNAME.\n" - " -K, --generate-keys[=BITS] Generate public/private RSA keypair.\n" - " -L, --mlock Lock tinc into main memory.\n" - " --logfile[=FILENAME] Write log entries to a logfile.\n" - " --pidfile=FILENAME Write PID to FILENAME.\n" - " --help Display this help and exit.\n" - " --version Output version information and exit.\n\n")); + printf(_(" -c, --config=DIR Read configuration options from DIR.\n" + " -D, --no-detach Don't fork and detach.\n" + " -d, --debug[=LEVEL] Increase debug level or set it to LEVEL.\n" + " -n, --net=NETNAME Connect to net NETNAME.\n" + " -K, --generate-keys[=BITS] Generate public/private RSA keypair.\n" + " -L, --mlock Lock tinc into main memory.\n" + " --logfile[=FILENAME] Write log entries to a logfile.\n" + " --controlsocket=FILENAME Open control socket at FILENAME.\n" + " --help Display this help and exit.\n" + " --version Output version information and exit.\n\n")); printf(_("Report bugs to tinc@tinc-vpn.org.\n")); } } @@ -131,7 +125,7 @@ static bool parse_options(int argc, char **argv) int r; int option_index = 0; - while((r = getopt_long(argc, argv, "c:DLd::k::n:K::", long_options, &option_index)) != EOF) { + while((r = getopt_long(argc, argv, "c:DLd::n:K::", long_options, &option_index)) != EOF) { switch (r) { case 0: /* long option */ break; @@ -155,42 +149,6 @@ static bool parse_options(int argc, char **argv) debug_level++; break; - case 'k': /* kill old tincds */ -#ifndef HAVE_MINGW - if(optarg) { - if(!strcasecmp(optarg, "HUP")) - kill_tincd = SIGHUP; - else if(!strcasecmp(optarg, "TERM")) - kill_tincd = SIGTERM; - else if(!strcasecmp(optarg, "KILL")) - kill_tincd = SIGKILL; - else if(!strcasecmp(optarg, "USR1")) - kill_tincd = SIGUSR1; - else if(!strcasecmp(optarg, "USR2")) - kill_tincd = SIGUSR2; - else if(!strcasecmp(optarg, "WINCH")) - kill_tincd = SIGWINCH; - else if(!strcasecmp(optarg, "INT")) - kill_tincd = SIGINT; - else if(!strcasecmp(optarg, "ALRM")) - kill_tincd = SIGALRM; - else { - kill_tincd = atoi(optarg); - - if(!kill_tincd) { - fprintf(stderr, _("Invalid argument `%s'; SIGNAL must be a number or one of HUP, TERM, KILL, USR1, USR2, WINCH, INT or ALRM.\n"), - optarg); - usage(true); - return false; - } - } - } else - kill_tincd = SIGTERM; -#else - kill_tincd = 1; -#endif - break; - case 'n': /* net name given */ netname = xstrdup(optarg); break; @@ -229,8 +187,8 @@ static bool parse_options(int argc, char **argv) logfilename = xstrdup(optarg); break; - case 5: /* write PID to a file */ - pidfilename = xstrdup(optarg); + case 5: /* open control socket here */ + controlsocketname = xstrdup(optarg); break; case '?': @@ -376,10 +334,8 @@ static void make_names(void) } #endif - if(!pidfilename) - asprintf(&pidfilename, LOCALSTATEDIR "/run/%s.pid", identname); - - asprintf(&controlfilename, LOCALSTATEDIR "/run/%s.control", identname); + if(!controlsocketname) + asprintf(&controlsocketname, LOCALSTATEDIR "/run/%s.control", identname); if(!logfilename) asprintf(&logfilename, LOCALSTATEDIR "/log/%s.log", identname); @@ -425,11 +381,16 @@ int main(int argc, char **argv) return 0; } - if(kill_tincd) - return !kill_other(kill_tincd); - openlogger("tinc", use_logfile?LOGMODE_FILE:LOGMODE_STDERR); + if(!event_init()) { + logger(LOG_ERR, _("Error initializing libevent!")); + return 1; + } + + if(!init_control()) + return 1; + /* Lock all pages into memory if requested */ if(do_mlock) @@ -466,11 +427,6 @@ int main(int argc, char **argv) if(!read_server_config()) return 1; - if(!event_init()) { - logger(LOG_ERR, _("Error initializing libevent!")); - return 1; - } - if(lzo_init() != LZO_E_OK) { logger(LOG_ERR, _("Error initializing LZO compressor!")); return 1; @@ -516,7 +472,7 @@ end: logger(LOG_NOTICE, _("Terminating")); #ifndef HAVE_MINGW - remove_pid(pidfilename); + exit_control(); #endif EVP_cleanup();