projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
hugepages: rework
[collectd.git]
/
src
/
mqtt.c
diff --git
a/src/mqtt.c
b/src/mqtt.c
index
d6bcdce
..
dbef915
100644
(file)
--- a/
src/mqtt.c
+++ b/
src/mqtt.c
@@
-36,8
+36,6
@@
#include "utils_cache.h"
#include "utils_complain.h"
#include "utils_cache.h"
#include "utils_complain.h"
-#include <pthread.h>
-
#include <mosquitto.h>
#define MQTT_MAX_TOPIC_SIZE 1024
#include <mosquitto.h>
#define MQTT_MAX_TOPIC_SIZE 1024
@@
-221,6
+219,7
@@
static void on_message (
if (payload == NULL)
{
ERROR ("mqtt plugin: malloc for payload buffer failed.");
if (payload == NULL)
{
ERROR ("mqtt plugin: malloc for payload buffer failed.");
+ sfree (vl.values);
return;
}
memmove (payload, msg->payload, msg->payloadlen);
return;
}
memmove (payload, msg->payload, msg->payloadlen);
@@
-558,7
+557,7
@@
static int mqtt_config_publisher (oconfig_item_t *ci)
conf = calloc (1, sizeof (*conf));
if (conf == NULL)
{
conf = calloc (1, sizeof (*conf));
if (conf == NULL)
{
- ERROR ("mqtt plugin:
m
alloc failed.");
+ ERROR ("mqtt plugin:
c
alloc failed.");
return (-1);
}
conf->publish = 1;
return (-1);
}
conf->publish = 1;
@@
-663,7
+662,7
@@
static int mqtt_config_subscriber (oconfig_item_t *ci)
conf = calloc (1, sizeof (*conf));
if (conf == NULL)
{
conf = calloc (1, sizeof (*conf));
if (conf == NULL)
{
- ERROR ("mqtt plugin:
m
alloc failed.");
+ ERROR ("mqtt plugin:
c
alloc failed.");
return (-1);
}
conf->publish = 0;
return (-1);
}
conf->publish = 0;
@@
-699,11
+698,11
@@
static int mqtt_config_subscriber (oconfig_item_t *ci)
cf_util_get_string (child, &conf->host);
else if (strcasecmp ("Port", child->key) == 0)
{
cf_util_get_string (child, &conf->host);
else if (strcasecmp ("Port", child->key) == 0)
{
-
int tmp
= cf_util_get_port_number (child);
- if (
tmp
< 0)
+
status
= cf_util_get_port_number (child);
+ if (
status
< 0)
ERROR ("mqtt plugin: Invalid port number.");
else
ERROR ("mqtt plugin: Invalid port number.");
else
- conf->port =
tmp
;
+ conf->port =
status
;
}
else if (strcasecmp ("ClientId", child->key) == 0)
cf_util_get_string (child, &conf->client_id);
}
else if (strcasecmp ("ClientId", child->key) == 0)
cf_util_get_string (child, &conf->client_id);
@@
-713,12
+712,12
@@
static int mqtt_config_subscriber (oconfig_item_t *ci)
cf_util_get_string (child, &conf->password);
else if (strcasecmp ("QoS", child->key) == 0)
{
cf_util_get_string (child, &conf->password);
else if (strcasecmp ("QoS", child->key) == 0)
{
- int
tmp
= -1;
- status = cf_util_get_int (child, &
tmp
);
- if ((status != 0) || (
tmp < 0) || (tmp
> 2))
+ int
qos
= -1;
+ status = cf_util_get_int (child, &
qos
);
+ if ((status != 0) || (
qos < 0) || (qos
> 2))
ERROR ("mqtt plugin: Not a valid QoS setting.");
else
ERROR ("mqtt plugin: Not a valid QoS setting.");
else
- conf->qos =
tmp
;
+ conf->qos =
qos
;
}
else if (strcasecmp ("Topic", child->key) == 0)
cf_util_get_string (child, &conf->topic);
}
else if (strcasecmp ("Topic", child->key) == 0)
cf_util_get_string (child, &conf->topic);