X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fconf.h;h=2d55edde4cc9f8b829fa8a803d6c2d9b633db90f;hb=28b7a53b6;hp=d6479a2e8c5b9d500d3349e7f48671133e2b9648;hpb=7208397398f7e08d741bfa83594a88e5d01b6220;p=tinc

diff --git a/src/conf.h b/src/conf.h
index d6479a2e..2d55edde 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,21 +32,21 @@ 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 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);