-extern char *confbase;
-extern char *netname;
-
-extern void init_configuration(avl_tree_t **);
-extern void exit_configuration(avl_tree_t **);
-extern config_t *new_config(void) __attribute__ ((__malloc__));
-extern void free_config(config_t *);
-extern void config_add(avl_tree_t *, config_t *);
-extern config_t *lookup_config(avl_tree_t *, char *);
-extern config_t *lookup_config_next(avl_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 int read_config_file(avl_tree_t *, const char *);
-extern bool read_server_config(void);
-extern FILE *ask_and_open(const char *, const char *, const char *);
-extern bool is_safe_path(const char *);
-
-#endif /* __TINC_CONF_H__ */
+extern list_t cmdline_conf;
+
+extern splay_tree_t *create_configuration();
+extern void init_configuration(splay_tree_t *);
+extern void exit_configuration(splay_tree_t **config_tree);
+extern config_t *new_config(void) __attribute__((__malloc__));
+extern void free_config(config_t *config);
+extern void config_add(splay_tree_t *config_tree, config_t *config);
+extern config_t *lookup_config(splay_tree_t *config_tree, char *variable);
+extern config_t *lookup_config_next(splay_tree_t *config_tree, const config_t *config);
+extern bool get_config_bool(const config_t *config, bool *result);
+extern bool get_config_int(const config_t *config, int *result);
+extern bool get_config_string(const config_t *config, char **result);
+extern bool get_config_address(const config_t *config, struct addrinfo **result);
+
+extern config_t *parse_config_line(char *line, const char *fname, int lineno);
+extern bool read_config_file(splay_tree_t *config_tree, const char *filename, bool verbose);
+extern void read_config_options(splay_tree_t *config_tree, const char *prefix);
+extern bool read_server_config(splay_tree_t *config_tree);
+extern bool read_host_config(splay_tree_t *config_tree, const char *name, bool verbose);
+extern bool append_config_file(const char *name, const char *key, const char *value);
+
+#endif