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.10 by pcg, Thu Oct 16 02:28:36 2003 UTC vs.
Revision 1.22 by pcg, Thu Aug 7 17:54:27 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-2008 Marc Lehmann <gvpe@schmorp.de>
3 4
4 Some of these are taken from tinc, see the AUTHORS file. 5 Some of these are taken from tinc, see the AUTHORS file.
5 6
7 This file is part of GVPE.
8
6 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
7 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
8 the Free Software Foundation; either version 2 of the License, or 11 Free Software Foundation; either version 3 of the License, or (at your
9 (at your option) any later version. 12 option) any later version.
10 13
11 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
12 but WITHOUT ANY WARRANTY; without even the implied warranty of 15 WITHOUT ANY WARRANTY; without even the implied warranty of
13 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 16 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
14 GNU General Public License for more details. 17 Public License for more details.
15 18
16 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
17 along with this program; if not, write to the Free Software 20 with this program; if not, see <http://www.gnu.org/licenses/>.
18 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.
19*/ 32*/
20 33
21#include "config.h" 34#include "config.h"
22 35
23#include <cstdio> 36#include <cstdio>
37#include <cstdlib>
24#include <cstring> 38#include <cstring>
25 39
26#include <errno.h> 40#include <errno.h>
27#include <signal.h> 41#include <signal.h>
28#include <sys/types.h> 42#include <sys/types.h>
… …
44int 58int
45write_pidfile (void) 59write_pidfile (void)
46{ 60{
47 int pid; 61 int pid;
48 62
49 pid = check_pid (pidfilename); 63 pid = check_pid (conf.pidfilename);
50 64
51 if (pid) 65 if (pid)
52 { 66 {
53 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);
54 return 1; 68 return 1;
55 } 69 }
56 70
57 /* if it's locked, write-protected, or whatever */ 71 /* if it's locked, write-protected, or whatever */
58 if (!write_pid (pidfilename)) 72 if (!write_pid (conf.pidfilename))
59 return 1; 73 return 1;
60 74
61 return 0; 75 return 0;
62} 76}
63 77
64int 78int
65kill_other (int signal) 79kill_other (int signal)
66{ 80{
67 int pid; 81 int pid;
68 82
69 pid = read_pid (pidfilename); 83 pid = read_pid (conf.pidfilename);
70 84
71 if (!pid) 85 if (!pid)
72 { 86 {
73 fprintf (stderr, _("No other vped is running.\n")); 87 fprintf (stderr, _("No other gvpe daemon is running.\n"));
74 return 1; 88 return 1;
75 } 89 }
76 90
77 errno = 0; /* No error, sometimes errno is only changed on error */ 91 errno = 0; /* No error, sometimes errno is only changed on error */
78 92
79 /* ESRCH is returned when no process with that pid is found */ 93 /* ESRCH is returned when no process with that pid is found */
80 if (kill (pid, signal) && errno == ESRCH) 94 if (kill (pid, signal) && errno == ESRCH)
81 { 95 {
82 fprintf (stderr, _("The vped is no longer running. ")); 96 fprintf (stderr, _("The gvpe daemon is no longer running. "));
83 97
84 fprintf (stderr, _("Removing stale lock file.\n")); 98 fprintf (stderr, _("Removing stale lock file.\n"));
85 remove_pid (pidfilename); 99 remove_pid (conf.pidfilename);
86 } 100 }
87 101
88 return 0; 102 return 0;
89} 103}
90 104
… …
110 return -1; 124 return -1;
111 } 125 }
112 126
113 /* Now UPDATE the pid in the pidfile, because we changed it... */ 127 /* Now UPDATE the pid in the pidfile, because we changed it... */
114 128
115 if (!write_pid (pidfilename)) 129 if (!write_pid (conf.pidfilename))
116 return -1; 130 return -1;
117 131
118 log_to (LOGTO_SYSLOG); 132 log_to (LOGTO_SYSLOG);
119 } 133 }
120 else 134 else
121 log_to (LOGTO_SYSLOG | LOGTO_STDERR); 135 log_to (LOGTO_SYSLOG | LOGTO_STDERR);
122 136
123 slog (L_INFO, _("vped %s (%s %s) starting"), VERSION, __DATE__, __TIME__); 137 slog (L_INFO, _("gvpe daemon %s (%s %s) starting"), VERSION, __DATE__, __TIME__);
124 138
125 return 0; 139 return 0;
126} 140}
127 141
128void
129make_names (void)
130{
131 if (!pidfilename)
132 pidfilename = LOCALSTATEDIR "/run/vped.pid";
133
134 if (!confbase)
135 asprintf (&confbase, "%s/vpe", CONFDIR);
136}
137
138void run_script (const run_script_cb &cb, bool wait) 142bool run_script (const run_script_cb &cb, bool wait)
139{ 143{
140 int pid; 144 if (wait)
145 signal (SIGCHLD, SIG_DFL); // this is extremely ugly, but I did not feel like implementing a complete wait() event logic. It's easier to write this long comment to make your editor happy.
141 146
142 if ((pid = fork ()) == 0) 147 int pid = fork ();
148
149 if (pid == 0)
143 { 150 {
144 char *filename; 151 execl ("/bin/sh", "/bin/sh", "-c", cb (), (char *) 0);
145 asprintf (&filename, "%s/%s", confbase, cb()); 152 exit (EXIT_FAILURE);
146 execl (filename, filename, (char *) 0);
147 exit (255);
148 } 153 }
149 else if (pid > 0) 154 else if (pid > 0)
150 { 155 {
151 if (wait) 156 if (wait)
152 { 157 {
158 int status;
153 waitpid (pid, 0, 0); 159 int res = waitpid (pid, &status, 0);
154 /* TODO: check status */ 160
161 signal (SIGCHLD, SIG_IGN);
162
163 if (res < 0)
164 {
165 slog (L_WARN, _("waiting for an external command failed: %s."),
166 strerror (errno));
167 return false;
168 }
169 else if (!WIFEXITED (status) || WEXITSTATUS (status) != EXIT_SUCCESS)
170 {
171 slog (L_WARN, _("external command returned with exit status %d (%04x)."),
172 WEXITSTATUS (status), status);
173 return false;
174 }
155 } 175 }
156 } 176 }
177 else
178 {
179 slog (L_ERR, _("unable to fork, exiting: %s"), strerror (errno));
180 exit (EXIT_FAILURE);
181 }
182
183 return true;
157} 184}
158 185
159#if ENABLE_HTTP_PROXY 186#if ENABLE_HTTP_PROXY
160// works like strdup 187// works like strdup
161u8 * 188u8 *

Diff Legend

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