emgauwa/controller-legacy
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix: rename uuid property to id

Browse source 
add: WIP discovery stuff
This commit is contained in:
Tobias Reisinger 2020-02-29 10:23:44 +01:00
parent 074c5c5750
commit d679d99a92
6 changed files with 23 additions and 67 deletions

4
models/controller.c
View file

@ -11,7 +11,7 @@ controller*
controller_create(void)
{
controller *result = malloc(sizeof(*result));
uuid_generate(result->uuid);
uuid_generate(result->id);
strcpy(result->name, "new emgauwa device");
result->command_port = 0;
@ -36,7 +36,7 @@ controller_debug(controller *cntrlr)
LOG_DEBUG("controller is NULL");
}
char uuid_str[37];
uuid_unparse(cntrlr->uuid, uuid_str);
uuid_unparse(cntrlr->id, uuid_str);
LOG_DEBUG("(1/4) %s @ %p", uuid_str, cntrlr);
LOG_DEBUG("(2/4) name: %s", cntrlr->name);
LOG_DEBUG("(3/4) relays: %3d", cntrlr->relay_count);

4
models/controller_load.c
View file

@ -56,8 +56,8 @@ controller_load(MDB_env *mdb_env)
MDB_val value;
controller_load_single(mdb_txn, mdb_dbi, KEY_META_UUID, &value);
memmove(new_controller->uuid, (uuid_t*)value.mv_data, sizeof(uuid_t));
controller_load_single(mdb_txn, mdb_dbi, KEY_META_ID, &value);
memmove(new_controller->id, (uuid_t*)value.mv_data, sizeof(uuid_t));
controller_load_single(mdb_txn, mdb_dbi, KEY_META_NAME, &value);
strncpy(new_controller->name, (char*)value.mv_data, CONTROLLER_NAME_LENGTH);

6
models/controller_save.c
View file

@ -48,9 +48,9 @@ controller_save(controller *cntrlr, MDB_env *mdb_env)
exit(1);
}
value.mv_size = sizeof(cntrlr->uuid);
value.mv_data = cntrlr->uuid;
if(controller_save_single(mdb_txn, mdb_dbi, KEY_META_UUID, value))
value.mv_size = sizeof(cntrlr->id);
value.mv_data = cntrlr->id;
if(controller_save_single(mdb_txn, mdb_dbi, KEY_META_ID, value))
{
return 1;
}