Stop using global variable mesh in conf.[ch].

[meshlink] / src / conf.h

diff --git a/src/conf.h b/src/conf.h
index 39eb056cb98e7546253b6827d79ec17a6c1a09ab..b7d8cb2bdd87f239e7a98152e1746562044950cc 100644 (file)
--- a/src/conf.h
+++ b/src/conf.h
@@ -20,8 +20,9 @@
 #ifndef __TINC_CONF_H__
 #define __TINC_CONF_H__
 
-#include "splay_tree.h"
 #include "list.h"
+#include "meshlink_internal.h"
+#include "splay_tree.h"
 
 typedef struct config_t {
        char *variable;
@@ -30,7 +31,6 @@ typedef struct config_t {
        int line;
 } config_t;
 
-
 extern void init_configuration(struct splay_tree_t **);
 extern void exit_configuration(struct splay_tree_t **);
 extern config_t *new_config(void) __attribute__ ((__malloc__));
@@ -45,9 +45,9 @@ 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 read_server_config(struct meshlink_handle *mesh);
+extern bool read_host_config(struct meshlink_handle *mesh, 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__ */