userbogd/webguiapp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

source and destination id added in replace of device id

Browse Source
This commit is contained in:
Bogdan Pilyugin 2023-10-13 13:24:33 +02:00
parent af19e131b5
commit b861881061
2 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/SystemApplication.h
View File

@ -89,6 +89,8 @@ typedef struct
struct struct
{ {
uint64_t msgID; uint64_t msgID;
char srcID[9];
char dstID[9];
time_t time; time_t time;
int msgType; int msgType;
int payloadType; int payloadType;

25
src/SysComm.c
View File

@ -71,7 +71,8 @@ static sys_error_code PayloadType_1_Handler(data_message_t *MSG)
jwOpen(&jwc, MSG->outputDataBuffer, MSG->outputDataLength, JW_OBJECT, JW_COMPACT); jwOpen(&jwc, MSG->outputDataBuffer, MSG->outputDataLength, JW_OBJECT, JW_COMPACT);
jwObj_object(&jwc, "data"); jwObj_object(&jwc, "data");
jwObj_int(&jwc, "msgid", MSG->parsedData.msgID); jwObj_int(&jwc, "msgid", MSG->parsedData.msgID);
jwObj_string(&jwc, "devid", GetSysConf()->ID); jwObj_string(&jwc, "srcid", GetSysConf()->ID);
jwObj_string(&jwc, "dstid", MSG->parsedData.srcID);
char time[RFC3339_TIMESTAMP_LENGTH]; char time[RFC3339_TIMESTAMP_LENGTH];
GetRFC3339Time(time); GetRFC3339Time(time);
jwObj_string(&jwc, "time", time); jwObj_string(&jwc, "time", time);
@ -244,6 +245,25 @@ static sys_error_code DataHeaderParser(data_message_t *MSG)
else else
return SYS_ERROR_PARSE_MESSAGEID; return SYS_ERROR_PARSE_MESSAGEID;
jRead(MSG->inputDataBuffer, "{'data'{'srcid'", &result);
if (result.elements == 1)
{
jRead_string(MSG->inputDataBuffer, "{'data'{'srcid'", MSG->parsedData.srcID, 9, 0);
}
else
strcpy(MSG->parsedData.srcID, "FFFFFFFF");
jRead(MSG->inputDataBuffer, "{'data'{'dstid'", &result);
if (result.elements == 1)
{
jRead_string(MSG->inputDataBuffer, "{'data'{'dstid'", MSG->parsedData.dstID, 9, 0);
}
else
strcpy(MSG->parsedData.dstID, "FFFFFFFF");
//Extract 'msgtype' or throw exception //Extract 'msgtype' or throw exception
jRead(MSG->inputDataBuffer, "{'data'{'msgtype'", &result); jRead(MSG->inputDataBuffer, "{'data'{'msgtype'", &result);
if (result.elements == 1) if (result.elements == 1)
@ -317,7 +337,8 @@ esp_err_t ServiceDataHandler(data_message_t *MSG)
struct jWriteControl jwc; struct jWriteControl jwc;
jwOpen(&jwc, MSG->outputDataBuffer, MSG->outputDataLength, JW_OBJECT, JW_PRETTY); jwOpen(&jwc, MSG->outputDataBuffer, MSG->outputDataLength, JW_OBJECT, JW_PRETTY);
jwObj_int(&jwc, "msgid", MSG->parsedData.msgID); jwObj_int(&jwc, "msgid", MSG->parsedData.msgID);
jwObj_string(&jwc, "devid", GetSysConf()->ID); jwObj_string(&jwc, "srcid", GetSysConf()->ID);
jwObj_string(&jwc, "dstid", MSG->parsedData.srcID);
char time[RFC3339_TIMESTAMP_LENGTH]; char time[RFC3339_TIMESTAMP_LENGTH];
GetRFC3339Time(time); GetRFC3339Time(time);
jwObj_string(&jwc, "time", time); jwObj_string(&jwc, "time", time);