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.4 by pcg, Wed Mar 23 20:22:59 2005 UTC vs.
Revision 1.19 by root, Tue Feb 15 13:31:23 2011 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-2011 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. 59 Temple Place, Suite 330, Boston, MA 02111-1307 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>
… …
48 58
49#include "conf.h" 59#include "conf.h"
50#include "slog.h" 60#include "slog.h"
51#include "util.h" 61#include "util.h"
52#include "vpn.h" 62#include "vpn.h"
53#include "iom.h" 63#include "ev_cpp.h"
54 64
55static loglevel llevel = L_NONE; 65static loglevel llevel = L_NONE;
56 66
57/* If nonzero, display usage information and exit. */ 67/* If nonzero, display usage information and exit. */
58static int show_help; 68static int show_help;
… …
65 75
66/* If zero, don't detach from the terminal. */ 76/* If zero, don't detach from the terminal. */
67static int do_detach = 1; 77static int do_detach = 1;
68 78
69static struct option const long_options[] = 79static struct option const long_options[] =
70 { 80{
71 {"config", required_argument, NULL, 'c'}, 81 {"config", required_argument, NULL, 'c'},
72 {"help", no_argument, &show_help, 1}, 82 {"help", no_argument, &show_help, 1},
73 {"version", no_argument, &show_version, 1}, 83 {"version", no_argument, &show_version, 1},
74 {"no-detach", no_argument, &do_detach, 0}, 84 {"no-detach", no_argument, &do_detach, 0},
75 {"log-level", required_argument, NULL, 'l'}, 85 {"log-level", required_argument, NULL, 'l'},
76 {"mlock", no_argument, &do_mlock, 1}, 86 {"mlock", no_argument, &do_mlock, 1},
77 {NULL, 0, NULL, 0} 87 {NULL, 0, NULL, 0}
78 }; 88};
79 89
80static void 90static void
81usage (int status) 91usage (int status)
82{ 92{
83 if (status != 0) 93 if (status != 0)
… …
87 printf (_("Usage: %s [option]... NODENAME\n\n"), get_identity ()); 97 printf (_("Usage: %s [option]... NODENAME\n\n"), get_identity ());
88 printf (_ 98 printf (_
89 (" -c, --config=DIR Read configuration options from DIR.\n" 99 (" -c, --config=DIR Read configuration options from DIR.\n"
90 " -D, --no-detach Don't fork and detach.\n" 100 " -D, --no-detach Don't fork and detach.\n"
91 " -l, --log-level=LEVEL Set logging level (info, notice, warn are common).\n" 101 " -l, --log-level=LEVEL Set logging level (info, notice, warn are common).\n"
92 " -L, --mlock Lock tinc into main memory.\n" 102 " -L, --mlock Lock gvpe into main memory.\n"
93 " --help Display this help and exit.\n" 103 " --help Display this help and exit.\n"
94 " --version Output version information and exit.\n\n")); 104 " --version Output version information and exit.\n\n"));
95 printf (_("Report bugs to <vpe@plan9.de>.\n")); 105 printf (_("Report bugs to <gvpe@schmorp.de>.\n"));
96 } 106 }
97 107
98 exit (status); 108 exit (status);
99} 109}
100 110
101void 111static void
102parse_options (int argc, char **argv, char **envp) 112parse_options (int argc, char **argv, char **envp)
103{ 113{
104 int r; 114 int r;
105 int option_index = 0; 115 int option_index = 0;
106 116
107 while ((r = getopt_long (argc, argv, "-c:DLl:", long_options, &option_index)) != EOF) 117 while ((r = getopt_long (argc, argv, "c:DLl:", long_options, &option_index)) != EOF)
108 { 118 {
109 switch (r) 119 switch (r)
110 { 120 {
111 case 0: /* long option */ 121 case 0: /* long option */
112 break; 122 break;
113 123
114 case 1: /* this node name */
115 thisnode = strdup (optarg);
116 break;
117
118 case 'c': /* config file */ 124 case 'c': /* config file */
119 confbase = strdup (optarg); 125 confbase = strdup (optarg);
120 break; 126 break;
121 127
122 case 'D': /* no detach */ 128 case 'D': /* no detach */
… …
143 break; 149 break;
144 } 150 }
145 } 151 }
146} 152}
147 153
148/*
149 Close network connections, and terminate neatly 154// close network connections, and terminate neatly
150*/ 155static void
151void cleanup_and_exit(int c) 156cleanup_and_exit (int c)
152{ 157{
153 network.shutdown_all (); 158 network.shutdown_all ();
154 159
155 if (conf.pidfilename) 160 if (conf.pidfilename)
156 remove_pid (conf.pidfilename); 161 remove_pid (conf.pidfilename);
… …
158 slog (L_INFO, _("terminating with exit code %d"), c); 163 slog (L_INFO, _("terminating with exit code %d"), c);
159 164
160 exit (c); 165 exit (c);
161} 166}
162 167
163/*
164 Signal handlers. 168// signal handlers
165*/ 169static RETSIGTYPE
166RETSIGTYPE
167sigterm_handler (int a) 170sigterm_handler (int a)
168{ 171{
169 network.events |= vpn::EVENT_SHUTDOWN; 172 network.events |= vpn::EVENT_SHUTDOWN;
170 network.event.start (0); 173 network.event.start ();
171} 174}
172 175
173RETSIGTYPE 176static RETSIGTYPE
174sighup_handler (int a) 177sighup_handler (int a)
175{ 178{
176 network.events |= vpn::EVENT_RECONNECT; 179 network.events |= vpn::EVENT_RECONNECT;
177 network.event.start (0); 180 network.event.start ();
178} 181}
179 182
180RETSIGTYPE 183static RETSIGTYPE
181sigusr1_handler (int a) 184sigusr1_handler (int a)
182{ 185{
183 network.dump_status (); 186 network.dump_status ();
184} 187}
185 188
186RETSIGTYPE 189static RETSIGTYPE
187sigusr2_handler (int a) 190sigusr2_handler (int a)
188{ 191{
189} 192}
190 193
191void 194static void
192setup_signals (void) 195setup_signals (void)
193{ 196{
194 struct sigaction act; 197 struct sigaction act;
195 198
196 sigfillset (&act.sa_mask); 199 sigfillset (&act.sa_mask);
197 act.sa_flags = 0; 200 act.sa_flags = 0;
198 201
199 act.sa_handler = sighup_handler; sigaction (SIGHUP , &act, NULL); 202 act.sa_handler = sighup_handler; sigaction (SIGHUP , &act, NULL);
200 act.sa_handler = sigusr1_handler; sigaction (SIGUSR1, &act, NULL); 203 act.sa_handler = sigusr1_handler; sigaction (SIGUSR1, &act, NULL);
201 act.sa_handler = sigusr2_handler; sigaction (SIGUSR2, &act, NULL); 204 act.sa_handler = sigusr2_handler; sigaction (SIGUSR2, &act, NULL);
202 act.sa_handler = SIG_IGN; sigaction (SIGCHLD, &act, NULL);
203 act.sa_handler = SIG_IGN; sigaction (SIGPIPE, &act, NULL); 205 act.sa_handler = SIG_IGN; sigaction (SIGPIPE, &act, NULL);
204 act.sa_flags = SA_RESETHAND; 206 act.sa_flags = SA_RESETHAND;
205 act.sa_handler = sigterm_handler; sigaction (SIGINT , &act, NULL); 207 act.sa_handler = sigterm_handler; sigaction (SIGINT , &act, NULL);
206 act.sa_handler = sigterm_handler; sigaction (SIGTERM, &act, NULL); 208 act.sa_handler = sigterm_handler; sigaction (SIGTERM, &act, NULL);
207} 209}
… …
219 bindtextdomain (PACKAGE, LOCALEDIR); 221 bindtextdomain (PACKAGE, LOCALEDIR);
220 textdomain (PACKAGE); 222 textdomain (PACKAGE);
221 223
222 parse_options (argc, argv, envp); 224 parse_options (argc, argv, envp);
223 225
226 argc -= optind;
227 argv += optind;
228
224 if (show_version) 229 if (show_version)
225 { 230 {
226 printf (_("%s version %s (built %s %s, protocol %d.%d)\n"), get_identity (), 231 printf (_("%s version %s (built %s %s, protocol version %d.%d)\n"), get_identity (),
227 VERSION, __DATE__, __TIME__, PROTOCOL_MAJOR, PROTOCOL_MINOR); 232 VERSION, __DATE__, __TIME__, PROTOCOL_MAJOR, PROTOCOL_MINOR);
228 printf (_("Built with kernel interface %s/%s.\n"), IFTYPE, IFSUBTYPE); 233 printf (_("Built with kernel interface %s/%s.\n"), IFTYPE, IFSUBTYPE);
229 printf (_ 234 printf (_
230 ("Copyright (C) 2003 Marc Lehmann <vpe@plan9.de> and others.\n" 235 ("Copyright (C) 2003-2008 Marc Lehmann <gvpe@schmorp.de> and others.\n"
231 "See the AUTHORS file for a complete list.\n\n" 236 "See the AUTHORS file for a complete list.\n\n"
232 "tinc comes with ABSOLUTELY NO WARRANTY. This is free software,\n" 237 "GVPE comes with ABSOLUTELY NO WARRANTY. This is free software,\n"
233 "and you are welcome to redistribute it under certain conditions;\n" 238 "and you are welcome to redistribute it under certain conditions;\n"
234 "see the file COPYING for details.\n")); 239 "see the file COPYING for details.\n"));
235 240
236 return 0; 241 return 0;
237 } 242 }
… …
247 if (do_mlock) 252 if (do_mlock)
248 if (mlockall (MCL_CURRENT | MCL_FUTURE)) 253 if (mlockall (MCL_CURRENT | MCL_FUTURE))
249 slog (L_ERR, _("system call `%s' failed: %s"), "mlockall", strerror (errno)); 254 slog (L_ERR, _("system call `%s' failed: %s"), "mlockall", strerror (errno));
250#endif 255#endif
251 256
252 conf.read_config (true); 257 if (argc >= 1)
258 {
259 thisnode = *argv++;
260 argc--;
261 }
262
263 if (!ev_default_loop (0))
264 {
265 slog (L_ERR, _("unable to initialise the event loop (bad $LIBEV_METHODS?)"));
266 exit (EXIT_FAILURE);
267 }
268
269 {
270 configuration_parser (conf, true, argc, argv);
271 }
253 272
254 set_loglevel (llevel != L_NONE ? llevel : conf.llevel); 273 set_loglevel (llevel != L_NONE ? llevel : conf.llevel);
255 274
256 RAND_load_file ("/dev/urandom", 1024); 275 RAND_load_file ("/dev/urandom", 1024);
257 276
… …
267 286
268 setup_signals (); 287 setup_signals ();
269 288
270 if (!network.setup ()) 289 if (!network.setup ())
271 { 290 {
272 io_manager::loop (); 291 ev_loop (EV_DEFAULT_ 0);
273 cleanup_and_exit (EXIT_FAILURE); 292 cleanup_and_exit (EXIT_FAILURE);
274 } 293 }
275 294
276 slog (L_ERR, _("unable to setup network, unrecoverable error, exiting.")); 295 slog (L_ERR, _("unrecoverable error while setting up network, exiting."));
277 cleanup_and_exit (EXIT_FAILURE); 296 cleanup_and_exit (EXIT_FAILURE);
278} 297}
279 298

Diff Legend

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