X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fconf.h;h=62204794b26d19beb5ccf3a8330f2df0dac5dedb;hb=6123ed30992d671b94fc016660086be6a62a3871;hp=743851a70b9b7cade29f0802c23393c08c4b4af3;hpb=1d9dacb1f26971e19463b5501c2410c57f780ecb;p=tinc

diff --git a/src/conf.h b/src/conf.h
index 743851a7..62204794 100644
--- a/src/conf.h
+++ b/src/conf.h
@@ -1,7 +1,10 @@
+#ifndef TINC_CONF_H
+#define TINC_CONF_H
+
 /*
     conf.h -- header for conf.c
     Copyright (C) 1998-2005 Ivo Timmermans
-                  2000-2012 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2013 Guus Sliepen <guus@tinc-vpn.org>
 
     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
@@ -18,11 +21,9 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __TINC_CONF_H__
-#define __TINC_CONF_H__
-
-#include "splay_tree.h"
 #include "list.h"
+#include "splay_tree.h"
+#include "subnet.h"
 
 typedef struct config_t {
 	char *variable;
@@ -31,7 +32,6 @@ typedef struct config_t {
 	int line;
 } config_t;
 
-#include "subnet.h"
 
 extern splay_tree_t *config_tree;
 
@@ -39,13 +39,11 @@ extern int pinginterval;
 extern int pingtimeout;
 extern int maxtimeout;
 extern bool bypass_security;
-extern char *confbase;
-extern char *netname;
 extern list_t *cmdline_conf;
 
 extern void init_configuration(splay_tree_t **);
 extern void exit_configuration(splay_tree_t **);
-extern config_t *new_config(void) __attribute__ ((__malloc__));
+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 *);
@@ -57,10 +55,10 @@ 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 bool read_config_file(splay_tree_t *, const char *, bool verbose);
 extern void read_config_options(splay_tree_t *, const char *);
 extern bool read_server_config(void);
-extern bool read_connection_config(struct connection_t *);
+extern bool read_host_config(splay_tree_t *, const char *, bool verbose);
 extern bool append_config_file(const char *, const char *, const char *);
 
-#endif							/* __TINC_CONF_H__ */
+#endif