X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fconf.h;h=fd48ea64feb515b8cd94cf34a2cb70aed687b7db;hb=f0d03b570cf72570573b76d74c2700ab60abda93;hp=63097c3f4301f36b5901d960ebe30105d0c967f2;hpb=722dc566a68a4d81c217a8023967cc3bda78c680;p=meshlink diff --git a/src/conf.h b/src/conf.h index 63097c3f..fd48ea64 100644 --- a/src/conf.h +++ b/src/conf.h @@ -1,6 +1,9 @@ +#ifndef MESHLINK_CONF_H +#define MESHLINK_CONF_H + /* conf.h -- header for conf.c - Copyright (C) 2014 Guus Sliepen + Copyright (C) 2014, 2017 Guus Sliepen 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 @@ -17,11 +20,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 "meshlink_internal.h" +#include "splay_tree.h" typedef struct config_t { char *variable; @@ -30,30 +31,28 @@ typedef struct config_t { int line; } config_t; -extern struct splay_tree_t *config_tree; - -extern int pinginterval; -extern int pingtimeout; -extern int maxtimeout; -extern bool bypass_security; - 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 config_t *new_config(void) __attribute__((__malloc__)); extern void free_config(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 set_config_int(config_t *, int); extern bool get_config_string(const config_t *, char **); +extern bool set_config_string(config_t *, const char *); 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 write_config_file(const 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 write_host_config(struct meshlink_handle *mesh, const struct splay_tree_t *, const char *); +extern bool modify_config_file(struct meshlink_handle *mesh, const char *name, const char *key, const char *value, int trim); +extern bool append_config_file(struct meshlink_handle *mesh, const char *name, const char *key, const char *value); -#endif /* __TINC_CONF_H__ */ +#endif