ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/gvpe/src/util.C
(Generate patch)

Comparing gvpe/src/util.C (file contents):
Revision 1.11 by pcg, Thu Oct 16 02:41:21 2003 UTC vs.
Revision 1.17 by pcg, Fri Mar 18 01:53:05 2005 UTC

1/* 1/*
2 util.C -- process management and other utility functions 2 util.C -- process management and other utility functions
3 Copyright (C) 2003 Marc Lehmann <pcg@goof.com> 3 Copyright (C) 2003-2005 Marc Lehmann <gvpe@schmorp.de>
4 4
5 Some of these are taken from tinc, see the AUTHORS file. 5 Some of these are taken from tinc, see the AUTHORS file.
6 6
7 This file is part of GVPE.
8
7 This program is free software; you can redistribute it and/or modify 9 GVPE is free software; you can redistribute it and/or modify
8 it under the terms of the GNU General Public License as published by 10 it under the terms of the GNU General Public License as published by
9 the Free Software Foundation; either version 2 of the License, or 11 the Free Software Foundation; either version 2 of the License, or
10 (at your option) any later version. 12 (at your option) any later version.
11 13
12 This program is distributed in the hope that it will be useful, 14 This program is distributed in the hope that it will be useful,
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 15 but WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 16 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 17 GNU General Public License for more details.
16 18
17 You should have received a copy of the GNU General Public License 19 You should have received a copy of the GNU General Public License
18 along with this program; if not, write to the Free Software 20 along with gvpe; if not, write to the Free Software
19 Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 21 Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
20*/ 22*/
21 23
22#include "config.h" 24#include "config.h"
23 25
24#include <cstdio> 26#include <cstdio>
27#include <cstdlib>
25#include <cstring> 28#include <cstring>
26 29
27#include <errno.h> 30#include <errno.h>
28#include <signal.h> 31#include <signal.h>
29#include <sys/types.h> 32#include <sys/types.h>
… …
31#include <unistd.h> 34#include <unistd.h>
32#include <time.h> 35#include <time.h>
33 36
34#include "netcompat.h" 37#include "netcompat.h"
35 38
36#include "gettext.h"
37#include "pidfile.h" 39#include "pidfile.h"
38#include "dropin.h" 40#include "dropin.h"
39 41
40#include "global.h" 42#include "global.h"
41#include "conf.h" 43#include "conf.h"
… …
45int 47int
46write_pidfile (void) 48write_pidfile (void)
47{ 49{
48 int pid; 50 int pid;
49 51
50 pid = check_pid (pidfilename); 52 pid = check_pid (conf.pidfilename);
51 53
52 if (pid) 54 if (pid)
53 { 55 {
54 fprintf (stderr, _("A vped is already running with pid %d.\n"), pid); 56 fprintf (stderr, _("A gvpe daemon is already running with pid %d.\n"), pid);
55 return 1; 57 return 1;
56 } 58 }
57 59
58 /* if it's locked, write-protected, or whatever */ 60 /* if it's locked, write-protected, or whatever */
59 if (!write_pid (pidfilename)) 61 if (!write_pid (conf.pidfilename))
60 return 1; 62 return 1;
61 63
62 return 0; 64 return 0;
63} 65}
64 66
65int 67int
66kill_other (int signal) 68kill_other (int signal)
67{ 69{
68 int pid; 70 int pid;
69 71
70 pid = read_pid (pidfilename); 72 pid = read_pid (conf.pidfilename);
71 73
72 if (!pid) 74 if (!pid)
73 { 75 {
74 fprintf (stderr, _("No other vped is running.\n")); 76 fprintf (stderr, _("No other gvpe daemon is running.\n"));
75 return 1; 77 return 1;
76 } 78 }
77 79
78 errno = 0; /* No error, sometimes errno is only changed on error */ 80 errno = 0; /* No error, sometimes errno is only changed on error */
79 81
80 /* ESRCH is returned when no process with that pid is found */ 82 /* ESRCH is returned when no process with that pid is found */
81 if (kill (pid, signal) && errno == ESRCH) 83 if (kill (pid, signal) && errno == ESRCH)
82 { 84 {
83 fprintf (stderr, _("The vped is no longer running. ")); 85 fprintf (stderr, _("The gvpe daemon is no longer running. "));
84 86
85 fprintf (stderr, _("Removing stale lock file.\n")); 87 fprintf (stderr, _("Removing stale lock file.\n"));
86 remove_pid (pidfilename); 88 remove_pid (conf.pidfilename);
87 } 89 }
88 90
89 return 0; 91 return 0;
90} 92}
91 93
… …
111 return -1; 113 return -1;
112 } 114 }
113 115
114 /* Now UPDATE the pid in the pidfile, because we changed it... */ 116 /* Now UPDATE the pid in the pidfile, because we changed it... */
115 117
116 if (!write_pid (pidfilename)) 118 if (!write_pid (conf.pidfilename))
117 return -1; 119 return -1;
118 120
119 log_to (LOGTO_SYSLOG); 121 log_to (LOGTO_SYSLOG);
120 } 122 }
121 else 123 else
122 log_to (LOGTO_SYSLOG | LOGTO_STDERR); 124 log_to (LOGTO_SYSLOG | LOGTO_STDERR);
123 125
124 slog (L_INFO, _("vped %s (%s %s) starting"), VERSION, __DATE__, __TIME__); 126 slog (L_INFO, _("gvpe daemon %s (%s %s) starting"), VERSION, __DATE__, __TIME__);
125 127
126 return 0; 128 return 0;
127}
128
129void
130make_names (void)
131{
132 if (!pidfilename)
133 pidfilename = LOCALSTATEDIR "/run/vped.pid";
134
135 if (!confbase)
136 asprintf (&confbase, "%s/vpe", CONFDIR);
137} 129}
138 130
139void run_script (const run_script_cb &cb, bool wait) 131void run_script (const run_script_cb &cb, bool wait)
140{ 132{
141 int pid; 133 int pid;
… …
143 if ((pid = fork ()) == 0) 135 if ((pid = fork ()) == 0)
144 { 136 {
145 char *filename; 137 char *filename;
146 asprintf (&filename, "%s/%s", confbase, cb()); 138 asprintf (&filename, "%s/%s", confbase, cb());
147 execl (filename, filename, (char *) 0); 139 execl (filename, filename, (char *) 0);
148 exit (255); 140 exit (126);
149 } 141 }
150 else if (pid > 0) 142 else if (pid > 0)
151 { 143 {
152 if (wait) 144 if (wait)
153 { 145 {

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines