Diff between 5651fc8bf55cc687c13bd08309c1d9fd26968503 and eb8ffa0f972144163576402aee59de6035f7701f

Changed Files

File Additions Deletions Status
mesh/mesh-config-json.c +10 -10 modified
mesh/mesh-config.h +8 -12 modified

Full Patch

diff --git a/mesh/mesh-config-json.c b/mesh/mesh-config-json.c
index 86e7d87..d8f067b 100644
--- a/mesh/mesh-config-json.c
+++ b/mesh/mesh-config-json.c
@@ -739,7 +739,7 @@ bool mesh_config_net_key_del(struct mesh_config *cfg, uint16_t idx)
 	return save_config(jnode, cfg->node_dir_path);
 }
 
-bool mesh_config_write_device_key(struct mesh_config *cfg, uint8_t *key)
+bool mesh_config_write_device_key(struct mesh_config *cfg, const uint8_t *key)
 {
 	if (!cfg || !add_key_value(cfg->jnode, deviceKey, key))
 		return false;
@@ -747,7 +747,7 @@ bool mesh_config_write_device_key(struct mesh_config *cfg, uint8_t *key)
 	return save_config(cfg->jnode, cfg->node_dir_path);
 }
 
-bool mesh_config_write_candidate(struct mesh_config *cfg, uint8_t *key)
+bool mesh_config_write_candidate(struct mesh_config *cfg, const uint8_t *key)
 {
 	if (!cfg || !add_key_value(cfg->jnode, deviceCan, key))
 		return false;
@@ -782,7 +782,7 @@ bool mesh_config_finalize_candidate(struct mesh_config *cfg)
 	return save_config(cfg->jnode, cfg->node_dir_path);
 }
 
