mainscnt/sinkserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix config

Browse Source
This commit is contained in:
Wolfgang Hottgenroth 2021-02-10 17:30:14 +01:00
parent e8784ea834
commit b34b957041
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
sink/sink20169.c
View File

@ -66,17 +66,18 @@ int initConfig(t_configHandle *configHandle) {
configHandle->numOfDevices = config_setting_length(devicesConfig); configHandle->numOfDevices = config_setting_length(devicesConfig);
configHandle->devices = (t_device*) malloc(configHandle->numOfDevices * sizeof(t_device)); configHandle->devices = (t_device*) malloc(configHandle->numOfDevices * sizeof(t_device));
for (uint16_t i = 0; i < configHandle->numOfDevices; i++) { for (uint16_t i = 0; i < configHandle->numOfDevices; i++) {
if (! config_setting_lookup_string(devicesConfig, "deviceId", &(configHandle->devices[i].deviceId))) { config_setting_t *deviceConfig = config_setting_get_elem(devicesConfig, i);
if (! config_setting_lookup_string(deviceConfig, "deviceId", &(configHandle->devices[i].deviceId))) {
logmsg(LOG_ERR, "no deviceId for device %d", i); logmsg(LOG_ERR, "no deviceId for device %d", i);
return -3 return -3;
} }
if (! config_setting_lookup_string(devicesConfig, "location", &(configHandle->devices[i].location))) { if (! config_setting_lookup_string(deviceConfig, "location", &(configHandle->devices[i].location))) {
logmsg(LOG_ERR, "no location for device %d", i); logmsg(LOG_ERR, "no location for device %d", i);
return -4 return -4;
} }
if (! config_setting_lookup_string(devicesConfig, "sharedSecret", &(configHandle->devices[i].sharedSecret))) { if (! config_setting_lookup_string(deviceConfig, "sharedSecret", &(configHandle->devices[i].sharedSecret))) {
logmsg(LOG_ERR, "no sharedSecret for device %d", i); logmsg(LOG_ERR, "no sharedSecret for device %d", i);
return -5 return -5;
} }
if (strlen(configHandle->devices[i].sharedSecret) >= SHA256_BLOCK_SIZE) { if (strlen(configHandle->devices[i].sharedSecret) >= SHA256_BLOCK_SIZE) {
logmsg(LOG_ERR, "Configured sharedsecret for device %d is too long", i); logmsg(LOG_ERR, "Configured sharedsecret for device %d is too long", i);
@ -101,8 +102,8 @@ void deinitConfig(t_configHandle *configHandle) {
t_device *findDevice(t_configHandle *configHandle, char *deviceId) { t_device *findDevice(t_configHandle *configHandle, char *deviceId) {
for (uint16_t i = 0; i < configHandle->numOfDevices; i++) { for (uint16_t i = 0; i < configHandle->numOfDevices; i++) {
if (! strcmp(configHandle->devices[i], deviceId)) { if (! strcmp(configHandle->devices[i].deviceId, deviceId)) {
return configHandle->devices[i]; return &(configHandle->devices[i]);
} }
} }
return NULL; return NULL;

2
sink/sink20169.cfg
View File

@ -12,5 +12,5 @@ devices = (
deviceId = "MainsCnt01"; deviceId = "MainsCnt01";
sharedSecret = "Uj6*uKDp@8Kvfa4g5eRMLUfVsSuqjxW"; sharedSecret = "Uj6*uKDp@8Kvfa4g5eRMLUfVsSuqjxW";
location = "Essen_DE"; location = "Essen_DE";
}; }
); );