Replace pointers to global splay trees with structs.

[tinc] / src / tincd.c

diff --git a/src/tincd.c b/src/tincd.c
index e0e0388..dff420a 100644 (file)
--- a/src/tincd.c
+++ b/src/tincd.c
@@ -48,14 +48,11 @@
 #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"
@@ -151,8 +148,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:so:RU:", long_options, &option_index)) != EOF) {
                switch(r) {
                case 0:   /* long option */
@@ -206,7 +201,7 @@ static bool parse_options(int argc, char **argv) {
                                goto exit_fail;
                        }
 
-                       list_insert_tail(cmdline_conf, cfg);
+                       list_insert_tail(&cmdline_conf, cfg);
                        break;
 
 #ifdef HAVE_MINGW
@@ -297,8 +292,7 @@ static bool parse_options(int argc, char **argv) {
 
 exit_fail:
        free_names();
-       free(cmdline_conf);
-       cmdline_conf = NULL;
+       list_empty_list(&cmdline_conf);
        return false;
 }
 
@@ -316,7 +310,9 @@ static bool drop_privs(void) {
 
                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));
@@ -383,11 +379,8 @@ static BOOL WINAPI console_ctrl_handler(DWORD type) {
 #endif
 
 static void cleanup() {
-       if(config_tree) {
-               exit_configuration(&config_tree);
-       }
-
-       free(cmdline_conf);
+       splay_empty_tree(&config_tree);
+       list_empty_list(&cmdline_conf);
        free_names();
 }
 
@@ -496,20 +489,22 @@ int main(int argc, char **argv) {
        unsetenv("LISTEN_PID");
 #endif
 
-       init_configuration(&config_tree);
-
        /* Slllluuuuuuurrrrp! */
 
        gettimeofday(&now, NULL);
        srand(now.tv_sec + now.tv_usec);
        crypto_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
@@ -576,7 +571,7 @@ int main2(int argc, char **argv) {
 
        /* 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));