X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fconf.h;h=fb29f02c829cdf27496dba533fc179ea4127d8d2;hb=dd2cf09a9ac438b65a1f4c9dcff8d87a2b504538;hp=ca32a4893b4e91ff24cd51fc10c3cedaca067081;hpb=ea607d2d9292d3969f9d164b432dc64a33c2dade;p=meshlink

diff --git a/src/conf.h b/src/conf.h
index ca32a489..fb29f02c 100644
--- a/src/conf.h
+++ b/src/conf.h
@@ -1,7 +1,9 @@
+#ifndef MESHLINK_CONF_H
+#define MESHLINK_CONF_H
+
 /*
     conf.h -- header for conf.c
-    Copyright (C) 1998-2001 Ivo Timmermans <itimmermans@bigfoot.com>
-                  2000,2001 Guus Sliepen <guus@sliepen.warande.net>
+    Copyright (C) 2014, 2017 Guus Sliepen <guus@meshlink.io>
 
     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
@@ -13,50 +15,39 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-    $Id: conf.h,v 1.6.4.27 2001/10/10 20:34:27 guus Exp $
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __TINC_CONF_H__
-#define __TINC_CONF_H__
-
-#include <avl_tree.h>
-#include "net.h"
+#include "list.h"
+#include "meshlink_internal.h"
+#include "splay_tree.h"
 
 typedef struct config_t {
-  char *variable;
-  char *value;
-  char *file;
-  int line;
+	char *variable;
+	char *value;
+	int line;
 } config_t;
 
-extern avl_tree_t *config_tree;
-
-extern int debug_lvl;
-extern int timeout;
-extern int maxtimeout;
-extern int sighup;
-extern char *confbase;
-extern char *netname;
-
-extern void init_configuration(avl_tree_t **);
-extern void exit_configuration(avl_tree_t **);
-extern config_t *new_config(void);
+extern void init_configuration(struct splay_tree_t **);
+extern void exit_configuration(struct splay_tree_t **);
+extern config_t *new_config(void) __attribute__((__malloc__));
 extern void free_config(config_t *);
-extern void config_add(avl_tree_t *, config_t *);
-extern config_t *config_lookup(avl_tree_t *, char *);
-extern config_t *config_lookup_next(avl_tree_t *, config_t *);
-extern int get_config_bool(config_t *, int *);
-extern int get_config_int(config_t *, int *);
-extern int get_config_string(config_t *, char **);
-extern int get_config_ip(config_t *, ip_mask_t **);
-
-extern int read_config_file(avl_tree_t *, const char *);
-extern int read_server_config(void);
-extern FILE *ask_and_safe_open(const char*, const char*, const char *);
-extern int is_safe_path(const char *);
-
-#endif /* __TINC_CONF_H__ */
+extern void config_add(struct splay_tree_t *, config_t *);
+extern config_t *lookup_config(struct splay_tree_t *, char *);
+extern config_t *lookup_config_next(struct splay_tree_t *, const config_t *);
+extern bool get_config_bool(const config_t *, bool *);
+extern bool get_config_int(const config_t *, int *);
+extern bool set_config_int(config_t *, int);
+extern bool get_config_string(const config_t *, char **);
+extern bool set_config_string(config_t *, const char *);
+extern bool get_config_address(const config_t *, struct addrinfo **);
+
+extern bool read_server_config(struct meshlink_handle *mesh);
+extern bool read_host_config(struct meshlink_handle *mesh, struct splay_tree_t *, const char *);
+extern bool write_host_config(struct meshlink_handle *mesh, const struct splay_tree_t *, const char *);
+extern bool modify_config_file(struct meshlink_handle *mesh, const char *name, const char *key, const char *value, int trim);
+extern bool append_config_file(struct meshlink_handle *mesh, const char *name, const char *key, const char *value);
+
+#endif