Merge branch 'channels'

[meshlink] / src / conf.h

diff --git a/src/conf.h b/src/conf.h
index 015bba5bbd6fccc0c97cfe2388dff3db6bedc551..c3cf6f7d642fee59748e4acf92518e95067d32f4 100644 (file)
--- a/src/conf.h
+++ b/src/conf.h
@@ -17,11 +17,12 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __TINC_CONF_H__
-#define __TINC_CONF_H__
+#ifndef __MESHLINK_CONF_H__
+#define __MESHLINK_CONF_H__
 
-#include "splay_tree.h"
 #include "list.h"
+#include "meshlink_internal.h"
+#include "splay_tree.h"
 
 typedef struct config_t {
        char *variable;
@@ -30,11 +31,6 @@ typedef struct config_t {
        int line;
 } config_t;
 
-extern int pinginterval;
-extern int pingtimeout;
-extern int maxtimeout;
-extern bool bypass_security;
-
 extern void init_configuration(struct splay_tree_t **);
 extern void exit_configuration(struct splay_tree_t **);
 extern config_t *new_config(void) __attribute__ ((__malloc__));
@@ -44,14 +40,18 @@ 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 config_t *parse_config_line(char *, const char *, int);
 extern bool read_config_file(struct splay_tree_t *, const char *);
-extern void read_config_options(struct splay_tree_t *, const char *);
-extern bool read_server_config(void);
-extern bool read_host_config(struct splay_tree_t *, const char *);
-extern bool append_config_file(const char *, const char *, const char *);
+extern bool write_config_file(const struct splay_tree_t *, const char *);
+
+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 append_config_file(struct meshlink_handle *mesh, const char *, const char *, const char *);
 
-#endif /* __TINC_CONF_H__ */
+#endif /* __MESHLINK_CONF_H__ */