--- gvpe/src/gvpe.C 2005/06/21 08:50:37 1.9 +++ gvpe/src/gvpe.C 2011/02/15 13:31:23 1.19 @@ -2,23 +2,33 @@ gvpe.C -- the main file for gvpe Copyright (C) 1998-2002 Ivo Timmermans 2000-2002 Guus Sliepen - 2003-2005 Marc Lehmann + 2003-2011 Marc Lehmann This file is part of GVPE. - GVPE is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with gvpe; if not, write to the Free Software - Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + GVPE is free software; you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by the + Free Software Foundation; either version 3 of the License, or (at your + option) any later version. + + This program is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General + Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, see . + + Additional permission under GNU GPL version 3 section 7 + + If you modify this Program, or any covered work, by linking or + combining it with the OpenSSL project's OpenSSL library (or a modified + version of that library), containing parts covered by the terms of the + OpenSSL or SSLeay licenses, the licensors of this Program grant you + additional permission to convey the resulting work. Corresponding + Source for a non-source form of such a combination shall include the + source code for the parts of OpenSSL used as well as that of the + covered work. */ #include "config.h" @@ -50,7 +60,7 @@ #include "slog.h" #include "util.h" #include "vpn.h" -#include "iom.h" +#include "ev_cpp.h" static loglevel llevel = L_NONE; @@ -67,15 +77,15 @@ static int do_detach = 1; static struct option const long_options[] = - { - {"config", required_argument, NULL, 'c'}, - {"help", no_argument, &show_help, 1}, - {"version", no_argument, &show_version, 1}, - {"no-detach", no_argument, &do_detach, 0}, - {"log-level", required_argument, NULL, 'l'}, - {"mlock", no_argument, &do_mlock, 1}, - {NULL, 0, NULL, 0} - }; +{ + {"config", required_argument, NULL, 'c'}, + {"help", no_argument, &show_help, 1}, + {"version", no_argument, &show_version, 1}, + {"no-detach", no_argument, &do_detach, 0}, + {"log-level", required_argument, NULL, 'l'}, + {"mlock", no_argument, &do_mlock, 1}, + {NULL, 0, NULL, 0} +}; static void usage (int status) @@ -89,7 +99,7 @@ (" -c, --config=DIR Read configuration options from DIR.\n" " -D, --no-detach Don't fork and detach.\n" " -l, --log-level=LEVEL Set logging level (info, notice, warn are common).\n" - " -L, --mlock Lock tinc into main memory.\n" + " -L, --mlock Lock gvpe into main memory.\n" " --help Display this help and exit.\n" " --version Output version information and exit.\n\n")); printf (_("Report bugs to .\n")); @@ -98,7 +108,7 @@ exit (status); } -void +static void parse_options (int argc, char **argv, char **envp) { int r; @@ -141,10 +151,9 @@ } } -/* - Close network connections, and terminate neatly -*/ -void cleanup_and_exit(int c) +// close network connections, and terminate neatly +static void +cleanup_and_exit (int c) { network.shutdown_all (); @@ -156,35 +165,33 @@ exit (c); } -/* - Signal handlers. -*/ -RETSIGTYPE +// signal handlers +static RETSIGTYPE sigterm_handler (int a) { network.events |= vpn::EVENT_SHUTDOWN; - network.event.start (0); + network.event.start (); } -RETSIGTYPE +static RETSIGTYPE sighup_handler (int a) { network.events |= vpn::EVENT_RECONNECT; - network.event.start (0); + network.event.start (); } -RETSIGTYPE +static RETSIGTYPE sigusr1_handler (int a) { network.dump_status (); } -RETSIGTYPE +static RETSIGTYPE sigusr2_handler (int a) { } -void +static void setup_signals (void) { struct sigaction act; @@ -195,7 +202,6 @@ act.sa_handler = sighup_handler; sigaction (SIGHUP , &act, NULL); act.sa_handler = sigusr1_handler; sigaction (SIGUSR1, &act, NULL); act.sa_handler = sigusr2_handler; sigaction (SIGUSR2, &act, NULL); - act.sa_handler = SIG_IGN; sigaction (SIGCHLD, &act, NULL); act.sa_handler = SIG_IGN; sigaction (SIGPIPE, &act, NULL); act.sa_flags = SA_RESETHAND; act.sa_handler = sigterm_handler; sigaction (SIGINT , &act, NULL); @@ -226,9 +232,9 @@ VERSION, __DATE__, __TIME__, PROTOCOL_MAJOR, PROTOCOL_MINOR); printf (_("Built with kernel interface %s/%s.\n"), IFTYPE, IFSUBTYPE); printf (_ - ("Copyright (C) 2003 Marc Lehmann and others.\n" + ("Copyright (C) 2003-2008 Marc Lehmann and others.\n" "See the AUTHORS file for a complete list.\n\n" - "tinc comes with ABSOLUTELY NO WARRANTY. This is free software,\n" + "GVPE comes with ABSOLUTELY NO WARRANTY. This is free software,\n" "and you are welcome to redistribute it under certain conditions;\n" "see the file COPYING for details.\n")); @@ -254,6 +260,12 @@ argc--; } + if (!ev_default_loop (0)) + { + slog (L_ERR, _("unable to initialise the event loop (bad $LIBEV_METHODS?)")); + exit (EXIT_FAILURE); + } + { configuration_parser (conf, true, argc, argv); } @@ -276,11 +288,11 @@ if (!network.setup ()) { - io_manager::loop (); + ev_loop (EV_DEFAULT_ 0); cleanup_and_exit (EXIT_FAILURE); } - slog (L_ERR, _("unable to setup network, unrecoverable error, exiting.")); + slog (L_ERR, _("unrecoverable error while setting up network, exiting.")); cleanup_and_exit (EXIT_FAILURE); }