Mirrors/VILLASnode
1
0
Fork 0
mirror of https://git.rwth-aachen.de/acs/public/villas/node/ synced 2025-03-09 00:00:00 +01:00
Code Issues Releases Wiki Activity

villas-binary: add option to enable source index validation

Browse source
This commit is contained in:
Steffen Vogel 2021-11-10 05:19:38 -05:00
parent c4b4e9092f
commit 28843a7cd6
2 changed files with 19 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/villas/formats/villas_binary.hpp
View file

@ -39,12 +39,14 @@ class VillasBinaryFormat : public BinaryFormat {
protected:
uint8_t source_index;
bool web;
bool validate_source_index;
public:
VillasBinaryFormat(int fl, bool w, uint8_t sid = 0) :
BinaryFormat(fl),
source_index(sid),
web(w)
web(w),
validate_source_index(false)
{ }
virtual

24
lib/formats/villas_binary.cpp
View file

@ -68,16 +68,16 @@ int VillasBinaryFormat::sprint(char *buf, size_t len, size_t *wbytes, const stru
int VillasBinaryFormat::sscan(const char *buf, size_t len, size_t *rbytes, struct sample * const smps[], unsigned cnt)
{
int ret, values;
unsigned i = 0;
unsigned i, j;
const char *ptr = buf;
uint8_t sid; // source_index
if (len % 4 != 0)
return -1; /* Packet size is invalid: Must be multiple of 4 bytes */
for (i = 0; i < cnt; i++) {
for (i = 0, j = 0; i < cnt; i++) {
struct msg *msg = (struct msg *) ptr;
struct sample *smp = smps[i];
struct sample *smp = smps[j];
smp->signals = signals;
@ -105,8 +105,11 @@ int VillasBinaryFormat::sscan(const char *buf, size_t len, size_t *rbytes, struc
if (ret)
return ret; /* Invalid msg received */
if (sid != source_index)
return -6; // source_index mismatch
if (validate_source_index && sid != source_index) {
// source index mismatch: we skip this sample
}
else
j++;
ptr += MSG_LEN(smp->length);
}
@ -114,7 +117,7 @@ int VillasBinaryFormat::sscan(const char *buf, size_t len, size_t *rbytes, struc
if (rbytes)
*rbytes = ptr - buf;
return i;
return j;
}
void VillasBinaryFormat::parse(json_t *json)
@ -122,13 +125,18 @@ void VillasBinaryFormat::parse(json_t *json)
int ret;
json_error_t err;
int sid = -1;
int vsi = -1;
ret = json_unpack_ex(json, &err, 0, "{ s?: i }",
"source_index", &sid
ret = json_unpack_ex(json, &err, 0, "{ s?: i, s?: b }",
"source_index", &sid,
"validate_source_index", &vsi
);
if (ret)
throw ConfigError(json, err, "node-config-format-villas-binary", "Failed to parse format configuration");
if (vsi >= 0)
validate_source_index = vsi != 0;
if (sid >= 0)
source_index = sid;