-typedef struct internal_config_t {
- char *name;
- enum which_t which;
- int argtype;
-} internal_config_t;
-
-enum {
- stupid_false = 1,
- stupid_true
-};
-
-enum {
- TYPE_NAME = 1,
- TYPE_INT,
- TYPE_IP,
- TYPE_BOOL
-};
-
-extern config_t *config;
-extern int debug_lvl;
-extern int timeout;
-extern int upstreamindex;
-extern int sighup;
-extern char *configfilename;
-
-extern config_t *add_config_val(config_t **, int, char *);
-extern int read_config_file(const char *);
-extern const config_t *get_config_val(which_t type);
-extern const config_t *get_next_config_val(which_t type, int);
-extern void clear_config();
-
-#endif /* __TINC_CONF_H__ */
+#include "subnet.h"
+
+extern splay_tree_t *config_tree;
+
+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 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 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_connection_config(struct connection_t *);
+extern bool append_config_file(const char *, const char *, const char *);
+
+#endif /* __TINC_CONF_H__ */