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.17 by pcg, Fri Mar 18 01:53:05 2005 UTC vs.
Revision 1.27 by root, Wed Jul 17 16:40:57 2013 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-2005 Marc Lehmann <gvpe@schmorp.de> 3 Copyright (C) 2003-2011 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. 7 This file is part of GVPE.
8 8
9 GVPE is free software; you can redistribute it and/or modify 9 GVPE is free software; you can redistribute it and/or modify it
10 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
11 the Free Software Foundation; either version 2 of the License, or 11 Free Software Foundation; either version 3 of the License, or (at your
12 (at your option) any later version. 12 option) any later version.
13 13
14 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
15 but WITHOUT ANY WARRANTY; without even the implied warranty of 15 WITHOUT ANY WARRANTY; without even the implied warranty of
16 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 16 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
17 GNU General Public License for more details. 17 Public License for more details.
18 18
19 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
20 along with gvpe; if not, write to the Free Software 20 with this program; if not, see <http://www.gnu.org/licenses/>.
21 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.
22*/ 32*/
23 33
24#include "config.h" 34#include "config.h"
25 35
26#include <cstdio> 36#include <cstdio>
27#include <cstdlib> 37#include <cstdlib>
28#include <cstring> 38#include <cstring>
39
40#include <queue>
29 41
30#include <errno.h> 42#include <errno.h>
31#include <signal.h> 43#include <signal.h>
32#include <sys/types.h> 44#include <sys/types.h>
33#include <sys/wait.h> 45#include <sys/wait.h>
34#include <unistd.h> 46#include <unistd.h>
35#include <time.h> 47#include <time.h>
36 48
49#if ENABLE_PTHREADS
50# include <pthread.h>
51#endif
52
53#include <openssl/rand.h>
54
37#include "netcompat.h" 55#include "netcompat.h"
38 56
57#include "gettext.h"
39#include "pidfile.h" 58#include "pidfile.h"
40#include "dropin.h" 59#include "dropin.h"
41 60
42#include "global.h" 61#include "global.h"
43#include "conf.h" 62#include "conf.h"
… …
121 log_to (LOGTO_SYSLOG); 140 log_to (LOGTO_SYSLOG);
122 } 141 }
123 else 142 else
124 log_to (LOGTO_SYSLOG | LOGTO_STDERR); 143 log_to (LOGTO_SYSLOG | LOGTO_STDERR);
125 144
126 slog (L_INFO, _("gvpe daemon %s (%s %s) starting"), VERSION, __DATE__, __TIME__); 145 slog (L_INFO, _("gvpe daemon %s (%s %s) starting up."), VERSION, __DATE__, __TIME__);
127 146
128 return 0; 147 return 0;
129} 148}
130 149
150/*****************************************************************************/
151
152pid_t
131void run_script (const run_script_cb &cb, bool wait) 153run_script (const run_script_cb &cb, bool wait)
132{ 154{
133 int pid; 155 sigset_t oldset;
134 156
135 if ((pid = fork ()) == 0) 157 if (wait)
158 {
159 sigset_t sigchld;
160 sigemptyset (&sigchld);
161 sigaddset (&sigchld, SIGCHLD);
162 sigprocmask (SIG_BLOCK, &sigchld, &oldset);
136 { 163 }
137 char *filename; 164
138 asprintf (&filename, "%s/%s", confbase, cb()); 165 pid_t pid = fork ();
139 execl (filename, filename, (char *) 0); 166
140 exit (126); 167 if (pid == 0)
168 {
169 sigprocmask (SIG_SETMASK, &oldset, 0);
170
171 execl ("/bin/sh", "/bin/sh", "-c", cb (), (char *) 0);
172 exit (EXIT_FAILURE);
141 } 173 }
142 else if (pid > 0) 174 else if (pid > 0)
143 { 175 {
144 if (wait) 176 if (wait)
145 { 177 {
178 int status;
146 waitpid (pid, 0, 0); 179 int res = waitpid (pid, &status, 0);
147 /* TODO: check status */ 180
181 sigprocmask (SIG_SETMASK, &oldset, 0);
182
183 if (res < 0)
184 {
185 slog (L_WARN, _("waiting for an external command failed: %s."),
186 strerror (errno));
187 return 0;
188 }
189 else if (!WIFEXITED (status) || WEXITSTATUS (status) != EXIT_SUCCESS)
190 {
191 slog (L_WARN, _("external command returned with exit status %d (%04x)."),
192 WEXITSTATUS (status), status);
193 return 0;
194 }
148 } 195 }
149 } 196 }
197 else
198 {
199 slog (L_ERR, _("unable to fork, exiting: %s"), strerror (errno));
200 exit (EXIT_FAILURE);
201 }
202
203 return pid;
150} 204}
205
206/*****************************************************************************/
207
208#if 0 /* not yet used */
209
210#if ENABLE_PTHREADS
211struct async_cb
212{
213 callback<void ()> work_cb;
214 callback<void ()> done_cb;
215};
216
217static ev::async async_done_w;
218static std::queue< callback<void ()> > async_q;
219
220static callback<void ()> work_cb;
221
222static void *
223async_exec (void *)
224{
225 work_cb ();
226 async_done_w.send ();
227
228 return 0;
229}
230
231static void
232async_q_next ()
233{
234 work_cb = async_q.front (); async_q.pop ();
235
236 sigset_t fullsigset, oldsigset;
237 pthread_attr_t attr;
238 pthread_t tid;
239
240 pthread_attr_init (&attr);
241 pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED);
242 //pthread_attr_setstacksize (&attr, PTHREAD_STACK_MIN < X_STACKSIZE ? X_STACKSIZE : PTHREAD_STACK_MIN);
243 sigfillset (&fullsigset);
244 pthread_sigmask (SIG_SETMASK, &fullsigset, &oldsigset);
245
246 if (pthread_create (&tid, &attr, async_exec, 0))
247 async_exec (0);
248
249 pthread_sigmask (SIG_SETMASK, &oldsigset, 0);
250 pthread_attr_destroy (&attr);
251}
252
253namespace {
254 void
255 async_done (ev::async &w, int revents)
256 {
257 callback<void ()> done_cb = async_q.front (); async_q.pop ();
258
259 if (async_q.empty ())
260 async_done_w.stop ();
261 else
262 async_q_next ();
263
264 done_cb ();
265 }
266};
267
268void
269async (callback<void ()> work_cb, callback<void ()> done_cb)
270{
271 bool was_empty = async_q.empty ();
272
273 async_q.push (work_cb);
274 async_q.push (done_cb);
275
276 if (was_empty)
277 {
278 async_done_w.set<async_done> ();
279 async_done_w.start ();
280 async_q_next ();
281 }
282}
283
284#else
285
286void
287async (callback<void ()> work_cb, callback<void ()> done_cb)
288{
289 work_cb ();
290 done_cb ();
291}
292
293#endif
294
295#endif
296
297/*****************************************************************************/
298
299void hexdump (const char *header, void *data, int len)
300{
301 u8 *p = (u8 *)data;
302
303 printf ("%s:", header);
304
305 while (len--)
306 printf (" %02x", *p++);
307
308 printf ("\n");
309}
310
311/*****************************************************************************/
151 312
152#if ENABLE_HTTP_PROXY 313#if ENABLE_HTTP_PROXY
153// works like strdup 314// works like strdup
154u8 * 315u8 *
155base64_encode (const u8 *data, unsigned int len) 316base64_encode (const u8 *data, unsigned int len)
… …
220 p[4] = 0xff; 381 p[4] = 0xff;
221 p[5] = 0xff; 382 p[5] = 0xff;
222 } 383 }
223} 384}
224 385
386/*****************************************************************************/
387
388void rand_fill (void *data, int len)
389{
390 int l = RAND_bytes ((unsigned char *)data, len);
391
392 if (l > 0)
393 return;
394 else if (l == 0)
395 slog (L_WARN, _("Not enough random entropy to generate secure keys. Using weaker pseudo-random session keys."));
396 else
397 fatal (_("RAND_bytes failed, aborting."));
398}
399

Diff Legend

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