martin/aqhomecontrol
Public Access
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

added specific IPC messages and use them instead of more generic messages.

Browse Source
This commit is contained in:
Martin Preuss
2023-09-13 12:07:11 +02:00
parent 11798a39d6
commit 161b979e84
21 changed files with 902 additions and 188 deletions
Download Patch File Download Diff File Expand all files Collapse all files

136
apps/aqhome-data/c_setdata.c
View File

@@ -13,10 +13,12 @@
#include "./c_setdata.h"
#include "./aqhome_data_p.h"
#include "./loop.h"
#include "aqhome/ipc/data/ipc_data.h"
#include "aqhome/ipc/data/msg_data_datapoints.h"
#include "aqhome/ipc/data/msg_data_singledata.h"
#include "aqhome/ipc/endpoint_ipc.h"
#include "aqhome/ipc/msg_ipc_result.h"
#include "aqhome/ipc/msg_ipc_tag16.h"
#include <gwenhywfar/debug.h>
@@ -35,6 +37,8 @@
* ------------------------------------------------------------------------------------------------
*/
static int _forwardDataToDriver(AQHOME_DATA *aqh, const AQH_VALUE *v, uint64_t timestamp, double datapoint);
/* ------------------------------------------------------------------------------------------------
@@ -42,89 +46,83 @@
* ------------------------------------------------------------------------------------------------
*/
void AqHomeData_HandleSetData(AQHOME_DATA *aqh, GWEN_MSG_ENDPOINT *ep, const GWEN_MSG *recvdMsg)
void AqHomeData_HandleSetData(AQHOME_DATA *aqh, GWEN_MSG_ENDPOINT *epSrc, const GWEN_MSG *recvdMsg)
{
GWEN_MSG *outMsg;
int resultCode=AQH_MSG_IPC_SUCCESS;
GWEN_TAG16_LIST *tagList;
AQH_VALUE *value;
char *valueName=NULL;
uint64_t timestamp=0;
union {double f; uint64_t i;} u;
if (AQH_IpcEndpoint_GetPermissions(ep) & AQH_IPCENDPOINT_PERMS_SETDATA) {
if (AQH_DataPointsDataIpcMsg_IsValid(recvdMsg)) {
uint32_t numValues;
numValues=AQH_DataPointsDataIpcMsg_GetNumValues(recvdMsg);
if (numValues==1) {
const char *s;
s=AQH_DataPointsDataIpcMsg_GetValueName(recvdMsg);
if (s && *s) {
AQH_VALUE *v;
v=AQH_Storage_GetValueByNameForSystem(aqh->storage, s);
if (v==NULL) {
resultCode=AQH_MSG_IPC_ERROR_NOTFOUND;
}
else {
const uint64_t *dataPoints;
dataPoints=AQH_DataPointsDataIpcMsg_GetDataPoints(recvdMsg);
if (dataPoints) {
const char *driverName;
tagList=AQH_Tag16IpcMsg_ParseTags(recvdMsg, 0);
if (tagList) {
const GWEN_TAG16 *tag;
driverName=AQH_Value_GetDriver(v);
if (driverName && *driverName) {
GWEN_MSG_ENDPOINT *ep;
tag=GWEN_Tag16_List_FindFirstByTagType(tagList, AQH_MSGDATA_SINGLEDATA_TAGS_NAME);
valueName=tag?GWEN_Tag16_GetTagDataAsNewString(tag, NULL):NULL;
ep=AqHomeData_GetIpcEndpointByServiceName(aqh, driverName);
if (ep) {
GWEN_MSG *driverMsg;
tag=GWEN_Tag16_List_FindFirstByTagType(tagList, AQH_MSGDATA_SINGLEDATA_TAGS_TIME);
timestamp=tag?GWEN_Tag16_GetTagDataAsUint64(tag, 0):0;
DBG_INFO(AQH_LOGDOMAIN, "Sending SETDATA msg to driver endpoint (%s)", GWEN_MsgEndpoint_GetName(ep));
driverMsg=AQH_DataPointsDataIpcMsg_new(AQH_MSGTYPE_IPC_DATA_SETDATA,
0, /* flags */
AQH_Value_GetId(v),
AQH_Value_GetNameForDriver(v),
AQH_Value_GetValueUnits(v),
dataPoints, numValues);
GWEN_MsgEndpoint_AddSendMessage(ep, driverMsg);
}
else {
DBG_INFO(NULL, "Driver \"%s\" not available", driverName);
resultCode=AQH_MSG_IPC_ERROR_GENERIC;
}
}
else {
DBG_INFO(NULL, "No driver name");
resultCode=AQH_MSG_IPC_ERROR_GENERIC;
}
}
else {
DBG_INFO(NULL, "No datapoints");
resultCode=AQH_MSG_IPC_ERROR_BADDATA;
}
}
}
else {
DBG_INFO(NULL, "Value without name ");
resultCode=AQH_MSG_IPC_ERROR_INVALID;
}
}
else {
DBG_INFO(NULL, "Invalid number of datapoints");
resultCode=AQH_MSG_IPC_ERROR_BADDATA;
}
tag=GWEN_Tag16_List_FindFirstByTagType(tagList, AQH_MSGDATA_SINGLEDATA_TAGS_DATA);
u.i=tag?GWEN_Tag16_GetTagDataAsUint64(tag, 0):0;
}
value=AQH_Storage_GetValueByNameForSystem(aqh->storage, valueName);
if (value) {
if (AQH_Value_GetValueType(value)==AQH_ValueType_Actor) {
resultCode=_forwardDataToDriver(aqh, value, timestamp, u.f);
}
else {
DBG_INFO(NULL, "Invalid message received");
resultCode=AQH_MSG_IPC_ERROR_BADDATA;
DBG_INFO(NULL, "Value \"%s\" is not an actor", valueName);
resultCode=AQH_MSG_IPC_ERROR_INVALID;
}
}
else {
DBG_ERROR(AQH_LOGDOMAIN, "No permissions to set data");
resultCode=AQH_MSG_IPC_ERROR_PERMS;
DBG_INFO(NULL, "Actor value \"%s\" does not exist", valueName);
resultCode=AQH_MSG_IPC_ERROR_NOTFOUND;
}
free(valueName);
outMsg=AQH_ResultIpcMsg_new(AQH_MSGTYPE_IPC_DATA_RESULT, resultCode);
GWEN_MsgEndpoint_AddSendMessage(ep, outMsg);
GWEN_MsgEndpoint_AddSendMessage(epSrc, outMsg);
}
int _forwardDataToDriver(AQHOME_DATA *aqh, const AQH_VALUE *v, uint64_t timestamp, double datapoint)
{
const char *driverName;
driverName=AQH_Value_GetDriver(v);
if (driverName && *driverName) {
GWEN_MSG_ENDPOINT *ep;
ep=AqHomeData_GetIpcEndpointByServiceName(aqh, driverName);
if (ep) {
GWEN_MSG *driverMsg;
DBG_INFO(AQH_LOGDOMAIN, "Sending SETDATA msg to driver endpoint (%s)", GWEN_MsgEndpoint_GetName(ep));
driverMsg=AQH_SingleDataDataIpcMsg_new(AQH_MSGTYPE_IPC_DATA_SETDATA,
AQH_Value_GetNameForDriver(v),
AQH_Value_GetValueUnits(v),
AQH_Value_GetValueType(v),
timestamp,
datapoint);
GWEN_MsgEndpoint_AddSendMessage(ep, driverMsg);
return AQH_MSG_IPC_SUCCESS;
}
else {
DBG_INFO(NULL, "Driver \"%s\" not available", driverName);
return AQH_MSG_IPC_ERROR_GENERIC;
}
}
else {
DBG_INFO(NULL, "No driver name");
return AQH_MSG_IPC_ERROR_GENERIC;
}
}