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

Comparing gvpe/src/gvpe.C (file contents):
Revision 1.12 by pcg, Sat Dec 1 23:35:31 2007 UTC vs.
Revision 1.24 by root, Sat Jul 13 04:10:29 2013 UTC

1/* 1/*
2 gvpe.C -- the main file for gvpe 2 gvpe.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-2005 Marc Lehmann <gvpe@schmorp.de> 5 2003-2013 Marc Lehmann <gvpe@schmorp.de>
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. 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 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>
… …
30#include <errno.h> 40#include <errno.h>
31#include <fcntl.h> 41#include <fcntl.h>
32#include <getopt.h> 42#include <getopt.h>
33#include <signal.h> 43#include <signal.h>
34#include <sys/types.h> 44#include <sys/types.h>
45#include <sys/stat.h>
35#include <unistd.h> 46#include <unistd.h>
36#include <signal.h> 47#include <signal.h>
37#include <termios.h> 48#include <termios.h>
38 49
39#if HAVE_SYS_MMAN_H 50#if HAVE_SYS_MMAN_H
… …
65 76
66/* If zero, don't detach from the terminal. */ 77/* If zero, don't detach from the terminal. */
67static int do_detach = 1; 78static int do_detach = 1;
68 79
69static struct option const long_options[] = 80static struct option const long_options[] =
70 { 81{
71 {"config", required_argument, NULL, 'c'}, 82 {"config", required_argument, NULL, 'c'},
72 {"help", no_argument, &show_help, 1}, 83 {"help", no_argument, &show_help, 1},
73 {"version", no_argument, &show_version, 1}, 84 {"version", no_argument, &show_version, 1},
74 {"no-detach", no_argument, &do_detach, 0}, 85 {"no-detach", no_argument, &do_detach, 0},
75 {"log-level", required_argument, NULL, 'l'}, 86 {"log-level", required_argument, NULL, 'l'},
76 {"mlock", no_argument, &do_mlock, 1}, 87 {"mlock", no_argument, &do_mlock, 1},
77 {NULL, 0, NULL, 0} 88 {NULL, 0, NULL, 0}
78 }; 89};
79 90
80static void 91static void
81usage (int status) 92usage (int status)
82{ 93{
83 if (status != 0) 94 if (status != 0)
… …
87 printf (_("Usage: %s [option]... NODENAME\n\n"), get_identity ()); 98 printf (_("Usage: %s [option]... NODENAME\n\n"), get_identity ());
88 printf (_ 99 printf (_
89 (" -c, --config=DIR Read configuration options from DIR.\n" 100 (" -c, --config=DIR Read configuration options from DIR.\n"
90 " -D, --no-detach Don't fork and detach.\n" 101 " -D, --no-detach Don't fork and detach.\n"
91 " -l, --log-level=LEVEL Set logging level (info, notice, warn are common).\n" 102 " -l, --log-level=LEVEL Set logging level (info, notice, warn are common).\n"
92 " -L, --mlock Lock tinc into main memory.\n" 103 " -L, --mlock Lock gvpe into main memory.\n"
93 " --help Display this help and exit.\n" 104 " --help Display this help and exit.\n"
94 " --version Output version information and exit.\n\n")); 105 " --version Output version information and exit.\n\n"));
95 printf (_("Report bugs to <gvpe@schmorp.de>.\n")); 106 printf (_("Report bugs to <gvpe@schmorp.de>.\n"));
96 } 107 }
97 108
98 exit (status); 109 exit (status);
99} 110}
100 111
101void 112static void
102parse_options (int argc, char **argv, char **envp) 113parse_options (int argc, char **argv, char **envp)
103{ 114{
104 int r; 115 int r;
105 int option_index = 0; 116 int option_index = 0;
106 117
… …
139 break; 150 break;
140 } 151 }
141 } 152 }
142} 153}
143 154
144/*
145 Close network connections, and terminate neatly 155// close network connections, and terminate neatly
146*/ 156static void
147void cleanup_and_exit(int c) 157cleanup_and_exit (int c)
148{ 158{
149 network.shutdown_all (); 159 network.shutdown_all ();
150 160
151 if (conf.pidfilename) 161 if (conf.pidfilename)
152 remove_pid (conf.pidfilename); 162 remove_pid (conf.pidfilename);
… …
154 slog (L_INFO, _("terminating with exit code %d"), c); 164 slog (L_INFO, _("terminating with exit code %d"), c);
155 165
156 exit (c); 166 exit (c);
157} 167}
158 168
159/*
160 Signal handlers. 169// signal handlers
161*/ 170static RETSIGTYPE
162RETSIGTYPE
163sigterm_handler (int a) 171sigterm_handler (int a)
164{ 172{
165 network.events |= vpn::EVENT_SHUTDOWN; 173 network.events |= vpn::EVENT_SHUTDOWN;
166 network.event.start (); 174 network.event.start ();
167} 175}
168 176
169RETSIGTYPE 177static RETSIGTYPE
170sighup_handler (int a) 178sighup_handler (int a)
171{ 179{
172 network.events |= vpn::EVENT_RECONNECT; 180 network.events |= vpn::EVENT_RECONNECT;
173 network.event.start (); 181 network.event.start ();
174} 182}
175 183
176RETSIGTYPE 184static RETSIGTYPE
177sigusr1_handler (int a) 185sigusr1_handler (int a)
178{ 186{
179 network.dump_status (); 187 network.dump_status ();
180} 188}
181 189
182RETSIGTYPE 190static RETSIGTYPE
183sigusr2_handler (int a) 191sigusr2_handler (int a)
184{ 192{
185} 193}
186 194
187void 195static void
188setup_signals (void) 196setup_signals (void)
189{ 197{
190 struct sigaction act; 198 struct sigaction act;
191 199
192 sigfillset (&act.sa_mask); 200 sigfillset (&act.sa_mask);
193 act.sa_flags = 0; 201 act.sa_flags = 0;
194 202
195 act.sa_handler = sighup_handler; sigaction (SIGHUP , &act, NULL); 203 act.sa_handler = sighup_handler; sigaction (SIGHUP , &act, NULL);
196 act.sa_handler = sigusr1_handler; sigaction (SIGUSR1, &act, NULL); 204 act.sa_handler = sigusr1_handler; sigaction (SIGUSR1, &act, NULL);
197 act.sa_handler = sigusr2_handler; sigaction (SIGUSR2, &act, NULL); 205 act.sa_handler = sigusr2_handler; sigaction (SIGUSR2, &act, NULL);
198 act.sa_handler = SIG_IGN; sigaction (SIGCHLD, &act, NULL);
199 act.sa_handler = SIG_IGN; sigaction (SIGPIPE, &act, NULL); 206 act.sa_handler = SIG_IGN; sigaction (SIGPIPE, &act, NULL);
200 act.sa_flags = SA_RESETHAND; 207 act.sa_flags = SA_RESETHAND;
201 act.sa_handler = sigterm_handler; sigaction (SIGINT , &act, NULL); 208 act.sa_handler = sigterm_handler; sigaction (SIGINT , &act, NULL);
202 act.sa_handler = sigterm_handler; sigaction (SIGTERM, &act, NULL); 209 act.sa_handler = sigterm_handler; sigaction (SIGTERM, &act, NULL);
203} 210}
204 211
212static int rand_fd;
213
214// antique C++ requires external linkage :/
215void
216reseed_rng (ev::timer &w, int revents)
217{
218 char buf [SEED_SIZE];
219 int n = read (rand_fd, buf, sizeof (buf));
220
221 if (n > 0)
222 RAND_seed (buf, n);
223}
224
225static void
226setup_rng (void)
227{
228 if (!*conf.seed_dev)
229 return;
230
231#ifndef O_BINARY
232# define O_BINARY 0
233#endif
234#ifndef O_NONBLOCK
235# define O_NONBLOCK 0
236#endif
237
238 rand_fd = open (conf.seed_dev, O_RDONLY | O_NONBLOCK | O_BINARY);
239
240 if (rand_fd < 0)
241 {
242 slog (L_ERR, _("unable to open seed device '%s': %s, exiting."), conf.seed_dev, strerror (errno));
243 exit (EXIT_FAILURE);
244 }
245
246 static ev::timer reseed_timer;
247
248 if (conf.reseed)
249 {
250 reseed_timer.set<reseed_rng> ();
251 reseed_timer.set (conf.reseed, conf.reseed);
252 reseed_timer.start (EV_DEFAULT);
253 }
254
255 reseed_rng (reseed_timer, 0);
256}
257
205int 258int
206main (int argc, char **argv, char **envp) 259main (int argc, char **argv, char **envp)
207{ 260{
208 ERR_load_crypto_strings (); // we have the RAM 261 ERR_load_crypto_strings (); // we have the RAM
209 262
… …
224 { 277 {
225 printf (_("%s version %s (built %s %s, protocol version %d.%d)\n"), get_identity (), 278 printf (_("%s version %s (built %s %s, protocol version %d.%d)\n"), get_identity (),
226 VERSION, __DATE__, __TIME__, PROTOCOL_MAJOR, PROTOCOL_MINOR); 279 VERSION, __DATE__, __TIME__, PROTOCOL_MAJOR, PROTOCOL_MINOR);
227 printf (_("Built with kernel interface %s/%s.\n"), IFTYPE, IFSUBTYPE); 280 printf (_("Built with kernel interface %s/%s.\n"), IFTYPE, IFSUBTYPE);
228 printf (_ 281 printf (_
229 ("Copyright (C) 2003 Marc Lehmann <gvpe@schmorp.de> and others.\n" 282 ("Copyright (C) 2003-2011 Marc Lehmann <gvpe@schmorp.de> and others.\n"
230 "See the AUTHORS file for a complete list.\n\n" 283 "See the AUTHORS file for a complete list.\n\n"
231 "tinc comes with ABSOLUTELY NO WARRANTY. This is free software,\n" 284 "GVPE comes with ABSOLUTELY NO WARRANTY. This is free software,\n"
232 "and you are welcome to redistribute it under certain conditions;\n" 285 "and you are welcome to redistribute it under certain conditions;\n"
233 "see the file COPYING for details.\n")); 286 "see the file COPYING for details.\n"));
234 287
235 return 0; 288 return 0;
236 } 289 }
… …
264 configuration_parser (conf, true, argc, argv); 317 configuration_parser (conf, true, argc, argv);
265 } 318 }
266 319
267 set_loglevel (llevel != L_NONE ? llevel : conf.llevel); 320 set_loglevel (llevel != L_NONE ? llevel : conf.llevel);
268 321
269 RAND_load_file ("/dev/urandom", 1024); 322 setup_rng ();
270 323
271 if (!THISNODE) 324 if (!THISNODE)
272 { 325 {
273 slog (L_ERR, _("current node not set, or node '%s' not found in configfile, specify the nodename when starting gvpe."), 326 slog (L_ERR, _("current node not set, or node '%s' not found in configfile, specify the nodename when starting gvpe."),
274 thisnode ? thisnode : "<unset>"); 327 thisnode ? thisnode : "<unset>");
… …
279 exit (EXIT_SUCCESS); 332 exit (EXIT_SUCCESS);
280 333
281 setup_signals (); 334 setup_signals ();
282 335
283 if (!network.setup ()) 336 if (!network.setup ())
337 if (network.drop_privileges ())
284 { 338 {
285 ev_loop (EV_DEFAULT_ 0); 339 ev_run (EV_DEFAULT_ 0);
286 cleanup_and_exit (EXIT_FAILURE); 340 cleanup_and_exit (EXIT_FAILURE);
287 } 341 }
288 342
289 slog (L_ERR, _("unable to setup network, unrecoverable error, exiting.")); 343 slog (L_CRIT, _("unrecoverable error while setting up network, exiting."));
290 cleanup_and_exit (EXIT_FAILURE); 344 cleanup_and_exit (EXIT_FAILURE);
291} 345}
292 346

Diff Legend

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