X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fconf.h;h=3cf677d560dde6855e590f291fb79bab0e4df566;hb=c44b08613508c993e7fd9f625e0b1b4775efffed;hp=84571247399b8d419bf670ed7be9c8f124e22bc9;hpb=42d2dff33306beae8ddbd9cc991ad80f135950a6;p=tinc

diff --git a/src/conf.h b/src/conf.h
index 84571247..3cf677d5 100644
--- a/src/conf.h
+++ b/src/conf.h
@@ -4,7 +4,7 @@
 /*
     conf.h -- header for conf.c
     Copyright (C) 1998-2005 Ivo Timmermans
-                  2000-2013 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2022 Guus Sliepen <guus@tinc-vpn.org>
 
     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
@@ -32,32 +32,31 @@ typedef struct config_t {
 	int line;
 } config_t;
 
-
-extern splay_tree_t *config_tree;
+extern splay_tree_t config_tree;
 
 extern int pinginterval;
 extern int pingtimeout;
 extern int maxtimeout;
 extern bool bypass_security;
-extern list_t *cmdline_conf;
+extern list_t cmdline_conf;
 
-extern void init_configuration(splay_tree_t **config_tree);
+extern splay_tree_t *create_configuration(void);
+extern void init_configuration(splay_tree_t *);
 extern void exit_configuration(splay_tree_t **config_tree);
-extern config_t *new_config(void) __attribute__((__malloc__));
+extern config_t *new_config(void) ATTR_MALLOC;
 extern void free_config(config_t *config);
 extern void config_add(splay_tree_t *config_tree, config_t *config);
-extern config_t *lookup_config(splay_tree_t *config_tree, char *variable);
+extern config_t *lookup_config(splay_tree_t *config_tree, const char *variable);
 extern config_t *lookup_config_next(splay_tree_t *config_tree, const config_t *config);
 extern bool get_config_bool(const config_t *config, bool *result);
 extern bool get_config_int(const config_t *config, int *result);
 extern bool get_config_string(const config_t *config, char **result);
 extern bool get_config_address(const config_t *config, struct addrinfo **result);
-extern bool get_config_subnet(const config_t *config, struct subnet_t **result);
 
 extern config_t *parse_config_line(char *line, const char *fname, int lineno);
 extern bool read_config_file(splay_tree_t *config_tree, const char *filename, bool verbose);
 extern void read_config_options(splay_tree_t *config_tree, const char *prefix);
-extern bool read_server_config(void);
+extern bool read_server_config(splay_tree_t *config_tree);
 extern bool read_host_config(splay_tree_t *config_tree, const char *name, bool verbose);
 extern bool append_config_file(const char *name, const char *key, const char *value);