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

mqtt: bugfixes after last refactoring

Browse source
This commit is contained in:
Manuel Pitz 2020-10-21 21:00:05 +02:00
parent 9e97e22d10
commit dd61a919b1
1 changed files with 22 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
lib/nodes/mqtt.cpp
View file

@ -176,7 +176,7 @@ int mqtt_init(struct vnode *n)
int ret;
struct mqtt *m = (struct mqtt *) n->_vd;
m->client = mosquitto_new(n->name, 0, (void *) n);
m->client = mosquitto_new(nullptr, true, (void *) n);
if (!m->client)
return -1;
@ -314,6 +314,26 @@ int mqtt_check(struct vnode *n)
return 0;
}
int mqtt_prepare(struct vnode *n)
{
int ret;
struct mqtt *m = (struct mqtt *) n->_vd;
ret = io_init(&m->io, m->format, &n->in.signals, (int) SampleFlags::HAS_ALL & ~(int) SampleFlags::HAS_OFFSET);
if (ret)
return ret;
ret = pool_init(&m->pool, 1024, SAMPLE_LENGTH(vlist_length(&n->in.signals)));
if (ret)
return ret;
ret = queue_signalled_init(&m->queue, 1024);
if (ret)
return ret;
return 0;
}
char * mqtt_print(struct vnode *n)
{
struct mqtt *m = (struct mqtt *) n->_vd;
@ -394,18 +414,6 @@ int mqtt_start(struct vnode *n)
goto mosquitto_error;
}
ret = io_init(&m->io, m->format, &n->in.signals, (int) SampleFlags::HAS_ALL & ~(int) SampleFlags::HAS_OFFSET);
if (ret)
return ret;
ret = pool_init(&m->pool, 1024, SAMPLE_LENGTH(vlist_length(&n->in.signals)));
if (ret)
return ret;
ret = queue_signalled_init(&m->queue, 1024);
if (ret)
return ret;
ret = mosquitto_connect(m->client, m->host, m->port, m->keepalive);
if (ret != MOSQ_ERR_SUCCESS)
goto mosquitto_error;
@ -567,6 +575,7 @@ static void register_plugin() {
p.node.destroy = mqtt_destroy;
p.node.parse = mqtt_parse;
p.node.check = mqtt_check;
p.node.prepare = mqtt_prepare;
p.node.print = mqtt_print;
p.node.init = mqtt_init;
p.node.destroy = mqtt_destroy;