diff options
| author | Inga Stotland <inga.stotland@intel.com> | 2019-07-14 16:23:17 -0700 |
|---|---|---|
| committer | Brian Gix <brian.gix@intel.com> | 2019-07-15 14:48:04 -0700 |
| commit | d57524629036a4bbbe183b6a32afa02a87fe489d (patch) | |
| tree | 4175d37a786eed74f108823dfc6ba1b068cc1d64 /mesh/appkey.c | |
| parent | c4bf0626fb621559ecaea7e1eadf22d386b7ee63 (diff) | |
| download | bluez-d57524629036a4bbbe183b6a32afa02a87fe489d.tar.gz | |
mesh: Use mesh_config APIs to store node configuration
This eliminates storage_set...() routines as an intermediate
layer between mesh_config layer and the rest of the daemon when
storing updated node configuration values.
For the JSON based implementation, each call to mesh_config_write...()
routines results in writing to the node configuration file.
Diffstat (limited to 'mesh/appkey.c')
| -rw-r--r-- | mesh/appkey.c | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/mesh/appkey.c b/mesh/appkey.c index 412a2c48c..286a77e98 100644 --- a/mesh/appkey.c +++ b/mesh/appkey.c @@ -31,7 +31,7 @@ #include "mesh/crypto.h" #include "mesh/util.h" #include "mesh/model.h" -#include "mesh/storage.h" +#include "mesh/mesh-config.h" #include "mesh/appkey.h" struct mesh_app_key { @@ -368,6 +368,7 @@ int appkey_key_update(struct mesh_net *net, uint16_t net_idx, uint16_t app_idx, struct mesh_app_key *key; struct l_queue *app_keys; uint8_t phase = KEY_REFRESH_PHASE_NONE; + struct mesh_node *node; app_keys = mesh_net_get_app_keys(net); if (!app_keys) @@ -395,7 +396,10 @@ int appkey_key_update(struct mesh_net *net, uint16_t net_idx, uint16_t app_idx, if (!set_key(key, app_idx, new_key, true)) return MESH_STATUS_INSUFF_RESOURCES; - if (!storage_app_key_add(net, net_idx, app_idx, new_key, true)) + node = mesh_net_node_get(net); + + if (!mesh_config_app_key_update(node_config_get(node), app_idx, + new_key)) return MESH_STATUS_STORAGE_FAIL; return MESH_STATUS_SUCCESS; @@ -406,6 +410,7 @@ int appkey_key_add(struct mesh_net *net, uint16_t net_idx, uint16_t app_idx, { struct mesh_app_key *key; struct l_queue *app_keys; + struct mesh_node *node; app_keys = mesh_net_get_app_keys(net); if (!app_keys) @@ -432,7 +437,10 @@ int appkey_key_add(struct mesh_net *net, uint16_t net_idx, uint16_t app_idx, return MESH_STATUS_INSUFF_RESOURCES; } - if (!storage_app_key_add(net, net_idx, app_idx, new_key, false)) { + node = mesh_net_node_get(net); + + if (!mesh_config_app_key_add(node_config_get(node), net_idx, app_idx, + new_key)) { appkey_key_free(key); return MESH_STATUS_STORAGE_FAIL; } @@ -451,6 +459,7 @@ int appkey_key_delete(struct mesh_net *net, uint16_t net_idx, { struct mesh_app_key *key; struct l_queue *app_keys; + struct mesh_node *node; app_keys = mesh_net_get_app_keys(net); if (!app_keys) @@ -469,7 +478,9 @@ int appkey_key_delete(struct mesh_net *net, uint16_t net_idx, l_queue_remove(app_keys, key); appkey_key_free(key); - if (!storage_app_key_del(net, net_idx, app_idx)) + node = mesh_net_node_get(net); + + if (!mesh_config_app_key_del(node_config_get(node), net_idx, app_idx)) return MESH_STATUS_STORAGE_FAIL; return MESH_STATUS_SUCCESS; |