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

Comparing gvpe/src/vped.C (file contents):
Revision 1.14 by pcg, Sat Jan 17 14:50:40 2004 UTC vs.
Revision 1.22 by pcg, Thu Mar 3 16:54:34 2005 UTC

1/* 1/*
2 vped.C -- the main file for vped 2 vped.C -- the main file for gvpe
3 Copyright (C) 1998-2002 Ivo Timmermans <ivo@o2w.nl> 3 Copyright (C) 1998-2002 Ivo Timmermans <ivo@o2w.nl>
4 2000-2002 Guus Sliepen <guus@sliepen.eu.org> 4 2000-2002 Guus Sliepen <guus@sliepen.eu.org>
5 2003 Marc Lehmann <pcg@goof.com> 5 2003-2005 Marc Lehmann <gvpe@schmorp.de>
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>
25#include <cstring> 27#include <cstring>
28#include <cstdlib>
26#include <clocale> 29#include <locale.h>
27 30
28#include <errno.h> 31#include <errno.h>
29#include <fcntl.h> 32#include <fcntl.h>
30#include <getopt.h> 33#include <getopt.h>
31#include <signal.h> 34#include <signal.h>
… …
148*/ 151*/
149void cleanup_and_exit(int c) 152void cleanup_and_exit(int c)
150{ 153{
151 network.shutdown_all (); 154 network.shutdown_all ();
152 155
153 if (pidfilename) 156 if (conf.pidfilename)
154 remove_pid (pidfilename); 157 remove_pid (conf.pidfilename);
155 158
156 slog (L_INFO, _("terminating with exit code %d"), c); 159 slog (L_INFO, _("terminating with exit code %d"), c);
157 160
158 exit (c); 161 exit (c);
159} 162}
… …
245 if (do_mlock) 248 if (do_mlock)
246 if (mlockall (MCL_CURRENT | MCL_FUTURE)) 249 if (mlockall (MCL_CURRENT | MCL_FUTURE))
247 slog (L_ERR, _("system call `%s' failed: %s"), "mlockall", strerror (errno)); 250 slog (L_ERR, _("system call `%s' failed: %s"), "mlockall", strerror (errno));
248#endif 251#endif
249 252
250 make_names ();
251 conf.read_config (true); 253 conf.read_config (true);
252 254
253 set_loglevel (llevel != L_NONE ? llevel : conf.llevel); 255 set_loglevel (llevel != L_NONE ? llevel : conf.llevel);
254 256
255 RAND_load_file ("/dev/urandom", 1024); 257 RAND_load_file ("/dev/urandom", 1024);
256 258
257 if (!THISNODE) 259 if (!THISNODE)
258 { 260 {
259 slog (L_ERR, _("current node not set, or node '%s' not found in configfile, use the -n switch when starting vped."), 261 slog (L_ERR, _("current node not set, or node '%s' not found in configfile, specify the nodename when starting vped."),
260 thisnode ? thisnode : "<unset>"); 262 thisnode ? thisnode : "<unset>");
261 exit (1); 263 exit (EXIT_FAILURE);
262 } 264 }
263 265
264 if (detach (do_detach)) 266 if (detach (do_detach))
265 exit (0); 267 exit (EXIT_SUCCESS);
266 268
267 setup_signals (); 269 setup_signals ();
268 270
269 if (!network.setup ()) 271 if (!network.setup ())
270 { 272 {
271 iom.loop (); 273 io_manager::loop ();
272 cleanup_and_exit (1); 274 cleanup_and_exit (EXIT_FAILURE);
273 } 275 }
274 276
275 slog (L_ERR, _("unable to setup network, unrecoverable error, exiting.")); 277 slog (L_ERR, _("unable to setup network, unrecoverable error, exiting."));
276 cleanup_and_exit (1); 278 cleanup_and_exit (EXIT_FAILURE);
277} 279}
278 280

Diff Legend

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