-bool mesh_config_write_token(struct mesh_config *cfg, uint8_t *token)
+bool mesh_config_write_token(struct mesh_config *cfg, const uint8_t *token)
 {
 	if (!cfg || !add_u64_value(cfg->jnode, "token", token))
 		return false;
@@ -2005,7 +2005,7 @@ bool mesh_config_net_key_set_phase(struct mesh_config *cfg, uint16_t idx,
 
 bool mesh_config_model_pub_add(struct mesh_config *cfg, uint16_t ele_addr,
 					uint32_t mod_id, bool vendor,
-					struct mesh_config_pub *pub)
+					const struct mesh_config_pub *pub)
 {
 	json_object *jnode, *jmodel, *jpub, *jrtx;
 	bool res;
@@ -2146,7 +2146,7 @@ void mesh_config_comp_page_del(struct mesh_config *cfg, uint8_t page)
 }
 
 bool mesh_config_comp_page_add(struct mesh_config *cfg, uint8_t page,
-						uint8_t *data, uint16_t size)
+					const uint8_t *data, uint16_t size)
 {
 	json_object *jnode, *jstring, *jarray = NULL;
 	char *buf;
@@ -2167,7 +2167,7 @@ bool mesh_config_comp_page_add(struct mesh_config *cfg, uint8_t page,
 		return false;
 	}
 
-	hex2str(data, size, buf + 2, len - 2);
+	hex2str((uint8_t *)data, size, buf + 2, len - 2);
 
 	if (jarray && jarray_has_string(jarray, buf, len)) {
 		l_free(buf);
@@ -2187,7 +2187,7 @@ bool mesh_config_comp_page_add(struct mesh_config *cfg, uint8_t page,
 
 bool mesh_config_model_sub_add(struct mesh_config *cfg, uint16_t ele_addr,
 						uint32_t mod_id, bool vendor,
-						struct mesh_config_sub *sub)
+					const struct mesh_config_sub *sub)
 {
 	json_object *jnode, *jmodel, *jstring, *jarray = NULL;
 	int ele_idx, len;
@@ -2211,7 +2211,7 @@ bool mesh_config_model_sub_add(struct mesh_config *cfg, uint16_t ele_addr,
 		if (len < 0)
 			return false;
 	} else {
-		hex2str(sub->addr.label, 16, buf, 33);
+		hex2str((uint8_t *)sub->addr.label, 16, buf, 33);
 		len = 32;
 	}
 
@@ -2239,7 +2239,7 @@ bool mesh_config_model_sub_add(struct mesh_config *cfg, uint16_t ele_addr,
 
 bool mesh_config_model_sub_del(struct mesh_config *cfg, uint16_t ele_addr,
 						uint32_t mod_id, bool vendor,
-						struct mesh_config_sub *sub)
+					const struct mesh_config_sub *sub)
 {
 	json_object *jnode, *jmodel, *jarray;
 	char buf[33];
@@ -2266,7 +2266,7 @@ bool mesh_config_model_sub_del(struct mesh_config *cfg, uint16_t ele_addr,
 		if (len < 0)
 			return false;
 	} else {
-		hex2str(sub->addr.label, 16, buf, 33);
+		hex2str((uint8_t *)sub->addr.label, 16, buf, 33);
 		len = 32;
 	}
 
diff --git a/mesh/mesh-config.h b/mesh/mesh-config.h
index 3cb20b8..b320116 100644
--- a/mesh/mesh-config.h
+++ b/mesh/mesh-config.h
@@ -128,15 +128,11 @@ struct mesh_config *mesh_config_create(const char *cfgdir_name,
 
 bool mesh_config_write_net_transmit(struct mesh_config *cfg, uint8_t cnt,
 							uint16_t interval);
-bool mesh_config_write_device_key(struct mesh_config *cfg, uint8_t *key);
-bool mesh_config_write_candidate(struct mesh_config *cfg, uint8_t *key);
+bool mesh_config_write_device_key(struct mesh_config *cfg, const uint8_t *key);
+bool mesh_config_write_candidate(struct mesh_config *cfg, const uint8_t *key);
 bool mesh_config_read_candidate(struct mesh_config *cfg, uint8_t *key);
 bool mesh_config_finalize_candidate(struct mesh_config *cfg);
-bool mesh_config_write_token(struct mesh_config *cfg, uint8_t *token);
-bool mesh_config_write_network_key(struct mesh_config *cfg, uint16_t idx,
-				uint8_t *key, uint8_t *new_key, int phase);
-bool mesh_config_write_app_key(struct mesh_config *cfg, uint16_t net_idx,
-			uint16_t app_idx, uint8_t *key, uint8_t *new_key);
+bool mesh_config_write_token(struct mesh_config *cfg, const uint8_t *token);
 bool mesh_config_write_seq_number(struct mesh_config *cfg, uint32_t seq,
 								bool cache);
 bool mesh_config_write_unicast(struct mesh_config *cfg, uint16_t unicast);
@@ -150,7 +146,7 @@ bool mesh_config_write_mode(struct mesh_config *cfg, const char *keyword,
 bool mesh_config_write_mode_ex(struct mesh_config *cfg, const char *keyword,
 							int value, bool save);
 bool mesh_config_comp_page_add(struct mesh_config *cfg, uint8_t page,
-						uint8_t *data, uint16_t size);
+					const uint8_t *data, uint16_t size);
 void mesh_config_comp_page_del(struct mesh_config *cfg, uint8_t page);
 bool mesh_config_model_binding_add(struct mesh_config *cfg, uint16_t ele_addr,
 						uint32_t mod_id, bool vendor,
@@ -159,16 +155,16 @@ bool mesh_config_model_binding_del(struct mesh_config *cfg, uint16_t ele_addr,
 						uint32_t mod_id, bool vendor,
 							uint16_t app_idx);
 bool mesh_config_model_pub_add(struct mesh_config *cfg, uint16_t ele_addr,
-						uint32_t mod_id, bool vendor,
-						struct mesh_config_pub *pub);
+					uint32_t mod_id, bool vendor,
+					const struct mesh_config_pub *pub);
 bool mesh_config_model_pub_del(struct mesh_config *cfg, uint16_t ele_addr,
 						uint32_t mod_id, bool vendor);
 bool mesh_config_model_sub_add(struct mesh_config *cfg, uint16_t ele_addr,
 						uint32_t mod_id, bool vendor,
-						struct mesh_config_sub *sub);
+					const struct mesh_config_sub *sub);
 bool mesh_config_model_sub_del(struct mesh_config *cfg, uint16_t ele_addr,
 						uint32_t mod_id, bool vendor,
-						struct mesh_config_sub *sub);
+					const struct mesh_config_sub *sub);
 bool mesh_config_model_sub_del_all(struct mesh_config *cfg, uint16_t ele_addr,
 						uint32_t mod_id, bool vendor);
 bool mesh_config_model_pub_enable(struct mesh_config *cfg, uint16_t ele_addr,