summaryrefslogtreecommitdiffstats
path: root/aclk
diff options
context:
space:
mode:
authorTimotej S <6674623+underhood@users.noreply.github.com>2022-10-17 17:12:56 +0200
committerGitHub <noreply@github.com>2022-10-17 17:12:56 +0200
commit2de4e77cc9388fcbbe6e0bda40edefb655d86e96 (patch)
tree6212a9541a25c8095857e0cbfffed77f3a081cae /aclk
parentbfd9b3445019c238bcd6edcd6c99d299376f4670 (diff)
Inject costallocz to mqtt_websockets library and its children (#13813)
* use mallocz, freez & family also from within the mqtt libs
Diffstat (limited to 'aclk')
-rw-r--r--aclk/helpers/mqtt_wss_pal.h19
-rw-r--r--aclk/helpers/ringbuffer_pal.h11
-rw-r--r--aclk/schema-wrappers/connection.cc8
-rw-r--r--aclk/schema-wrappers/node_connection.cc2
-rw-r--r--aclk/schema-wrappers/node_creation.cc6
-rw-r--r--aclk/schema-wrappers/node_info.cc4
6 files changed, 40 insertions, 10 deletions
diff --git a/aclk/helpers/mqtt_wss_pal.h b/aclk/helpers/mqtt_wss_pal.h
new file mode 100644
index 0000000000..5c89f8bb7d
--- /dev/null
+++ b/aclk/helpers/mqtt_wss_pal.h
@@ -0,0 +1,19 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+#ifndef MQTT_WSS_PAL_H
+#define MQTT_WSS_PAL_H
+
+#include "libnetdata/libnetdata.h"
+
+#undef OPENSSL_VERSION_095
+#undef OPENSSL_VERSION_097
+#undef OPENSSL_VERSION_110
+#undef OPENSSL_VERSION_111
+
+#define mw_malloc(...) mallocz(__VA_ARGS__)
+#define mw_calloc(...) callocz(__VA_ARGS__)
+#define mw_free(...) freez(__VA_ARGS__)
+#define mw_strdup(...) strdupz(__VA_ARGS__)
+#define mw_realloc(...) reallocz(__VA_ARGS__)
+
+#endif /* MQTT_WSS_PAL_H */
diff --git a/aclk/helpers/ringbuffer_pal.h b/aclk/helpers/ringbuffer_pal.h
new file mode 100644
index 0000000000..2f7e1cb935
--- /dev/null
+++ b/aclk/helpers/ringbuffer_pal.h
@@ -0,0 +1,11 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+#ifndef RINGBUFFER_PAL_H
+#define RINGBUFFER_PAL_H
+
+#include "libnetdata/libnetdata.h"
+
+#define crbuf_malloc(...) mallocz(__VA_ARGS__)
+#define crbuf_free(...) freez(__VA_ARGS__)
+
+#endif /* RINGBUFFER_PAL_H */
diff --git a/aclk/schema-wrappers/connection.cc b/aclk/schema-wrappers/connection.cc
index 7520a46006..8be6b54d70 100644
--- a/aclk/schema-wrappers/connection.cc
+++ b/aclk/schema-wrappers/connection.cc
@@ -38,7 +38,7 @@ char *generate_update_agent_connection(size_t *len, const update_agent_connectio
}
*len = PROTO_COMPAT_MSG_SIZE(connupd);
- char *msg = (char*)malloc(*len);
+ char *msg = (char*)mallocz(*len);
if (msg)
connupd.SerializeToArray(msg, *len);
@@ -52,7 +52,7 @@ struct disconnect_cmd *parse_disconnect_cmd(const char *data, size_t len) {
if (!req.ParseFromArray(data, len))
return NULL;
- res = (struct disconnect_cmd *)calloc(1, sizeof(struct disconnect_cmd));
+ res = (struct disconnect_cmd *)callocz(1, sizeof(struct disconnect_cmd));
if (!res)
return NULL;
@@ -61,9 +61,9 @@ struct disconnect_cmd *parse_disconnect_cmd(const char *data, size_t len) {
res->permaban = req.permaban();
res->error_code = req.error_code();
if (req.error_description().c_str()) {
- res->error_description = strdup(req.error_description().c_str());
+ res->error_description = strdupz(req.error_description().c_str());
if (!res->error_description) {
- free(res);
+ freez(res);
return NULL;
}
}
diff --git a/aclk/schema-wrappers/node_connection.cc b/aclk/schema-wrappers/node_connection.cc
index a6ca8ef984..18f5cc6e1d 100644
--- a/aclk/schema-wrappers/node_connection.cc
+++ b/aclk/schema-wrappers/node_connection.cc
@@ -38,7 +38,7 @@ char *generate_node_instance_connection(size_t *len, const node_instance_connect
}
*len = PROTO_COMPAT_MSG_SIZE(msg);
- char *bin = (char*)malloc(*len);
+ char *bin = (char*)mallocz(*len);
if (bin)
msg.SerializeToArray(bin, *len);
diff --git a/aclk/schema-wrappers/node_creation.cc b/aclk/schema-wrappers/node_creation.cc
index c696bb27ba..5ad25b7e5f 100644
--- a/aclk/schema-wrappers/node_creation.cc
+++ b/aclk/schema-wrappers/node_creation.cc
@@ -18,7 +18,7 @@ char *generate_node_instance_creation(size_t *len, const node_instance_creation_
msg.set_hops(data->hops);
*len = PROTO_COMPAT_MSG_SIZE(msg);
- char *bin = (char*)malloc(*len);
+ char *bin = (char*)mallocz(*len);
if (bin)
msg.SerializeToArray(bin, *len);
@@ -33,7 +33,7 @@ node_instance_creation_result_t parse_create_node_instance_result(const char *da
if (!msg.ParseFromArray(data, len))
return res;
- res.node_id = strdup(msg.node_id().c_str());
- res.machine_guid = strdup(msg.machine_guid().c_str());
+ res.node_id = strdupz(msg.node_id().c_str());
+ res.machine_guid = strdupz(msg.machine_guid().c_str());
return res;
}
diff --git a/aclk/schema-wrappers/node_info.cc b/aclk/schema-wrappers/node_info.cc
index 2a05ddaba7..5e321f6886 100644
--- a/aclk/schema-wrappers/node_info.cc
+++ b/aclk/schema-wrappers/node_info.cc
@@ -104,7 +104,7 @@ char *generate_update_node_info_message(size_t *len, struct update_node_info *in
}
*len = PROTO_COMPAT_MSG_SIZE(msg);
- char *bin = (char*)malloc(*len);
+ char *bin = (char*)mallocz(*len);
if (bin)
msg.SerializeToArray(bin, *len);
@@ -128,7 +128,7 @@ char *generate_update_node_collectors_message(size_t *len, struct update_node_co
dfe_done(colls);
*len = PROTO_COMPAT_MSG_SIZE(msg);
- char *bin = (char*)malloc(*len);
+ char *bin = (char*)mallocz(*len);
if (bin)
msg.SerializeToArray(bin, *len);