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.21 by pcg, Tue Apr 26 00:55:56 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-2005 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
7 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
8 the Free Software Foundation; either version 2 of the License, or 11 the Free Software Foundation; either version 2 of the License, or
9 (at your option) any later version. 12 (at your 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,
12 but WITHOUT ANY WARRANTY; without even the implied warranty of 15 but 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
14 GNU General Public License for more details. 17 GNU General 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
17 along with this program; if not, write to the Free Software 20 along with gvpe; if not, write to the Free Software
18 Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 21 Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
19*/ 22*/
20 23
21#include "config.h" 24#include "config.h"
22 25
23#include <cstdio> 26#include <cstdio>
27#include <cstdlib>
24#include <cstring> 28#include <cstring>
25 29
26#include <errno.h> 30#include <errno.h>
27#include <signal.h> 31#include <signal.h>
28#include <sys/types.h> 32#include <sys/types.h>
… …
44int 48int
45write_pidfile (void) 49write_pidfile (void)
46{ 50{
47 int pid; 51 int pid;
48 52
49 pid = check_pid (pidfilename); 53 pid = check_pid (conf.pidfilename);
50 54
51 if (pid) 55 if (pid)
52 { 56 {
53 fprintf (stderr, _("A vped is already running with pid %d.\n"), pid); 57 fprintf (stderr, _("A gvpe daemon is already running with pid %d.\n"), pid);
54 return 1; 58 return 1;
55 } 59 }
56 60
57 /* if it's locked, write-protected, or whatever */ 61 /* if it's locked, write-protected, or whatever */
58 if (!write_pid (pidfilename)) 62 if (!write_pid (conf.pidfilename))
59 return 1; 63 return 1;
60 64
61 return 0; 65 return 0;
62} 66}
63 67
64int 68int
65kill_other (int signal) 69kill_other (int signal)
66{ 70{
67 int pid; 71 int pid;
68 72
69 pid = read_pid (pidfilename); 73 pid = read_pid (conf.pidfilename);
70 74
71 if (!pid) 75 if (!pid)
72 { 76 {
73 fprintf (stderr, _("No other vped is running.\n")); 77 fprintf (stderr, _("No other gvpe daemon is running.\n"));
74 return 1; 78 return 1;
75 } 79 }
76 80
77 errno = 0; /* No error, sometimes errno is only changed on error */ 81 errno = 0; /* No error, sometimes errno is only changed on error */
78 82
79 /* ESRCH is returned when no process with that pid is found */ 83 /* ESRCH is returned when no process with that pid is found */
80 if (kill (pid, signal) && errno == ESRCH) 84 if (kill (pid, signal) && errno == ESRCH)
81 { 85 {
82 fprintf (stderr, _("The vped is no longer running. ")); 86 fprintf (stderr, _("The gvpe daemon is no longer running. "));
83 87
84 fprintf (stderr, _("Removing stale lock file.\n")); 88 fprintf (stderr, _("Removing stale lock file.\n"));
85 remove_pid (pidfilename); 89 remove_pid (conf.pidfilename);
86 } 90 }
87 91
88 return 0; 92 return 0;
89} 93}
90 94
… …
110 return -1; 114 return -1;
111 } 115 }
112 116
113 /* Now UPDATE the pid in the pidfile, because we changed it... */ 117 /* Now UPDATE the pid in the pidfile, because we changed it... */
114 118
115 if (!write_pid (pidfilename)) 119 if (!write_pid (conf.pidfilename))
116 return -1; 120 return -1;
117 121
118 log_to (LOGTO_SYSLOG); 122 log_to (LOGTO_SYSLOG);
119 } 123 }
120 else 124 else
121 log_to (LOGTO_SYSLOG | LOGTO_STDERR); 125 log_to (LOGTO_SYSLOG | LOGTO_STDERR);
122 126
123 slog (L_INFO, _("vped %s (%s %s) starting"), VERSION, __DATE__, __TIME__); 127 slog (L_INFO, _("gvpe daemon %s (%s %s) starting"), VERSION, __DATE__, __TIME__);
124 128
125 return 0; 129 return 0;
126} 130}
127 131
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) 132bool run_script (const run_script_cb &cb, bool wait)
139{ 133{
140 int pid; 134 if (wait)
135 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 136
142 if ((pid = fork ()) == 0) 137 int pid = fork ();
138
139 if (pid == 0)
143 { 140 {
144 char *filename; 141 execl ("/bin/sh", "/bin/sh", "-c", cb (), (char *) 0);
145 asprintf (&filename, "%s/%s", confbase, cb()); 142 exit (EXIT_FAILURE);
146 execl (filename, filename, (char *) 0);
147 exit (255);
148 } 143 }
149 else if (pid > 0) 144 else if (pid > 0)
150 { 145 {
151 if (wait) 146 if (wait)
152 { 147 {
148 int status;
153 waitpid (pid, 0, 0); 149 int res = waitpid (pid, &status, 0);
154 /* TODO: check status */ 150
151 signal (SIGCHLD, SIG_IGN);
152
153 if (res < 0)
154 {
155 slog (L_WARN, _("waiting for an external command failed: %s."),
156 strerror (errno));
157 return false;
158 }
159 else if (!WIFEXITED (status) || WEXITSTATUS (status) != EXIT_SUCCESS)
160 {
161 slog (L_WARN, _("external command returned with exit status %d (%04x)."),
162 WEXITSTATUS (status), status);
163 return false;
164 }
155 } 165 }
156 } 166 }
167 else
168 {
169 slog (L_ERR, _("unable to fork, exiting: %s"), strerror (errno));
170 exit (EXIT_FAILURE);
171 }
172
173 return true;
157} 174}
158 175
159#if ENABLE_HTTP_PROXY 176#if ENABLE_HTTP_PROXY
160// works like strdup 177// works like strdup
161u8 * 178u8 *

Diff Legend

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