X-Git-Url: http://git.meshlink.io/?p=meshlink;a=blobdiff_plain;f=src%2Fconf.h;h=2f79834ac7a0e09dc2c4b581306f919a0b9e823a;hp=f2bb076201e7e21cc9089eced03ef908d6143093;hb=963c5055505f2fc117cd5efa06eaa02c9b2bf85d;hpb=fa05f996c5500c056a36c1d43e33a407f876643c

diff --git a/src/conf.h b/src/conf.h
index f2bb0762..2f79834a 100644
--- a/src/conf.h
+++ b/src/conf.h
@@ -27,25 +27,35 @@ typedef struct config_t {
 	size_t len;
 } config_t;
 
-//extern bool config_read_file(struct meshlink_handle *mesh, FILE *f, struct config_t *);
-//extern bool config_write_file(struct meshlink_handle *mesh, FILE *f, const struct config_t *);
+typedef bool (*config_scan_action_t)(struct meshlink_handle *mesh, const char *name, void *arg);
+
+extern bool config_read_file(struct meshlink_handle *mesh, FILE *f, struct config_t *, const void *key) __attribute__((__warn_unused_result__));
+extern bool config_write_file(struct meshlink_handle *mesh, FILE *f, const struct config_t *, const void *key) __attribute__((__warn_unused_result__));
 extern void config_free(struct config_t *config);
 
-extern bool config_init(struct meshlink_handle *mesh);
-extern bool config_destroy(const char *confbase);
+extern bool meshlink_confbase_exists(struct meshlink_handle *mesh) __attribute__((__warn_unused_result__));
+
+extern bool config_init(struct meshlink_handle *mesh, const char *conf_subdir) __attribute__((__warn_unused_result__));
+extern bool config_destroy(const char *confbase, const char *conf_subdir) __attribute__((__warn_unused_result__));
+extern bool config_copy(struct meshlink_handle *mesh, const char *src_dir_name, const void *src_key, const char *dst_dir_name, const void *dst_key) __attribute__((__warn_unused_result__));
+extern bool config_rename(struct meshlink_handle *mesh, const char *old_conf_subdir, const char *new_conf_subdir) __attribute__((__warn_unused_result__));
+extern bool config_sync(struct meshlink_handle *mesh, const char *conf_subdir) __attribute__((__warn_unused_result__));
+extern bool sync_path(const char *path) __attribute__((__warn_unused_result__));
 
-extern bool main_config_exists(struct meshlink_handle *mesh);
-extern bool main_config_lock(struct meshlink_handle *mesh);
+extern bool main_config_exists(struct meshlink_handle *mesh, const char *conf_subdir) __attribute__((__warn_unused_result__));
+extern bool main_config_lock(struct meshlink_handle *mesh) __attribute__((__warn_unused_result__));
 extern void main_config_unlock(struct meshlink_handle *mesh);
-extern bool main_config_read(struct meshlink_handle *mesh, struct config_t *);
-extern bool main_config_write(struct meshlink_handle *mesh, const struct config_t *);
+extern bool main_config_read(struct meshlink_handle *mesh, const char *conf_subdir, struct config_t *, void *key) __attribute__((__warn_unused_result__));
+extern bool main_config_write(struct meshlink_handle *mesh, const char *conf_subdir, const struct config_t *, void *key) __attribute__((__warn_unused_result__));
 
-extern bool config_exists(struct meshlink_handle *mesh, const char *name);
-extern bool config_read(struct meshlink_handle *mesh, const char *name, struct config_t *);
-extern bool config_write(struct meshlink_handle *mesh, const char *name, const struct config_t *);
+extern bool config_exists(struct meshlink_handle *mesh, const char *conf_subdir, const char *name) __attribute__((__warn_unused_result__));
+extern bool config_read(struct meshlink_handle *mesh, const char *conf_subdir, const char *name, struct config_t *, void *key) __attribute__((__warn_unused_result__));
+extern bool config_write(struct meshlink_handle *mesh, const char *conf_subdir, const char *name, const struct config_t *, void *key) __attribute__((__warn_unused_result__));
+extern bool config_delete(struct meshlink_handle *mesh, const char *conf_subdir, const char *name) __attribute__((__warn_unused_result__));
+extern bool config_scan_all(struct meshlink_handle *mesh, const char *conf_subdir, const char *conf_type, config_scan_action_t action, void *arg) __attribute__((__warn_unused_result__));
 
-extern bool invitation_read(struct meshlink_handle *mesh, const char *name, struct config_t *);
-extern bool invitation_write(struct meshlink_handle *mesh, const char *name, const struct config_t *);
+extern bool invitation_read(struct meshlink_handle *mesh, const char *conf_subdir, const char *name, struct config_t *, void *key) __attribute__((__warn_unused_result__));
+extern bool invitation_write(struct meshlink_handle *mesh, const char *conf_subdir, const char *name, const struct config_t *, void *key) __attribute__((__warn_unused_result__));
 extern size_t invitation_purge_old(struct meshlink_handle *mesh, time_t deadline);
 
 #endif