Modify meshlink configuration base file structre

[meshlink] / src / conf.h

diff --git a/src/conf.h b/src/conf.h
index 63d5fef4aef369143af63faa1f9a2a20853852fe..93ee5bb9bebb3f0b5f32ea8a9febf82c90f55b8b 100644 (file)
--- a/src/conf.h
+++ b/src/conf.h
@@ -27,28 +27,32 @@ typedef struct config_t {
        size_t len;
 } config_t;
 
-typedef void (*config_scan_action_t)(struct meshlink_handle *mesh, const char *name);
+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 *);
-//extern bool config_write_file(struct meshlink_handle *mesh, FILE *f, const struct config_t *);
+extern bool config_read_file(struct meshlink_handle *mesh, FILE *f, struct config_t *, const void *key);
+extern bool config_write_file(struct meshlink_handle *mesh, FILE *f, const struct config_t *, const void *key);
 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);
 
-extern bool main_config_exists(struct meshlink_handle *mesh);
+extern bool config_init(struct meshlink_handle *mesh, const char *conf_subdir);
+extern bool config_destroy(const char *confbase, const char *conf_subdir);
+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);
+extern bool config_rename(struct meshlink_handle *mesh, const char *old_conf_subdir, const char *new_conf_subdir);
+
+extern bool main_config_exists(struct meshlink_handle *mesh, const char *conf_subdir);
 extern bool main_config_lock(struct meshlink_handle *mesh);
 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);
+extern bool main_config_write(struct meshlink_handle *mesh, const char *conf_subdir, const struct config_t *, void *key);
 
-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 void config_scan_all(struct meshlink_handle *mesh, config_scan_action_t action);
+extern bool config_exists(struct meshlink_handle *mesh, const char *conf_subdir, const char *name);
+extern bool config_read(struct meshlink_handle *mesh, const char *conf_subdir, const char *name, struct config_t *, void *key);
+extern bool config_write(struct meshlink_handle *mesh, const char *conf_subdir, const char *name, const struct config_t *, void *key);
+extern bool config_scan_all(struct meshlink_handle *mesh, const char *conf_subdir, const char *conf_type, config_scan_action_t action, void *arg);
 
-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);
+extern bool invitation_write(struct meshlink_handle *mesh, const char *conf_subdir, const char *name, const struct config_t *, void *key);
 extern size_t invitation_purge_old(struct meshlink_handle *mesh, time_t deadline);
 
 #endif