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.13 by pcg, Thu Oct 16 21:57:54 2003 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>
29#include <locale.h>
26 30
27#include <errno.h> 31#include <errno.h>
28#include <fcntl.h> 32#include <fcntl.h>
29#include <getopt.h> 33#include <getopt.h>
30#include <signal.h> 34#include <signal.h>
… …
147*/ 151*/
148void cleanup_and_exit(int c) 152void cleanup_and_exit(int c)
149{ 153{
150 network.shutdown_all (); 154 network.shutdown_all ();
151 155
152 if (pidfilename) 156 if (conf.pidfilename)
153 remove_pid (pidfilename); 157 remove_pid (conf.pidfilename);
154 158
155 slog (L_INFO, _("terminating with exit code %d"), c); 159 slog (L_INFO, _("terminating with exit code %d"), c);
156 160
157 exit (c); 161 exit (c);
158} 162}
… …
244 if (do_mlock) 248 if (do_mlock)
245 if (mlockall (MCL_CURRENT | MCL_FUTURE)) 249 if (mlockall (MCL_CURRENT | MCL_FUTURE))
246 slog (L_ERR, _("system call `%s' failed: %s"), "mlockall", strerror (errno)); 250 slog (L_ERR, _("system call `%s' failed: %s"), "mlockall", strerror (errno));
247#endif 251#endif
248 252
249 make_names ();
250 conf.read_config (true); 253 conf.read_config (true);
251 254
252 set_loglevel (llevel != L_NONE ? llevel : conf.llevel); 255 set_loglevel (llevel != L_NONE ? llevel : conf.llevel);
253 256
254 RAND_load_file ("/dev/urandom", 1024); 257 RAND_load_file ("/dev/urandom", 1024);
255 258
256 if (!THISNODE) 259 if (!THISNODE)
257 { 260 {
258 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."),
259 thisnode ? thisnode : "<unset>"); 262 thisnode ? thisnode : "<unset>");
260 exit (1); 263 exit (EXIT_FAILURE);
261 } 264 }
262 265
263 if (detach (do_detach)) 266 if (detach (do_detach))
264 exit (0); 267 exit (EXIT_SUCCESS);
265 268
266 setup_signals (); 269 setup_signals ();
267 270
268 if (!network.setup ()) 271 if (!network.setup ())
269 { 272 {
270 iom.loop (); 273 io_manager::loop ();
271 cleanup_and_exit (1); 274 cleanup_and_exit (EXIT_FAILURE);
272 } 275 }
273 276
274 slog (L_ERR, _("unable to setup network, unrecoverable error, exiting.")); 277 slog (L_ERR, _("unable to setup network, unrecoverable error, exiting."));
275 cleanup_and_exit (1); 278 cleanup_and_exit (EXIT_FAILURE);
276} 279}
277 280

Diff Legend

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