X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Ftincd.c;h=6ff347deb3020fa4d08aaf1917472e2d7591107f;hb=158cbe99f972a1613b7d4d95abfe5fe48e019e67;hp=ff893df6ddbe8674a6eb71f226c0f71523e1e894;hpb=cc3c69c892b0dad9a6ece0a0f4ccd429a22fcbff;p=meshlink diff --git a/src/tincd.c b/src/tincd.c index ff893df6..6ff347de 100644 --- a/src/tincd.c +++ b/src/tincd.c @@ -1,11 +1,6 @@ /* tincd.c -- the main file for tincd - Copyright (C) 1998-2005 Ivo Timmermans - 2000-2013 Guus Sliepen - 2008 Max Rijevski - 2009 Michael Tokarev - 2010 Julien Muchembled - 2010 Timothy Redaelli + Copyright (C) 2014 Guus Sliepen This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -33,16 +28,6 @@ #include #endif -#include -#include -#include -#include -#include - -#ifdef HAVE_LZO -#include LZO1X_H -#endif - #ifndef HAVE_MINGW #include #include @@ -52,14 +37,10 @@ #include #include "conf.h" -#include "control.h" #include "crypto.h" -#include "device.h" #include "logger.h" -#include "names.h" #include "net.h" #include "netutl.h" -#include "process.h" #include "protocol.h" #include "utils.h" #include "xalloc.h" @@ -73,18 +54,6 @@ static bool show_version = false; /* If nonzero, use null ciphers and skip all key exchanges. */ bool bypass_security = false; -/* If nonzero, disable swapping for this process. */ -static bool do_mlock = false; - -/* If nonzero, chroot to netdir after startup. */ -static bool do_chroot = false; - -/* If !NULL, do setuid to given user after startup */ -static const char *switchuser = NULL; - -/* If nonzero, write log entries to a separate file. */ -bool use_logfile = false; - char **g_argv; /* a copy of the cmdline arguments */ static int status = 1; @@ -97,11 +66,6 @@ static struct option const long_options[] = { {"no-detach", no_argument, NULL, 'D'}, {"debug", optional_argument, NULL, 'd'}, {"bypass-security", no_argument, NULL, 3}, - {"mlock", no_argument, NULL, 'L'}, - {"chroot", no_argument, NULL, 'R'}, - {"user", required_argument, NULL, 'U'}, - {"logfile", optional_argument, NULL, 4}, - {"pidfile", required_argument, NULL, 5}, {"option", required_argument, NULL, 'o'}, {NULL, 0, NULL, 0} }; @@ -114,28 +78,18 @@ int main2(int argc, char **argv); static void usage(bool status) { if(status) - fprintf(stderr, "Try `%s --help\' for more information.\n", - program_name); + fprintf(stderr, "Try `tincd --help\' for more information.\n"); else { - printf("Usage: %s [option]...\n\n", program_name); + printf("Usage: tincd [option]...\n\n"); printf( " -c, --config=DIR Read configuration options from DIR.\n" " -D, --no-detach Don't fork and detach.\n" " -d, --debug[=LEVEL] Increase debug level or set it to LEVEL.\n" " -n, --net=NETNAME Connect to net NETNAME.\n" -#ifdef HAVE_MLOCKALL - " -L, --mlock Lock tinc into main memory.\n" -#endif - " --logfile[=FILENAME] Write log entries to a logfile.\n" - " --pidfile=FILENAME Write PID and control socket cookie to FILENAME.\n" " --bypass-security Disables meta protocol security, for debugging.\n" " -o, --option[HOST.]KEY=VALUE Set global/host configuration value.\n" -#ifndef HAVE_MINGW - " -R, --chroot chroot to NET dir at startup.\n" - " -U, --user=USER setuid to given USER at startup.\n" -#endif " --help Display this help and exit.\n" " --version Output version information and exit.\n\n"); - printf("Report bugs to tinc@tinc-vpn.org.\n"); + printf("Report bugs to bugs@meshlink.io.\n"); } } @@ -145,8 +99,6 @@ static bool parse_options(int argc, char **argv) { int option_index = 0; int lineno = 0; - cmdline_conf = list_alloc((list_action_t)free_config); - while((r = getopt_long(argc, argv, "c:DLd::n:o:RU:", long_options, &option_index)) != EOF) { switch (r) { case 0: /* long option */ @@ -156,52 +108,15 @@ static bool parse_options(int argc, char **argv) { confbase = xstrdup(optarg); break; - case 'D': /* no detach */ - do_detach = false; - break; - - case 'L': /* no detach */ -#ifndef HAVE_MLOCKALL - logger(DEBUG_ALWAYS, LOG_ERR, "The %s option is not supported on this platform.", argv[optind - 1]); - return false; -#else - do_mlock = true; - break; -#endif - - case 'd': /* inc debug level */ + case 'd': /* increase debug level */ + if(!optarg && optind < argc && *argv[optind] != '-') + optarg = argv[optind++]; if(optarg) debug_level = atoi(optarg); else debug_level++; break; - case 'n': /* net name given */ - netname = xstrdup(optarg); - break; - - case 'o': /* option */ - cfg = parse_config_line(optarg, NULL, ++lineno); - if (!cfg) - return false; - list_insert_tail(cmdline_conf, cfg); - break; - -#ifdef HAVE_MINGW - case 'R': - case 'U': - logger(DEBUG_ALWAYS, LOG_ERR, "The %s option is not supported on this platform.", argv[optind - 1]); - return false; -#else - case 'R': /* chroot to NETNAME dir */ - do_chroot = true; - break; - - case 'U': /* setuid to USER */ - switchuser = optarg; - break; -#endif - case 1: /* show help */ show_help = true; break; @@ -214,16 +129,6 @@ static bool parse_options(int argc, char **argv) { bypass_security = true; break; - case 4: /* write log entries to a file */ - use_logfile = true; - if(optarg) - logfilename = xstrdup(optarg); - break; - - case 5: /* open control socket here */ - pidfilename = xstrdup(optarg); - break; - case '?': /* wrong options */ usage(true); return false; @@ -233,89 +138,23 @@ static bool parse_options(int argc, char **argv) { } } - if(!netname && (netname = getenv("NETNAME"))) - netname = xstrdup(netname); - - /* netname "." is special: a "top-level name" */ - - if(netname && (!*netname || !strcmp(netname, "."))) { - free(netname); - netname = NULL; - } - - if(netname && (strpbrk(netname, "\\/") || *netname == '.')) { - fprintf(stderr, "Invalid character in netname!\n"); + if(optind < argc) { + fprintf(stderr, "%s: unrecognized argument '%s'\n", argv[0], argv[optind]); + usage(true); return false; } return true; } -static bool drop_privs(void) { -#ifdef HAVE_MINGW - return false; -#else - uid_t uid = 0; - if (switchuser) { - struct passwd *pw = getpwnam(switchuser); - if (!pw) { - logger(DEBUG_ALWAYS, LOG_ERR, "unknown user `%s'", switchuser); - return false; - } - uid = pw->pw_uid; - if (initgroups(switchuser, pw->pw_gid) != 0 || - setgid(pw->pw_gid) != 0) { - logger(DEBUG_ALWAYS, LOG_ERR, "System call `%s' failed: %s", - "initgroups", strerror(errno)); - return false; - } -#ifndef __ANDROID__ -// Not supported in android NDK - endgrent(); - endpwent(); -#endif - } - if (do_chroot) { - tzset(); /* for proper timestamps in logs */ - if (chroot(confbase) != 0 || chdir("/") != 0) { - logger(DEBUG_ALWAYS, LOG_ERR, "System call `%s' failed: %s", - "chroot", strerror(errno)); - return false; - } - free(confbase); - confbase = xstrdup(""); - } - if (switchuser) - if (setuid(uid) != 0) { - logger(DEBUG_ALWAYS, LOG_ERR, "System call `%s' failed: %s", - "setuid", strerror(errno)); - return false; - } -#endif - return true; -} - -#ifdef HAVE_MINGW -# define setpriority(level) !SetPriorityClass(GetCurrentProcess(), (level)) -#else -# define NORMAL_PRIORITY_CLASS 0 -# define BELOW_NORMAL_PRIORITY_CLASS 10 -# define HIGH_PRIORITY_CLASS -10 -# define setpriority(level) (setpriority(PRIO_PROCESS, 0, (level))) -#endif - int main(int argc, char **argv) { - program_name = argv[0]; - if(!parse_options(argc, argv)) return 1; - make_names(); - if(show_version) { printf("%s version %s (built %s %s, protocol %d.%d)\n", PACKAGE, VERSION, __DATE__, __TIME__, PROT_MAJOR, PROT_MINOR); - printf("Copyright (C) 1998-2012 Ivo Timmermans, Guus Sliepen and others.\n" + printf("Copyright (C) 1998-2014 Ivo Timmermans, Guus Sliepen and others.\n" "See the AUTHORS file for a complete list.\n\n" "tinc comes with ABSOLUTELY NO WARRANTY. This is free software,\n" "and you are welcome to redistribute it under certain conditions;\n" @@ -336,115 +175,41 @@ int main(int argc, char **argv) { } #endif - openlogger("tinc", use_logfile?LOGMODE_FILE:LOGMODE_STDERR); + openlogger("tinc", LOGMODE_STDERR); g_argv = argv; - if(getenv("LISTEN_PID") && atoi(getenv("LISTEN_PID")) == getpid()) - do_detach = false; -#ifdef HAVE_UNSETENV - unsetenv("LISTEN_PID"); -#endif - init_configuration(&config_tree); /* Slllluuuuuuurrrrp! */ - srand(time(NULL)); + gettimeofday(&now, NULL); + srand(now.tv_sec + now.tv_usec); crypto_init(); if(!read_server_config()) return 1; -#ifdef HAVE_LZO - if(lzo_init() != LZO_E_OK) { - logger(DEBUG_ALWAYS, LOG_ERR, "Error initializing LZO compressor!"); - return 1; - } -#endif - -#ifdef HAVE_MINGW - if(!do_detach || !init_service()) - return main2(argc, argv); - else - return 1; -} - -int main2(int argc, char **argv) { - InitializeCriticalSection(&mutex); - EnterCriticalSection(&mutex); -#endif char *priority = NULL; - if(!detach()) - return 1; - -#ifdef HAVE_MLOCKALL - /* Lock all pages into memory if requested. - * This has to be done after daemon()/fork() so it works for child. - * No need to do that in parent as it's very short-lived. */ - if(do_mlock && mlockall(MCL_CURRENT | MCL_FUTURE) != 0) { - logger(DEBUG_ALWAYS, LOG_ERR, "System call `%s' failed: %s", "mlockall", - strerror(errno)); - return 1; - } -#endif - - /* Setup sockets and open device. */ + /* Setup sockets. */ if(!setup_network()) - goto end_nonet; + goto end; - if(!init_control()) - goto end_nonet; + /* Start main loop. It only exits when tinc is killed. */ - /* Initiate all outgoing connections. */ + logger(DEBUG_ALWAYS, LOG_NOTICE, "Ready"); try_outgoing_connections(); - /* Change process priority */ - - if(get_config_string(lookup_config(config_tree, "ProcessPriority"), &priority)) { - if(!strcasecmp(priority, "Normal")) { - if (setpriority(NORMAL_PRIORITY_CLASS) != 0) { - logger(DEBUG_ALWAYS, LOG_ERR, "System call `%s' failed: %s", "setpriority", strerror(errno)); - goto end; - } - } else if(!strcasecmp(priority, "Low")) { - if (setpriority(BELOW_NORMAL_PRIORITY_CLASS) != 0) { - logger(DEBUG_ALWAYS, LOG_ERR, "System call `%s' failed: %s", "setpriority", strerror(errno)); - goto end; - } - } else if(!strcasecmp(priority, "High")) { - if (setpriority(HIGH_PRIORITY_CLASS) != 0) { - logger(DEBUG_ALWAYS, LOG_ERR, "System call `%s' failed: %s", "setpriority", strerror(errno)); - goto end; - } - } else { - logger(DEBUG_ALWAYS, LOG_ERR, "Invalid priority `%s`!", priority); - goto end; - } - } - - /* drop privileges */ - if (!drop_privs()) - goto end; - - /* Start main loop. It only exits when tinc is killed. */ - status = main_loop(); /* Shutdown properly. */ - if(debug_level >= DEBUG_CONNECTIONS) - devops.dump_stats(); - - close_network_connections(); - end: - exit_control(); + close_network_connections(); -end_nonet: logger(DEBUG_ALWAYS, LOG_NOTICE, "Terminating"); free(priority); @@ -452,8 +217,6 @@ end_nonet: crypto_exit(); exit_configuration(&config_tree); - free(cmdline_conf); - free_names(); return status; }