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.2 by pcg, Thu Mar 6 18:43:07 2003 UTC vs.
Revision 1.12 by pcg, Thu Oct 16 14:12:00 2003 UTC

1/* 1/*
2 vped.C -- the main file for vped 2 vped.C -- the main file for vped
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 Lehmannn <pcg@goof.com> 5 2003 Marc Lehmann <pcg@goof.com>
6 6
7 This program is free software; you can redistribute it and/or modify 7 This program is free software; you can redistribute it and/or modify
8 it under the terms of the GNU General Public License as published by 8 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 9 the Free Software Foundation; either version 2 of the License, or
10 (at your option) any later version. 10 (at your option) any later version.
… …
31#include <sys/types.h> 31#include <sys/types.h>
32#include <unistd.h> 32#include <unistd.h>
33#include <signal.h> 33#include <signal.h>
34#include <termios.h> 34#include <termios.h>
35 35
36#if HAVE_SYS_MMAN_H
36#include <sys/mman.h> 37# include <sys/mman.h>
38#endif
37 39
40#include <openssl/err.h>
38#include <openssl/rand.h> 41#include <openssl/rand.h>
39 42
40#include "gettext.h" 43#include "gettext.h"
41#include "pidfile.h" 44#include "pidfile.h"
42 45
43#include "conf.h" 46#include "conf.h"
44#include "slog.h" 47#include "slog.h"
45#include "util.h" 48#include "util.h"
46#include "protocol.h" 49#include "vpn.h"
47 50#include "iom.h"
48vpn network;
49 51
50static loglevel llevel = L_NONE; 52static loglevel llevel = L_NONE;
51 53
52/* If nonzero, display usage information and exit. */ 54/* If nonzero, display usage information and exit. */
53static int show_help; 55static int show_help;
54 56
55/* If nonzero, print the version on standard output and exit. */ 57/* If nonzero, print the version on standard output and exit. */
56static int show_version; 58static int show_version;
57 59
58#if HAVE_MLOCKALL
59/* If nonzero, disable swapping for this process. */ 60/* If nonzero, disable swapping for this process. */
60static int do_mlock = 0; 61static int do_mlock = 0;
61#endif
62 62
63/* If zero, don't detach from the terminal. */ 63/* If zero, don't detach from the terminal. */
64static int do_detach = 1; 64static int do_detach = 1;
65 65
66static struct option const long_options[] = 66static struct option const long_options[] =
… …
68 {"config", required_argument, NULL, 'c'}, 68 {"config", required_argument, NULL, 'c'},
69 {"help", no_argument, &show_help, 1}, 69 {"help", no_argument, &show_help, 1},
70 {"version", no_argument, &show_version, 1}, 70 {"version", no_argument, &show_version, 1},
71 {"no-detach", no_argument, &do_detach, 0}, 71 {"no-detach", no_argument, &do_detach, 0},
72 {"log-level", required_argument, NULL, 'l'}, 72 {"log-level", required_argument, NULL, 'l'},
73#if HAVE_MLOCKALL
74 {"mlock", no_argument, &do_mlock, 1}, 73 {"mlock", no_argument, &do_mlock, 1},
75#endif
76 {NULL, 0, NULL, 0} 74 {NULL, 0, NULL, 0}
77 }; 75 };
78 76
79static void 77static void
80usage (int status) 78usage (int status)
… …
120 118
121 case 'D': /* no detach */ 119 case 'D': /* no detach */
122 do_detach = 0; 120 do_detach = 0;
123 break; 121 break;
124 122
125#if HAVE_MLOCKALL
126 case 'L': /* lock into memory */ 123 case 'L': /* lock into memory */
127 do_mlock = 1; 124 do_mlock = 1;
128 break; 125 break;
129#endif
130 126
131 case 'l': /* inc debug level */ 127 case 'l': /* inc debug level */
132 { 128 {
133 llevel = string_to_loglevel (optarg); 129 llevel = string_to_loglevel (optarg);
134 130
… …
166*/ 162*/
167RETSIGTYPE 163RETSIGTYPE
168sigterm_handler (int a) 164sigterm_handler (int a)
169{ 165{
170 network.events |= vpn::EVENT_SHUTDOWN; 166 network.events |= vpn::EVENT_SHUTDOWN;
167 network.event.start (0);
171} 168}
172 169
173RETSIGTYPE 170RETSIGTYPE
174sighup_handler (int a) 171sighup_handler (int a)
175{ 172{
176 network.events |= vpn::EVENT_RECONNECT; 173 network.events |= vpn::EVENT_RECONNECT;
174 network.event.start (0);
177} 175}
178 176
179RETSIGTYPE 177RETSIGTYPE
180sigusr1_handler (int a) 178sigusr1_handler (int a)
181{ 179{
180 network.dump_status ();
182} 181}
183 182
184RETSIGTYPE 183RETSIGTYPE
185sigusr2_handler (int a) 184sigusr2_handler (int a)
186{ 185{
… …
196 195
197 act.sa_handler = sighup_handler; sigaction (SIGHUP , &act, NULL); 196 act.sa_handler = sighup_handler; sigaction (SIGHUP , &act, NULL);
198 act.sa_handler = sigusr1_handler; sigaction (SIGUSR1, &act, NULL); 197 act.sa_handler = sigusr1_handler; sigaction (SIGUSR1, &act, NULL);
199 act.sa_handler = sigusr2_handler; sigaction (SIGUSR2, &act, NULL); 198 act.sa_handler = sigusr2_handler; sigaction (SIGUSR2, &act, NULL);
200 act.sa_handler = SIG_IGN; sigaction (SIGCHLD, &act, NULL); 199 act.sa_handler = SIG_IGN; sigaction (SIGCHLD, &act, NULL);
200 act.sa_handler = SIG_IGN; sigaction (SIGPIPE, &act, NULL);
201 act.sa_flags = SA_RESETHAND; 201 act.sa_flags = SA_RESETHAND;
202 act.sa_handler = sigterm_handler; sigaction (SIGINT , &act, NULL); 202 act.sa_handler = sigterm_handler; sigaction (SIGINT , &act, NULL);
203 act.sa_handler = sigterm_handler; sigaction (SIGTERM, &act, NULL); 203 act.sa_handler = sigterm_handler; sigaction (SIGTERM, &act, NULL);
204} 204}
205 205
206int 206int
207main (int argc, char **argv, char **envp) 207main (int argc, char **argv, char **envp)
208{ 208{
209 ERR_load_crypto_strings (); // we have the RAM
210
209 set_loglevel (L_INFO); 211 set_loglevel (L_INFO);
210 set_identity (argv[0]); 212 set_identity (argv[0]);
211 log_to (LOGTO_SYSLOG | LOGTO_STDERR); 213 log_to (LOGTO_SYSLOG | LOGTO_STDERR);
212 214
213 setlocale (LC_ALL, ""); 215 setlocale (LC_ALL, "");
… …
216 218
217 parse_options (argc, argv, envp); 219 parse_options (argc, argv, envp);
218 220
219 if (show_version) 221 if (show_version)
220 { 222 {
221 printf (_("%s version %s (built %s %s, protocol %d:%d)\n"), get_identity (), 223 printf (_("%s version %s (built %s %s, protocol %d.%d)\n"), get_identity (),
222 VERSION, __DATE__, __TIME__, PROTOCOL_MAJOR, PROTOCOL_MINOR); 224 VERSION, __DATE__, __TIME__, PROTOCOL_MAJOR, PROTOCOL_MINOR);
223 printf (_ 225 printf (_
224 ("Copyright (C) 2003 Marc Lehmann <vpe@plan9.de> and others.\n" 226 ("Copyright (C) 2003 Marc Lehmann <vpe@plan9.de> and others.\n"
225 "See the AUTHORS file for a complete list.\n\n" 227 "See the AUTHORS file for a complete list.\n\n"
226 "tinc comes with ABSOLUTELY NO WARRANTY. This is free software,\n" 228 "tinc comes with ABSOLUTELY NO WARRANTY. This is free software,\n"
… …
235 237
236 log_to (LOGTO_SYSLOG | LOGTO_STDERR); 238 log_to (LOGTO_SYSLOG | LOGTO_STDERR);
237 239
238 /* Lock all pages into memory if requested */ 240 /* Lock all pages into memory if requested */
239 241
240#if HAVE_MLOCKALL 242#if HAVE_MLOCKALL && HAVE_SYS_MMAN_H && _POSIX_MEMLOCK
241 if (do_mlock) 243 if (do_mlock)
242 if (mlockall (MCL_CURRENT | MCL_FUTURE)) 244 if (mlockall (MCL_CURRENT | MCL_FUTURE))
243 slog (L_ERR, _("system call `%s' failed: %s"), "mlockall", strerror (errno)); 245 slog (L_ERR, _("system call `%s' failed: %s"), "mlockall", strerror (errno));
244#endif 246#endif
245 247
… …
248 250
249 set_loglevel (llevel != L_NONE ? llevel : conf.llevel); 251 set_loglevel (llevel != L_NONE ? llevel : conf.llevel);
250 252
251 RAND_load_file ("/dev/urandom", 1024); 253 RAND_load_file ("/dev/urandom", 1024);
252 254
253 if (!thisnode) 255 if (!THISNODE)
254 { 256 {
255 slog (L_ERR, _("current node not set, or node '%s' not found in configfile, use the -n switch when starting vped."), 257 slog (L_ERR, _("current node not set, or node '%s' not found in configfile, use the -n switch when starting vped."),
256 thisnode ? thisnode : "<unset>"); 258 thisnode ? thisnode : "<unset>");
257 exit (1); 259 exit (1);
258 } 260 }
… …
262 264
263 setup_signals (); 265 setup_signals ();
264 266
265 if (!network.setup ()) 267 if (!network.setup ())
266 { 268 {
267 network.main_loop (); 269 iom.loop ();
268 cleanup_and_exit (1); 270 cleanup_and_exit (1);
269 } 271 }
270 272
271 slog (L_ERR, _("unable to setup network, unrecoverable error, exiting.")); 273 slog (L_ERR, _("unable to setup network, unrecoverable error, exiting."));
272 cleanup_and_exit (1); 274 cleanup_and_exit (1);

Diff Legend

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