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

check if publish/ subscribe topic is set before subscribing or publishing, provide a warning to the user in case subscribing/ publishing cannot be done because of lack of topic

Browse source
This commit is contained in:
Sonja Kolen 2018-07-13 13:36:13 +02:00
parent b1b778f542
commit bfd25b55db
1 changed files with 19 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
lib/nodes/mqtt.c
View file

@ -60,9 +60,15 @@ static void mqtt_connect_cb(struct mosquitto *mosq, void *userdata, int result)
info("MQTT: Node %s connected to broker %s", node_name(n), m->host);
ret = mosquitto_subscribe(m->client, NULL, m->subscribe, m->qos);
if (ret)
warn("MQTT: failed to subscribe to topic '%s' for node %s", m->subscribe, node_name(n));
if(m->subscribe){
ret = mosquitto_subscribe(m->client, NULL, m->subscribe, m->qos);
if (ret)
warn("MQTT: failed to subscribe to topic '%s' for node %s", m->subscribe, node_name(n));
}
else{
warn("MQTT: no subscribe for node %s as no subscribe topic is given", node_name(n));
}
}
static void mqtt_disconnect_cb(struct mosquitto *mosq, void *userdata, int result)
@ -385,10 +391,16 @@ int mqtt_write(struct node *n, struct sample *smps[], unsigned cnt, unsigned *re
if (ret < 0)
return ret;
ret = mosquitto_publish(m->client, NULL /* mid */, m->publish, wbytes, data, m->qos, m->retain);
if (ret != MOSQ_ERR_SUCCESS) {
warn("MQTT: publish failed for node %s: %s", node_name(n), mosquitto_strerror(ret));
return -abs(ret);
if(m->publish) {
ret = mosquitto_publish(m->client, NULL /* mid */, m->publish, wbytes, data, m->qos,
m->retain);
if (ret != MOSQ_ERR_SUCCESS) {
warn("MQTT: publish failed for node %s: %s", node_name(n), mosquitto_strerror(ret));
return -abs(ret);
}
}
else{
warn("MQTT: no publish for node %s possible because no publish topic is given", node_name(n));
}
return cnt;