From 9e67da61b668f9091ec8de1910e925475f3343c9 Mon Sep 17 00:00:00 2001 From: viulian Date: Wed, 28 Mar 2018 00:00:57 +0200 Subject: [PATCH] fix the case where libmosquitto doesn't have the second argument in mosquitto_loop call --- src/mqtt.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/mqtt.c b/src/mqtt.c index 09060dfa7..5c1ff1909 100644 --- a/src/mqtt.c +++ b/src/mqtt.c @@ -445,9 +445,13 @@ static int publish(mqtt_client_conf_t *conf, char const *topic, return -1; } - // -1 means default timeout, 1000ms - // second argument is unused, set to 1 for future compatibility - status = mosquitto_loop(conf->mosq, -1, 1); + #if LIBMOSQUITTO_MAJOR == 0 + status = mosquitto_loop(conf->mosq, /* timeout = */ 1000 /* ms */); + #else + status = mosquitto_loop(conf->mosq, + /* timeout[ms] = */ 1000, + /* max_packets = */ 1); + #endif if (status != MOSQ_ERR_SUCCESS) { c_complain(LOG_ERR, &conf->complaint_cantpublish, -- 2.47.2