From 3b58e79f142341e52f78ee1dc0f88bd4ea2e9254 Mon Sep 17 00:00:00 2001 From: Inga Stotland Date: Sun, 14 Jul 2019 16:23:16 -0700 Subject: [PATCH] mesh: Replace storage_save_config with mesh_config_save_config This moves writing out of node configuration from storage.c down to mesh-config-.c to allow for more generic storage layout. New generalized API in mesh-config.h: mesh_config_save_config(struct mesh_config *cfg, bool no_wait, mesh_config_status_func_t cb, void *user_data) replaces the old one in storage.h: storage_save_config(struct mesh_node *node, bool no_wait, mesh_status_func_t cb, void *user_data) Currently, only JSON format is supported for storing node configuration: mesh_config_save_config is implemented in mesh-config-json.c Change-Id: I6ecb77332911bdb6a6ae18feedb8cae40b2832ff Signed-off-by: Anupam Roy --- mesh/mesh-config-json.c | 70 ++++++++++++++++++++++++++++++++++++----- mesh/mesh-config.h | 9 +++--- mesh/node.c | 6 ++-- mesh/storage.c | 82 ++++++++----------------------------------------- mesh/storage.h | 2 -- 5 files changed, 84 insertions(+), 85 deletions(-) diff --git a/mesh/mesh-config-json.c b/mesh/mesh-config-json.c index 4990d4b..32250d8 100644 --- a/mesh/mesh-config-json.c +++ b/mesh/mesh-config-json.c @@ -48,6 +48,15 @@ struct mesh_config { uint8_t uuid[16]; }; +struct write_info { + struct mesh_config *cfg; + void *user_data; + mesh_config_status_func_t cb; +}; + +static const char *bak_ext = ".bak"; +static const char *tmp_ext = ".tmp"; + static bool get_int(json_object *jobj, const char *keyword, int *value) { json_object *jvalue; @@ -1928,7 +1937,7 @@ bool mesh_config_model_sub_del_all(struct mesh_config *cfg, uint16_t addr, } bool mesh_config_load_node(const char *cfg_path, const uint8_t uuid[16], - mesh_config_node_cb cb, void *user_data) + mesh_config_node_func_t cb, void *user_data) { int fd; char *str; @@ -2013,23 +2022,19 @@ void mesh_config_release(struct mesh_config *cfg) l_free(cfg); } -bool mesh_config_save_config(struct mesh_config *cfg, const char *fname) +static bool save_config(json_object *jnode, const char *fname) { FILE *outfile; const char *str; bool result = false; - if (!cfg) - return false; - outfile = fopen(fname, "w"); if (!outfile) { l_error("Failed to save configuration to %s", fname); return false; } - str = json_object_to_json_string_ext(cfg->jnode, - JSON_C_TO_STRING_PRETTY); + str = json_object_to_json_string_ext(jnode, JSON_C_TO_STRING_PRETTY); if (fwrite(str, sizeof(char), strlen(str), outfile) < strlen(str)) l_warn("Incomplete write of mesh configuration"); @@ -2040,3 +2045,54 @@ bool mesh_config_save_config(struct mesh_config *cfg, const char *fname) return result; } + +static void idle_save_config(void *user_data) +{ + struct write_info *info = user_data; + char *fname_tmp, *fname_bak, *fname_cfg; + bool result = false; + + fname_cfg = info->cfg->node_path; + fname_tmp = l_strdup_printf("%s%s", fname_cfg, tmp_ext); + fname_bak = l_strdup_printf("%s%s", fname_cfg, bak_ext); + remove(fname_tmp); + + result = save_config(info->cfg->jnode, fname_tmp); + + if (result) { + remove(fname_bak); + rename(fname_cfg, fname_bak); + rename(fname_tmp, fname_cfg); + } + + remove(fname_tmp); + + l_free(fname_tmp); + l_free(fname_bak); + + if (info->cb) + info->cb(info->user_data, result); + + l_free(info); +} + +bool mesh_config_save_config(struct mesh_config *cfg, bool no_wait, + mesh_config_status_func_t cb, void *user_data) +{ + struct write_info *info; + + if (!cfg) + return false; + + info = l_new(struct write_info, 1); + info->cfg = cfg; + info->cb = cb; + info->user_data = user_data; + + if (no_wait) + idle_save_config(info); + else + l_idle_oneshot(idle_save_config, info, NULL); + + return true; +} diff --git a/mesh/mesh-config.h b/mesh/mesh-config.h index 8d01e76..5241dde 100644 --- a/mesh/mesh-config.h +++ b/mesh/mesh-config.h @@ -104,16 +104,17 @@ struct mesh_config_node { uint8_t dev_key[16]; uint8_t token[8]; }; - -typedef bool (*mesh_config_node_cb)(struct mesh_config_node *node, +typedef void (*mesh_config_status_func_t)(void *user_data, bool result); +typedef bool (*mesh_config_node_func_t)(struct mesh_config_node *node, const uint8_t uuid[16], struct mesh_config *cfg, void *user_data); bool mesh_config_load_node(const char *cfg_path, const uint8_t uuid[16], - mesh_config_node_cb cb, void *user_data); + mesh_config_node_func_t cb, void *user_data); void mesh_config_release(struct mesh_config *cfg); -bool mesh_config_save_config(struct mesh_config *cfg, const char *fname); +bool mesh_config_save_config(struct mesh_config *cfg, bool no_wait, + mesh_config_status_func_t cb, void *user_data); struct mesh_config *mesh_config_create(const char *cfg_path, const uint8_t uuid[16], struct mesh_config_node *node); diff --git a/mesh/node.c b/mesh/node.c index 93add35..cd5ca7b 100644 --- a/mesh/node.c +++ b/mesh/node.c @@ -486,12 +486,12 @@ static void cleanup_node(void *data) struct mesh_net *net = node->net; /* Save local node configuration */ - if (node->node_path) { + if (node->cfg) { /* Preserve the last sequence number */ storage_write_sequence_number(net, mesh_net_get_seq_num(net)); - storage_save_config(node, true, NULL, NULL); + mesh_config_save_config(node->cfg, true, NULL, NULL); } free_node_resources(node); @@ -1503,7 +1503,7 @@ static bool add_local_node(struct mesh_node *node, uint16_t unicast, bool kr, return false; } - storage_save_config(node, true, NULL, NULL); + mesh_config_save_config(node->cfg, true, NULL, NULL); /* Initialize configuration server model */ mesh_config_srv_init(node, PRIMARY_ELE_IDX); diff --git a/mesh/storage.c b/mesh/storage.c index 9726e38..14607de 100644 --- a/mesh/storage.c +++ b/mesh/storage.c @@ -38,16 +38,8 @@ #include "mesh/util.h" #include "mesh/storage.h" -struct write_info { - struct mesh_config *cfg; - const char *node_path; - void *user_data; - mesh_status_func_t cb; -}; - static const char *cfg_name = "/node.json"; static const char *bak_ext = ".bak"; -static const char *tmp_ext = ".tmp"; static const char *storage_dir; static bool read_node_cb(struct mesh_config_node *db_node, @@ -87,7 +79,7 @@ bool storage_set_ttl(struct mesh_node *node, uint8_t ttl) if (!mesh_config_write_int(node_config_get(node), "defaultTTL", ttl)) return false; - storage_save_config(node, true, NULL, NULL); + mesh_config_save_config(node_config_get(node), true, NULL, NULL); return true; } @@ -98,7 +90,7 @@ bool storage_set_relay(struct mesh_node *node, bool enable, interval)) return false; - storage_save_config(node, true, NULL, NULL); + mesh_config_save_config(node_config_get(node), true, NULL, NULL); return true; } @@ -109,7 +101,7 @@ bool storage_set_transmit_params(struct mesh_node *node, uint8_t count, interval)) return false; - storage_save_config(node, true, NULL, NULL); + mesh_config_save_config(node_config_get(node), true, NULL, NULL); return true; } @@ -119,7 +111,7 @@ bool storage_set_mode(struct mesh_node *node, uint8_t mode, if (!mesh_config_write_mode(node_config_get(node), mode_name, mode)) return false; - storage_save_config(node, true, NULL, NULL); + mesh_config_save_config(node_config_get(node), true, NULL, NULL); return true; } @@ -144,7 +136,7 @@ bool storage_model_bind(struct mesh_node *node, uint16_t addr, uint32_t mod_id, mod_id, app_idx); if (stored) - storage_save_config(node, true, NULL, NULL); + mesh_config_save_config(cfg, true, NULL, NULL); return stored; } @@ -164,7 +156,7 @@ bool storage_app_key_add(struct mesh_net *net, uint16_t net_idx, stored = mesh_config_app_key_add(cfg, net_idx, app_idx, key); if (stored) - storage_save_config(node, true, NULL, NULL); + mesh_config_save_config(cfg, true, NULL, NULL); return stored; } @@ -180,7 +172,7 @@ bool storage_app_key_del(struct mesh_net *net, uint16_t net_idx, if (!mesh_config_app_key_del(cfg, net_idx, app_idx)) return false; - storage_save_config(node, true, NULL, NULL); + mesh_config_save_config(cfg, true, NULL, NULL); return true; } @@ -197,7 +189,7 @@ bool storage_net_key_add(struct mesh_net *net, uint16_t net_idx, stored = mesh_config_net_key_update(cfg, net_idx, key); if (stored) - storage_save_config(node, true, NULL, NULL); + mesh_config_save_config(cfg, true, NULL, NULL); return stored; } @@ -210,7 +202,7 @@ bool storage_net_key_del(struct mesh_net *net, uint16_t net_idx) if (!mesh_config_net_key_del(cfg, net_idx)) return false; - storage_save_config(node, true, NULL, NULL); + mesh_config_save_config(cfg, true, NULL, NULL); return true; } @@ -223,7 +215,7 @@ bool storage_set_iv_index(struct mesh_net *net, uint32_t iv_index, if (!mesh_config_write_iv_index(cfg, iv_index, update)) return false; - storage_save_config(node, true, NULL, NULL); + mesh_config_save_config(cfg, true, NULL, NULL); return true; } @@ -236,7 +228,7 @@ bool storage_set_key_refresh_phase(struct mesh_net *net, uint16_t net_idx, if (!mesh_config_net_key_set_phase(cfg, net_idx, phase)) return false; - storage_save_config(node, true, NULL, NULL); + mesh_config_save_config(cfg, true, NULL, NULL); return true; } @@ -248,58 +240,10 @@ bool storage_write_sequence_number(struct mesh_net *net, uint32_t seq) if (!mesh_config_write_int(cfg, "sequenceNumber", seq)) return false; - storage_save_config(node, false, NULL, NULL); + mesh_config_save_config(cfg, false, NULL, NULL); return true; } -static void idle_save_config(void *user_data) -{ - struct write_info *info = user_data; - char *tmp, *bak, *cfg; - bool result = false; - - cfg = l_strdup_printf("%s%s", info->node_path, cfg_name); - tmp = l_strdup_printf("%s%s", cfg, tmp_ext); - bak = l_strdup_printf("%s%s", cfg, bak_ext); - remove(tmp); - - l_debug("Storage-Wrote"); - result = mesh_config_save_config(info->cfg, tmp); - - if (result) { - remove(bak); - rename(cfg, bak); - rename(tmp, cfg); - } - - remove(tmp); - l_free(tmp); - l_free(bak); - l_free(cfg); - - if (info->cb) - info->cb(info->user_data, result); - - l_free(info); -} - -void storage_save_config(struct mesh_node *node, bool no_wait, - mesh_status_func_t cb, void *user_data) -{ - struct write_info *info; - - info = l_new(struct write_info, 1); - info->cfg = node_config_get(node); - info->node_path = node_path_get(node); - info->cb = cb; - info->user_data = user_data; - - if (no_wait) - idle_save_config(info); - else - l_idle_oneshot(idle_save_config, info, NULL); -} - static int create_dir(const char *dir_name) { struct stat st; @@ -422,7 +366,7 @@ bool storage_create_node_config(struct mesh_node *node, const uint8_t uuid[16], if (!cfg) return false; - if (!mesh_config_save_config(cfg, name_buf)) { + if (!mesh_config_save_config(cfg, true, NULL, NULL)) { mesh_config_release(cfg); return false; } diff --git a/mesh/storage.h b/mesh/storage.h index 1fa48ad..f70544a 100644 --- a/mesh/storage.h +++ b/mesh/storage.h @@ -25,8 +25,6 @@ bool storage_load_nodes(const char *dir); bool storage_create_node_config(struct mesh_node *node, const uint8_t uuid[16], struct mesh_config_node *db_node); void storage_remove_node_config(struct mesh_node *node); -void storage_save_config(struct mesh_node *node, bool no_wait, - mesh_status_func_t cb, void *user_data); bool storage_model_bind(struct mesh_node *node, uint16_t addr, uint32_t id, uint16_t app_idx, bool unbind); -- 2.7.4