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.14 by pcg, Mon May 10 20:13:10 2004 UTC vs.
Revision 1.23 by pcg, Thu Aug 7 19:07:03 2008 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-2008 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 it
8 it under the terms of the GNU General Public License as published by 10 under the terms of the GNU General Public License as published by the
9 the Free Software Foundation; either version 2 of the License, or 11 Free Software Foundation; either version 3 of the License, or (at your
10 (at your option) any later version. 12 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, but
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 15 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 GNU General
15 GNU General Public License for more details. 17 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 along
18 along with this program; if not, write to the Free Software 20 with this program; if not, see <http://www.gnu.org/licenses/>.
19 Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 21
22 Additional permission under GNU GPL version 3 section 7
23
24 If you modify this Program, or any covered work, by linking or
25 combining it with the OpenSSL project's OpenSSL library (or a modified
26 version of that library), containing parts covered by the terms of the
27 OpenSSL or SSLeay licenses, the licensors of this Program grant you
28 additional permission to convey the resulting work. Corresponding
29 Source for a non-source form of such a combination shall include the
30 source code for the parts of OpenSSL used as well as that of the
31 covered work.
20*/ 32*/
21 33
22#include "config.h" 34#include "config.h"
23 35
24#include <cstdio> 36#include <cstdio>
50 62
51 pid = check_pid (conf.pidfilename); 63 pid = check_pid (conf.pidfilename);
52 64
53 if (pid) 65 if (pid)
54 { 66 {
55 fprintf (stderr, _("A vped is already running with pid %d.\n"), pid); 67 fprintf (stderr, _("A gvpe daemon is already running with pid %d.\n"), pid);
56 return 1; 68 return 1;
57 } 69 }
58 70
59 /* if it's locked, write-protected, or whatever */ 71 /* if it's locked, write-protected, or whatever */
60 if (!write_pid (conf.pidfilename)) 72 if (!write_pid (conf.pidfilename))
70 82
71 pid = read_pid (conf.pidfilename); 83 pid = read_pid (conf.pidfilename);
72 84
73 if (!pid) 85 if (!pid)
74 { 86 {
75 fprintf (stderr, _("No other vped is running.\n")); 87 fprintf (stderr, _("No other gvpe daemon is running.\n"));
76 return 1; 88 return 1;
77 } 89 }
78 90
79 errno = 0; /* No error, sometimes errno is only changed on error */ 91 errno = 0; /* No error, sometimes errno is only changed on error */
80 92
81 /* ESRCH is returned when no process with that pid is found */ 93 /* ESRCH is returned when no process with that pid is found */
82 if (kill (pid, signal) && errno == ESRCH) 94 if (kill (pid, signal) && errno == ESRCH)
83 { 95 {
84 fprintf (stderr, _("The vped is no longer running. ")); 96 fprintf (stderr, _("The gvpe daemon is no longer running. "));
85 97
86 fprintf (stderr, _("Removing stale lock file.\n")); 98 fprintf (stderr, _("Removing stale lock file.\n"));
87 remove_pid (conf.pidfilename); 99 remove_pid (conf.pidfilename);
88 } 100 }
89 101
120 log_to (LOGTO_SYSLOG); 132 log_to (LOGTO_SYSLOG);
121 } 133 }
122 else 134 else
123 log_to (LOGTO_SYSLOG | LOGTO_STDERR); 135 log_to (LOGTO_SYSLOG | LOGTO_STDERR);
124 136
125 slog (L_INFO, _("vped %s (%s %s) starting"), VERSION, __DATE__, __TIME__); 137 slog (L_INFO, _("gvpe daemon %s (%s %s) starting"), VERSION, __DATE__, __TIME__);
126 138
127 return 0; 139 return 0;
128} 140}
129 141
142pid_t
130void run_script (const run_script_cb &cb, bool wait) 143run_script (const run_script_cb &cb, bool wait)
131{ 144{
132 int pid; 145 sigset_t oldset;
133 146
134 if ((pid = fork ()) == 0) 147 if (wait)
148 {
149 sigset_t sigchld;
150 sigemptyset (&sigchld);
151 sigaddset (&sigchld, SIGCHLD);
152 sigprocmask (SIG_BLOCK, &sigchld, &oldset);
135 { 153 }
136 char *filename; 154
137 asprintf (&filename, "%s/%s", confbase, cb()); 155 pid_t pid = fork ();
138 execl (filename, filename, (char *) 0); 156
139 exit (126); 157 if (pid == 0)
158 {
159 sigprocmask (SIG_SETMASK, &oldset, 0);
160
161 execl ("/bin/sh", "/bin/sh", "-c", cb (), (char *) 0);
162 exit (EXIT_FAILURE);
140 } 163 }
141 else if (pid > 0) 164 else if (pid > 0)
142 { 165 {
143 if (wait) 166 if (wait)
144 { 167 {
168 int status;
145 waitpid (pid, 0, 0); 169 int res = waitpid (pid, &status, 0);
146 /* TODO: check status */ 170
171 sigprocmask (SIG_SETMASK, &oldset, 0);
172
173 if (res < 0)
174 {
175 slog (L_WARN, _("waiting for an external command failed: %s."),
176 strerror (errno));
177 return 0;
178 }
179 else if (!WIFEXITED (status) || WEXITSTATUS (status) != EXIT_SUCCESS)
180 {
181 slog (L_WARN, _("external command returned with exit status %d (%04x)."),
182 WEXITSTATUS (status), status);
183 return 0;
184 }
147 } 185 }
148 } 186 }
187 else
188 {
189 slog (L_ERR, _("unable to fork, exiting: %s"), strerror (errno));
190 exit (EXIT_FAILURE);
191 }
192
193 return pid;
149} 194}
150 195
151#if ENABLE_HTTP_PROXY 196#if ENABLE_HTTP_PROXY
152// works like strdup 197// works like strdup
153u8 * 198u8 *

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines