/*
tincd.c -- the main file for tincd
Copyright (C) 1998-2005 Ivo Timmermans
- 2000-2013 Guus Sliepen <guus@tinc-vpn.org>
+ 2000-2014 Guus Sliepen <guus@tinc-vpn.org>
2008 Max Rijevski <maksuf@gmail.com>
2009 Michael Tokarev <mjt@tls.msk.ru>
2010 Julien Muchembled <jm@jmuchemb.eu>
#include <getopt.h>
#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"
static const char *switchuser = NULL;
#endif
-/* 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;
{"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}
};
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"
#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
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]);
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)
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;
}
}
- 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;
}
#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"
}
#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())
}
#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.
}
#endif
- /* Setup sockets and open device. */
+ /* Setup sockets. */
if(!setup_network())
- goto end_nonet;
-
- if(!init_control())
- goto end_nonet;
-
- /* Initiate all outgoing connections. */
-
- try_outgoing_connections();
+ goto end;
/* Change process priority */
/* Start main loop. It only exits when tinc is killed. */
- status = main_loop();
+ logger(DEBUG_ALWAYS, LOG_NOTICE, "Ready");
- /* Shutdown properly. */
+ try_outgoing_connections();
- if(debug_level >= DEBUG_CONNECTIONS)
- devops.dump_stats();
+ status = main_loop();
- close_network_connections();
+ /* Shutdown properly. */
end:
- exit_control();
+ close_network_connections();
-end_nonet:
logger(DEBUG_ALWAYS, LOG_NOTICE, "Terminating");
free(priority);
exit_configuration(&config_tree);
free(cmdline_conf);
- free_names();
return status;
}