X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fconf.h;h=b7d8cb2bdd87f239e7a98152e1746562044950cc;hb=fe88f9a979110acb8acc6500444678d49e068bc5;hp=4f39b20ac9133dcfd3fc03dd3598ee17012c4e4d;hpb=cc3c69c892b0dad9a6ece0a0f4ccd429a22fcbff;p=meshlink

diff --git a/src/conf.h b/src/conf.h
index 4f39b20a..b7d8cb2b 100644
--- a/src/conf.h
+++ b/src/conf.h
@@ -1,7 +1,6 @@
 /*
     conf.h -- header for conf.c
-    Copyright (C) 1998-2005 Ivo Timmermans
-                  2000-2013 Guus Sliepen <guus@tinc-vpn.org>
+    Copyright (C) 2014 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
@@ -21,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;
@@ -31,34 +31,23 @@ typedef struct config_t {
 	int line;
 } config_t;
 
-#include "subnet.h"
-
-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 void init_configuration(splay_tree_t **);
-extern void exit_configuration(splay_tree_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__));
 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 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 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 config_t *parse_config_line(char *, const char *, int);
-extern bool read_config_file(splay_tree_t *, const char *);
-extern void read_config_options(splay_tree_t *, const char *);
-extern bool read_server_config(void);
-extern bool read_host_config(splay_tree_t *, const char *);
-extern bool append_config_file(const char *, const char *, const char *);
+extern bool read_config_file(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 append_config_file(struct meshlink_handle *mesh, const char *, const char *, const char *);
 
 #endif /* __TINC_CONF_H__ */