/*
tincd.c -- the main file for tincd
Copyright (C) 1998-2005 Ivo Timmermans
- 2000-2021 Guus Sliepen <guus@tinc-vpn.org>
+ 2000-2022 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>
#define _P1003_1B_VISIBLE
#endif
-#ifdef HAVE_SYS_MMAN_H
-#include <sys/mman.h>
-#endif
-
#ifdef HAVE_LZO
#include LZO1X_H
#endif
-#ifdef LZ4_H
-#include LZ4_H
+#ifdef HAVE_LZ4
+#include <lz4.h>
#endif
#ifndef HAVE_MINGW
#endif
#include "conf.h"
-#include "control.h"
#include "crypto.h"
-#include "device.h"
#include "event.h"
#include "logger.h"
#include "names.h"
#include "net.h"
-#include "netutl.h"
#include "process.h"
#include "protocol.h"
#include "utils.h"
fprintf(stderr, "Try `%s --help\' for more information.\n",
program_name);
else {
- printf("Usage: %s [option]...\n\n", program_name);
- 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"
+ static const char *message =
+ "Usage: %s [option]...\n"
+ "\n"
+ " -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"
+ " -L, --mlock Lock tinc into main memory.\n"
#endif
- " --logfile[=FILENAME] Write log entries to a logfile.\n"
- " -s --syslog Use syslog instead of stderr with --no-detach.\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"
+ " --logfile[=FILENAME] Write log entries to a logfile.\n"
+ " -s --syslog Use syslog instead of stderr with --no-detach.\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"
+ " -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");
+ " --help Display this help and exit.\n"
+ " --version Output version information and exit.\n"
+ "\n"
+ "Report bugs to tinc@tinc-vpn.org.\n";
+
+ printf(message, program_name);
}
}
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:so:RU:", long_options, &option_index)) != EOF) {
switch(r) {
case 0: /* long option */
goto exit_fail;
}
- list_insert_tail(cmdline_conf, cfg);
+ list_insert_tail(&cmdline_conf, cfg);
break;
#ifdef HAVE_MINGW
exit_fail:
free_names();
- free(cmdline_conf);
- cmdline_conf = NULL;
+ list_empty_list(&cmdline_conf);
return false;
}
uid = pw->pw_uid;
- if(initgroups(switchuser, pw->pw_gid) != 0 ||
+ // The second parameter to initgroups on macOS requires int,
+ // but __gid_t is unsigned int. There's not much we can do here.
+ if(initgroups(switchuser, pw->pw_gid) != 0 || // NOLINT(bugprone-narrowing-conversions)
setgid(pw->pw_gid) != 0) {
logger(DEBUG_ALWAYS, LOG_ERR, "System call `%s' failed: %s",
"initgroups", strerror(errno));
# define setpriority(level) (setpriority(PRIO_PROCESS, 0, (level)))
#endif
-static void cleanup() {
- if(config_tree) {
- exit_configuration(&config_tree);
- }
-
- free(cmdline_conf);
+static void cleanup(void) {
+ splay_empty_tree(&config_tree);
+ list_empty_list(&cmdline_conf);
free_names();
}
}
if(show_version) {
- printf("%s version %s (built %s %s, protocol %d.%d)\n", PACKAGE,
- BUILD_VERSION, BUILD_DATE, BUILD_TIME, PROT_MAJOR, PROT_MINOR);
- printf("Features:"
+ static const char *message =
+ "%s version %s (built %s %s, protocol %d.%d)\n"
+ "Features:"
#ifdef HAVE_OPENSSL
- " openssl"
+ " openssl"
#endif
#ifdef HAVE_LIBGCRYPT
- " libgcrypt"
+ " libgcrypt"
#endif
#ifdef HAVE_LZO
- " comp_lzo"
+ " comp_lzo"
#endif
#ifdef HAVE_ZLIB
- " comp_zlib"
+ " comp_zlib"
#endif
#ifdef HAVE_LZ4
- " comp_lz4"
+ " comp_lz4"
#endif
#ifndef DISABLE_LEGACY
- " legacy_protocol"
+ " legacy_protocol"
#endif
#ifdef ENABLE_JUMBOGRAMS
- " jumbograms"
+ " jumbograms"
#endif
#ifdef ENABLE_TUNEMU
- " tunemu"
+ " tunemu"
#endif
#ifdef HAVE_MINIUPNPC
- " miniupnpc"
+ " miniupnpc"
#endif
#ifdef ENABLE_UML
- " uml"
+ " uml"
#endif
#ifdef ENABLE_VDE
- " vde"
+ " vde"
#endif
- "\n\n");
- printf("Copyright (C) 1998-2021 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"
- "see the file COPYING for details.\n");
+ "\n\n"
+ "Copyright (C) 1998-2021 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"
+ "see the file COPYING for details.\n";
+ printf(message, PACKAGE, BUILD_VERSION, BUILD_DATE, BUILD_TIME, PROT_MAJOR, PROT_MINOR);
return 0;
}
make_names(true);
atexit(cleanup);
- chdir(confbase);
+ if(chdir(confbase) == -1) {
+ logger(DEBUG_ALWAYS, LOG_ERR, "Could not change to configuration directory: %s", strerror(errno));
+ return 1;
+ }
#ifdef HAVE_MINGW
unsetenv("LISTEN_PID");
#endif
- init_configuration(&config_tree);
-
- /* Slllluuuuuuurrrrp! */
-
gettimeofday(&now, NULL);
- srand(now.tv_sec + now.tv_usec);
crypto_init();
+ prng_init();
- if(!read_server_config()) {
+ if(!read_server_config(&config_tree)) {
return 1;
}
- if(!debug_level) {
- get_config_int(lookup_config(config_tree, "LogLevel"), &debug_level);
+ if(debug_level == DEBUG_NOTHING) {
+ int level = 0;
+
+ if(get_config_int(lookup_config(&config_tree, "LogLevel"), &level)) {
+ debug_level = level;
+ }
}
#ifdef HAVE_LZO
/* Change process priority */
- if(get_config_string(lookup_config(config_tree, "ProcessPriority"), &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));
logger(DEBUG_ALWAYS, LOG_NOTICE, "Ready");
if(umbilical) { // snip!
- write(umbilical, "", 1);
+ if(write(umbilical, "", 1) != 1) {
+ // Pipe full or broken, nothing we can do about it.
+ }
+
close(umbilical);
umbilical = 0;
}
projects / tinc / blobdiff