X-Git-Url: http://git.meshlink.io/?p=meshlink;a=blobdiff_plain;f=src%2Fconf.h;h=2f79834ac7a0e09dc2c4b581306f919a0b9e823a;hp=dfa1123100142dad2b2416e7afc55a5b26383577;hb=963c5055505f2fc117cd5efa06eaa02c9b2bf85d;hpb=075e6828a7533e7daa790225f17aa6bb39703278

diff --git a/src/conf.h b/src/conf.h
index dfa11231..2f79834a 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-2005 Ivo Timmermans
-                  2000-2009 Guus Sliepen <guus@tinc-vpn.org>
+    econf.h -- header for econf.c
+    Copyright (C) 2018 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,53 +15,47 @@
     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$
+    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 "splay_tree.h"
+struct meshlink_handle;
 
 typedef struct config_t {
-	char *variable;
-	char *value;
-	char *file;
-	int line;
+	const uint8_t *buf;
+	size_t len;
 } config_t;
 
-#include "subnet.h"
+typedef bool (*config_scan_action_t)(struct meshlink_handle *mesh, const char *name, void *arg);
+
+extern bool config_read_file(struct meshlink_handle *mesh, FILE *f, struct config_t *, const void *key) __attribute__((__warn_unused_result__));
+extern bool config_write_file(struct meshlink_handle *mesh, FILE *f, const struct config_t *, const void *key) __attribute__((__warn_unused_result__));
+extern void config_free(struct config_t *config);
+
+extern bool meshlink_confbase_exists(struct meshlink_handle *mesh) __attribute__((__warn_unused_result__));
 
-extern splay_tree_t *config_tree;
+extern bool config_init(struct meshlink_handle *mesh, const char *conf_subdir) __attribute__((__warn_unused_result__));
+extern bool config_destroy(const char *confbase, const char *conf_subdir) __attribute__((__warn_unused_result__));
+extern bool config_copy(struct meshlink_handle *mesh, const char *src_dir_name, const void *src_key, const char *dst_dir_name, const void *dst_key) __attribute__((__warn_unused_result__));
+extern bool config_rename(struct meshlink_handle *mesh, const char *old_conf_subdir, const char *new_conf_subdir) __attribute__((__warn_unused_result__));
+extern bool config_sync(struct meshlink_handle *mesh, const char *conf_subdir) __attribute__((__warn_unused_result__));
+extern bool sync_path(const char *path) __attribute__((__warn_unused_result__));
 
-extern int pinginterval;
-extern int pingtimeout;
-extern int maxtimeout;
-extern bool bypass_security;
-extern char *confbase;
-extern char *netname;
+extern bool main_config_exists(struct meshlink_handle *mesh, const char *conf_subdir) __attribute__((__warn_unused_result__));
+extern bool main_config_lock(struct meshlink_handle *mesh) __attribute__((__warn_unused_result__));
+extern void main_config_unlock(struct meshlink_handle *mesh);
+extern bool main_config_read(struct meshlink_handle *mesh, const char *conf_subdir, struct config_t *, void *key) __attribute__((__warn_unused_result__));
+extern bool main_config_write(struct meshlink_handle *mesh, const char *conf_subdir, const struct config_t *, void *key) __attribute__((__warn_unused_result__));
 
-extern void init_configuration(splay_tree_t **);
-extern void exit_configuration(splay_tree_t **);
-extern config_t *new_config(void) __attribute__ ((__malloc__));
-extern void free_config(config_t *);
-extern void config_add(splay_tree_t *, config_t *);
-extern config_t *lookup_config(splay_tree_t *, char *);
-extern config_t *lookup_config_next(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 get_config_string(const config_t *, char **);
-extern bool get_config_address(const config_t *, struct addrinfo **);
-extern bool get_config_subnet(const config_t *, struct subnet_t **);
+extern bool config_exists(struct meshlink_handle *mesh, const char *conf_subdir, const char *name) __attribute__((__warn_unused_result__));
+extern bool config_read(struct meshlink_handle *mesh, const char *conf_subdir, const char *name, struct config_t *, void *key) __attribute__((__warn_unused_result__));
+extern bool config_write(struct meshlink_handle *mesh, const char *conf_subdir, const char *name, const struct config_t *, void *key) __attribute__((__warn_unused_result__));
+extern bool config_delete(struct meshlink_handle *mesh, const char *conf_subdir, const char *name) __attribute__((__warn_unused_result__));
+extern bool config_scan_all(struct meshlink_handle *mesh, const char *conf_subdir, const char *conf_type, config_scan_action_t action, void *arg) __attribute__((__warn_unused_result__));
 
-extern int read_config_file(splay_tree_t *, const char *);
-extern bool read_server_config(void);
-extern FILE *ask_and_open(const char *, const char *, const char *);
-extern bool is_safe_path(const char *);
-extern bool disable_old_keys(FILE *);
+extern bool invitation_read(struct meshlink_handle *mesh, const char *conf_subdir, const char *name, struct config_t *, void *key) __attribute__((__warn_unused_result__));
+extern bool invitation_write(struct meshlink_handle *mesh, const char *conf_subdir, const char *name, const struct config_t *, void *key) __attribute__((__warn_unused_result__));
+extern size_t invitation_purge_old(struct meshlink_handle *mesh, time_t deadline);
 
-#endif							/* __TINC_CONF_H__ */
+#endif