ACLK code cleanup (#18417)

* Code cleanup

* More cleanup

CMakeLists.txt

@@ -615,6 +615,8 @@ set(LIBNETDATA_FILES
         src/libnetdata/avl/avl.h
         src/libnetdata/buffer/buffer.c
         src/libnetdata/buffer/buffer.h
+        src/libnetdata/ringbuffer/ringbuffer.c
+        src/libnetdata/ringbuffer/ringbuffer.h
         src/libnetdata/circular_buffer/circular_buffer.c
         src/libnetdata/circular_buffer/circular_buffer.h
         src/libnetdata/clocks/clocks.c
@@ -1298,12 +1300,9 @@ set(ACLK_ALWAYS_BUILD
         src/aclk/aclk_util.h
         src/aclk/https_client.c
         src/aclk/https_client.h
-        src/aclk/mqtt_websockets/c-rbuf/cringbuffer.c
-        src/aclk/mqtt_websockets/c-rbuf/cringbuffer.h
-        src/aclk/mqtt_websockets/c-rbuf/cringbuffer_internal.h
-        src/aclk/mqtt_websockets/c_rhash/c_rhash.c
-        src/aclk/mqtt_websockets/c_rhash/c_rhash.h
-        src/aclk/mqtt_websockets/c_rhash/c_rhash_internal.h
+        src/libnetdata/c_rhash/c_rhash.c
+        src/libnetdata/c_rhash/c_rhash.h
+        src/libnetdata/c_rhash/c_rhash_internal.h
 )
 
 set(TIMEX_PLUGIN_FILES
@@ -1546,8 +1545,6 @@ set(ACLK_FILES
         src/aclk/schema-wrappers/schema_wrapper_utils.h
         src/aclk/schema-wrappers/agent_cmds.cc
         src/aclk/schema-wrappers/agent_cmds.h
-        src/aclk/helpers/mqtt_wss_pal.h
-        src/aclk/helpers/ringbuffer_pal.h
 )
 
 

src/aclk/aclk_otp.c

@@ -1,12 +1,9 @@
-
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 #include "aclk_otp.h"
 #include "aclk_util.h"
 #include "aclk.h"
 
-#include "mqtt_websockets/c-rbuf/cringbuffer.h"
-
 static int aclk_https_request(https_req_t *request, https_req_response_t *response) {
     int rc;
     // wrapper for ACLK only which loads ACLK specific proxy settings

src/aclk/helpers/mqtt_wss_pal.h

@@ -1,13 +0,0 @@
-// 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
-
-#endif /* MQTT_WSS_PAL_H */

src/aclk/helpers/ringbuffer_pal.h

@@ -1,11 +0,0 @@
-// 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 */

src/aclk/https_client.h

@@ -5,9 +5,6 @@
 
 #include "libnetdata/libnetdata.h"
 
-#include "mqtt_websockets/c-rbuf/cringbuffer.h"
-#include "mqtt_websockets/c_rhash/c_rhash.h"
-
 typedef enum http_req_type {
     HTTP_REQ_GET = 0,
     HTTP_REQ_POST,

src/aclk/mqtt_websockets/.github/workflows/run-tests.yaml

@@ -1,14 +0,0 @@
-name: run-tests
-on:
-  push:
-  schedule:
-      - cron: '5 3 * * 0'
-  pull_request:
-jobs:
-  run-tests:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Install ruby and deps
-        run: sudo apt-get install ruby ruby-dev mosquitto
-      - name: Checkout
-        uses: actions/checkout@v2

src/aclk/mqtt_websockets/.gitignore

@@ -1,10 +0,0 @@
-build/*
-!build/.keep
-test
-.vscode
-mqtt/mqtt.c
-mqtt/include/mqtt.h
-libmqttwebsockets.*
-*.o
-.dirstamp
-.deps

src/aclk/mqtt_websockets/c-rbuf/cringbuffer_internal.h

@@ -1,37 +0,0 @@
-// Copyright: SPDX-License-Identifier:  GPL-3.0-only
-
-#ifndef CRINGBUFFER_INTERNAL_H
-#define CRINGBUFFER_INTERNAL_H
-
-struct rbuf_t {
-    char *data;
-
-    // points to next byte where we can write
-    char *head;
-    // points to oldest (next to be poped) readable byte
-    char *tail;
-
-    // to avoid calculating data + size
-    // all the time
-    char *end;
-
-    size_t size;
-    size_t size_data;
-};
-
-/* this exists so that it can be tested by unit tests
- * without optimization that resets head and tail to
- * beginning if buffer empty
- */
-inline static int rbuf_bump_tail_noopt(rbuf_t buffer, size_t bytes)
-{
-    if (bytes > buffer->size_data)
-        return 0;
-    int i = buffer->tail - buffer->data;
-    buffer->tail = &buffer->data[(i + bytes) % buffer->size];
-    buffer->size_data -= bytes;
-
-    return 1;
-}
-
-#endif

src/aclk/mqtt_websockets/c-rbuf/ringbuffer_test.c

@@ -1,485 +0,0 @@
-// Copyright: SPDX-License-Identifier:  GPL-3.0-only
-
-#include "ringbuffer.h"
-
-// to be able to access internals
-// never do this from app
-#include "../src/ringbuffer_internal.h"
-
-#include <stdio.h>
-#include <string.h>
-
-#define KNRM "\x1B[0m"
-#define KRED "\x1B[31m"
-#define KGRN "\x1B[32m"
-#define KYEL "\x1B[33m"
-#define KBLU "\x1B[34m"
-#define KMAG "\x1B[35m"
-#define KCYN "\x1B[36m"
-#define KWHT "\x1B[37m"
-
-#define UNUSED(x) (void)(x)
-
-int total_fails = 0;
-int total_tests = 0;
-int total_checks = 0;
-
-#define CHECK_EQ_RESULT(x, y)                                                                                          \
-    while (s_len--)                                                                                                    \
-        putchar('.');                                                                                                  \
-    printf("%s%s " KNRM "\n", (((x) == (y)) ? KGRN : KRED), (((x) == (y)) ? " PASS " : " FAIL "));                     \
-    if ((x) != (y))                                                                                                    \
-        total_fails++;                                                                                                 \
-    total_checks++;
-
-#define CHECK_EQ_PREFIX(x, y, prefix, subtest_name, ...)                                                               \
-    {                                                                                                                  \
-        int s_len =                                                                                                    \
-            100 -                                                                                                      \
-            printf(("Checking: " KWHT "%s %s%2d " subtest_name " " KNRM), __func__, prefix, subtest_no, ##__VA_ARGS__);    \
-        CHECK_EQ_RESULT(x, y)                                                                                          \
-    }
-
-#define CHECK_EQ(x, y, subtest_name, ...)                                                                              \
-    {                                                                                                                  \
-        int s_len =                                                                                                    \
-            100 - printf(("Checking: " KWHT "%s %2d " subtest_name " " KNRM), __func__, subtest_no, ##__VA_ARGS__);        \
-        CHECK_EQ_RESULT(x, y)                                                                                          \
-    }
-
-#define TEST_DECL()                                                                                                    \
-    int subtest_no = 0;                                                                                                \
-    printf(KYEL "TEST SUITE: %s\n" KNRM, __func__);                                                                    \
-    total_tests++;
-
-static void test_rbuf_get_linear_insert_range()
-{
-    TEST_DECL();
-
-    // check empty buffer behaviour
-    rbuf_t buff = rbuf_create(5);
-    char *to_write;
-    size_t ret;
-    to_write = rbuf_get_linear_insert_range(buff, &ret);
-    CHECK_EQ(ret, 5, "empty size");
-    CHECK_EQ(to_write, buff->head, "empty write ptr");
-    rbuf_free(buff);
-
-    // check full buffer behaviour
-    subtest_no++;
-    buff = rbuf_create(5);
-    ret = rbuf_bump_head(buff, 5);
-    CHECK_EQ(ret, 1, "ret");
-    to_write = rbuf_get_linear_insert_range(buff, &ret);
-    CHECK_EQ(to_write, NULL, "writable NULL");
-    CHECK_EQ(ret, 0, "writable count = 0");
-
-    // check buffer flush
-    subtest_no++;
-    rbuf_flush(buff);
-    CHECK_EQ(rbuf_bytes_free(buff), 5, "size_free");
-    CHECK_EQ(rbuf_bytes_available(buff), 0, "size_avail");
-    CHECK_EQ(buff->head, buff->data, "head_ptr");
-    CHECK_EQ(buff->tail, buff->data, "tail_ptr");
-
-    // check behaviour head > tail
-    subtest_no++;
-    rbuf_flush(buff);
-    rbuf_bump_head(buff, 3);
-    to_write = rbuf_get_linear_insert_range(buff, &ret);
-    CHECK_EQ(to_write, buff->head, "write location");
-    CHECK_EQ(ret, 2, "availible to linear write");
-
-    // check behaviour tail > head
-    subtest_no++;
-    rbuf_flush(buff);
-    rbuf_bump_head(buff, 5);
-    rbuf_bump_tail(buff, 3);
-    CHECK_EQ(buff->head, buff->data, "head_ptr");
-    CHECK_EQ(buff->tail, buff->data + 3, "tail_ptr");
-    to_write = rbuf_get_linear_insert_range(buff, &ret);
-    CHECK_EQ(to_write, buff->head, "write location");
-    CHECK_EQ(ret, 3, "availible to linear write");
-
-/*    // check behaviour tail and head at last element
-    subtest_no++;
-    rbuf_flush(buff);
-    rbuf_bump_head(buff, 4);
-    rbuf_bump_tail(buff, 4);
-    CHECK_EQ(buff->head, buff->end - 1, "head_ptr");
-    CHECK_EQ(buff->tail, buff->end - 1, "tail_ptr");
-    to_write = rbuf_get_linear_insert_range(buff, &ret);
-    CHECK_EQ(to_write, buff->head, "write location");
-    CHECK_EQ(ret, 1, "availible to linear write");*/
-
-    // check behaviour tail and head at last element
-    // after rbuf_bump_tail optimisation that restarts buffer
-    // in case tail catches up with head
-    subtest_no++;
-    rbuf_flush(buff);
-    rbuf_bump_head(buff, 4);
-    rbuf_bump_tail(buff, 4);
-    CHECK_EQ(buff->head, buff->data, "head_ptr");
-    CHECK_EQ(buff->tail, buff->data, "tail_ptr");
-    to_write = rbuf_get_linear_insert_range(buff, &ret);
-    CHECK_EQ(to_write, buff->head, "write location");
-    CHECK_EQ(ret, 5, "availible to linear write");
-}
-
-#define _CHECK_EQ(x, y, subtest_name, ...) CHECK_EQ_PREFIX(x, y, prefix, subtest_name, ##__VA_ARGS__)
-#define _PREFX "(size = %5zu) "
-static void test_rbuf_bump_head_bsize(size_t size)
-{
-    char prefix[16];
-    snprintf(prefix, 16, _PREFX, size);
-    int subtest_no = 0;
-    rbuf_t buff = rbuf_create(size);
-    _CHECK_EQ(rbuf_bytes_free(buff), size, "size_free");
-
-    subtest_no++;
-    int ret = rbuf_bump_head(buff, size);
-    _CHECK_EQ(buff->data, buff->head, "loc");
-    _CHECK_EQ(ret, 1, "ret");
-    _CHECK_EQ(buff->size_data, buff->size, "size");
-    _CHECK_EQ(rbuf_bytes_free(buff), 0, "size_free");
-
-    subtest_no++;
-    ret = rbuf_bump_head(buff, 1);
-    _CHECK_EQ(buff->data, buff->head, "loc no move");
-    _CHECK_EQ(ret, 0, "ret error");
-    _CHECK_EQ(buff->size_data, buff->size, "size");
-    _CHECK_EQ(rbuf_bytes_free(buff), 0, "size_free");
-    rbuf_free(buff);
-
-    subtest_no++;
-    buff = rbuf_create(size);
-    ret = rbuf_bump_head(buff, size - 1);
-    _CHECK_EQ(buff->head, buff->end-1, "loc end");
-    rbuf_free(buff);
-}
-#undef _CHECK_EQ
-
-static void test_rbuf_bump_head()
-{
-    TEST_DECL();
-    UNUSED(subtest_no);
-
-    size_t test_sizes[] = { 1, 2, 3, 5, 6, 7, 8, 100, 99999, 0 };
-    for (int i = 0; test_sizes[i]; i++)
-        test_rbuf_bump_head_bsize(test_sizes[i]);
-}
-
-static void test_rbuf_bump_tail_noopt(int subtest_no)
-{
-    rbuf_t buff = rbuf_create(10);
-    CHECK_EQ(rbuf_bytes_free(buff), 10, "size_free");
-    CHECK_EQ(rbuf_bytes_available(buff), 0, "size_avail");
-
-    subtest_no++;
-    int ret = rbuf_bump_head(buff, 5);
-    CHECK_EQ(ret, 1, "ret");
-    CHECK_EQ(rbuf_bytes_free(buff), 5, "size_free");
-    CHECK_EQ(rbuf_bytes_available(buff), 5, "size_avail");
-    CHECK_EQ(buff->head, buff->data + 5, "head_ptr");
-    CHECK_EQ(buff->tail, buff->data, "tail_ptr");
-
-    subtest_no++;
-    ret = rbuf_bump_tail_noopt(buff, 2);
-    CHECK_EQ(ret, 1, "ret");
-    CHECK_EQ(rbuf_bytes_available(buff), 3, "size_avail");
-    CHECK_EQ(rbuf_bytes_free(buff), 7, "size_free");
-    CHECK_EQ(buff->head, buff->data + 5, "head_ptr");
-    CHECK_EQ(buff->tail, buff->data + 2, "tail_ptr");
-
-    subtest_no++;
-    ret = rbuf_bump_tail_noopt(buff, 3);
-    CHECK_EQ(ret, 1, "ret");
-    CHECK_EQ(rbuf_bytes_available(buff), 0, "size_avail");
-    CHECK_EQ(rbuf_bytes_free(buff), 10, "size_free");
-    CHECK_EQ(buff->head, buff->data + 5, "head_ptr");
-    CHECK_EQ(buff->tail, buff->data + 5, "tail_ptr");
-
-    subtest_no++;
-    ret = rbuf_bump_tail_noopt(buff, 1);
-    CHECK_EQ(ret, 0, "ret");
-    CHECK_EQ(rbuf_bytes_available(buff), 0, "size_avail");
-    CHECK_EQ(rbuf_bytes_free(buff), 10, "size_free");
-    CHECK_EQ(buff->head, buff->data + 5, "head_ptr");
-    CHECK_EQ(buff->tail, buff->data + 5, "tail_ptr");
-
-    subtest_no++;
-    ret = rbuf_bump_head(buff, 7);
-    CHECK_EQ(ret, 1, "ret");
-    CHECK_EQ(rbuf_bytes_available(buff), 7, "size_avail");
-    CHECK_EQ(rbuf_bytes_free(buff), 3, "size_free");
-    CHECK_EQ(buff->head, buff->data + 2, "head_ptr");
-    CHECK_EQ(buff->tail, buff->data + 5, "tail_ptr");
-
-    subtest_no++;
-    ret = rbuf_bump_tail_noopt(buff, 5);
-    CHECK_EQ(ret, 1, "ret");
-    CHECK_EQ(rbuf_bytes_available(buff), 2, "size_avail");
-    CHECK_EQ(rbuf_bytes_free(buff), 8, "size_free");
-    CHECK_EQ(buff->head, buff->data + 2, "head_ptr");
-    CHECK_EQ(buff->tail, buff->data, "tail_ptr");
-
-    // check tail can't overrun head
-    subtest_no++;
-    ret = rbuf_bump_tail_noopt(buff, 3);
-    CHECK_EQ(ret, 0, "ret");
-    CHECK_EQ(rbuf_bytes_available(buff), 2, "size_avail");
-    CHECK_EQ(rbuf_bytes_free(buff), 8, "size_free");
-    CHECK_EQ(buff->head, buff->data + 2, "head_ptr");
-    CHECK_EQ(buff->tail, buff->data, "tail_ptr");
-
-    // check head can't overrun tail
-    subtest_no++;
-    ret = rbuf_bump_head(buff, 9);
-    CHECK_EQ(ret, 0, "ret");
-    CHECK_EQ(rbuf_bytes_available(buff), 2, "size_avail");
-    CHECK_EQ(rbuf_bytes_free(buff), 8, "size_free");
-    CHECK_EQ(buff->head, buff->data + 2, "head_ptr");
-    CHECK_EQ(buff->tail, buff->data, "tail_ptr");
-
-    // check head can fill the buffer
-    subtest_no++;
-    ret = rbuf_bump_head(buff, 8);
-    CHECK_EQ(ret, 1, "ret");
-    CHECK_EQ(rbuf_bytes_available(buff), 10, "size_avail");
-    CHECK_EQ(rbuf_bytes_free(buff), 0, "size_free");
-    CHECK_EQ(buff->head, buff->data, "head_ptr");
-    CHECK_EQ(buff->tail, buff->data, "tail_ptr");
-
-    // check can empty the buffer
-    subtest_no++;
-    ret = rbuf_bump_tail_noopt(buff, 10);
-    CHECK_EQ(ret, 1, "ret");
-    CHECK_EQ(rbuf_bytes_available(buff), 0, "size_avail");
-    CHECK_EQ(rbuf_bytes_free(buff), 10, "size_free");
-    CHECK_EQ(buff->head, buff->data, "head_ptr");
-    CHECK_EQ(buff->tail, buff->data, "tail_ptr");
-}
-
-static void test_rbuf_bump_tail_opt(int subtest_no)
-{
-    subtest_no++;
-    rbuf_t buff = rbuf_create(10);
-    CHECK_EQ(rbuf_bytes_free(buff), 10, "size_free");
-    CHECK_EQ(rbuf_bytes_available(buff), 0, "size_avail");
-
-    subtest_no++;
-    int ret = rbuf_bump_head(buff, 5);
-    CHECK_EQ(ret, 1, "ret");
-    CHECK_EQ(rbuf_bytes_free(buff), 5, "size_free");
-    CHECK_EQ(rbuf_bytes_available(buff), 5, "size_avail");
-    CHECK_EQ(buff->head, buff->data + 5, "head_ptr");
-    CHECK_EQ(buff->tail, buff->data, "tail_ptr");
-
-    subtest_no++;
-    ret = rbuf_bump_tail(buff, 2);
-    CHECK_EQ(ret, 1, "ret");
-    CHECK_EQ(rbuf_bytes_available(buff), 3, "size_avail");
-    CHECK_EQ(rbuf_bytes_free(buff), 7, "size_free");
-    CHECK_EQ(buff->head, buff->data + 5, "head_ptr");
-    CHECK_EQ(buff->tail, buff->data + 2, "tail_ptr");
-
-    subtest_no++;
-    ret = rbuf_bump_tail(buff, 3);
-    CHECK_EQ(ret, 1, "ret");
-    CHECK_EQ(rbuf_bytes_available(buff), 0, "size_avail");
-    CHECK_EQ(rbuf_bytes_free(buff), 10, "size_free");
-    CHECK_EQ(buff->head, buff->data, "head_ptr");
-    CHECK_EQ(buff->tail, buff->data, "tail_ptr");
-
-    subtest_no++;
-    ret = rbuf_bump_tail_noopt(buff, 1);
-    CHECK_EQ(ret, 0, "ret");
-    CHECK_EQ(rbuf_bytes_available(buff), 0, "size_avail");
-    CHECK_EQ(rbuf_bytes_free(buff), 10, "size_free");
-    CHECK_EQ(buff->head, buff->data, "head_ptr");
-    CHECK_EQ(buff->tail, buff->data, "tail_ptr");
-
-    subtest_no++;
-    ret = rbuf_bump_head(buff, 6);
-    ret = rbuf_bump_tail(buff, 5);
-    ret = rbuf_bump_head(buff, 6);
-    CHECK_EQ(ret, 1, "ret");
-    CHECK_EQ(rbuf_bytes_available(buff), 7, "size_avail");
-    CHECK_EQ(rbuf_bytes_free(buff), 3, "size_free");
-    CHECK_EQ(buff->head, buff->data + 2, "head_ptr");
-    CHECK_EQ(buff->tail, buff->data + 5, "tail_ptr");
-
-    subtest_no++;
-    ret = rbuf_bump_tail(buff, 5);
-    CHECK_EQ(ret, 1, "ret");
-    CHECK_EQ(rbuf_bytes_available(buff), 2, "size_avail");
-    CHECK_EQ(rbuf_bytes_free(buff), 8, "size_free");
-    CHECK_EQ(buff->head, buff->data + 2, "head_ptr");
-    CHECK_EQ(buff->tail, buff->data, "tail_ptr");
-
-    // check tail can't overrun head
-    subtest_no++;
-    ret = rbuf_bump_tail(buff, 3);
-    CHECK_EQ(ret, 0, "ret");
-    CHECK_EQ(rbuf_bytes_available(buff), 2, "size_avail");
-    CHECK_EQ(rbuf_bytes_free(buff), 8, "size_free");
-    CHECK_EQ(buff->head, buff->data + 2, "head_ptr");
-    CHECK_EQ(buff->tail, buff->data, "tail_ptr");
-
-    // check head can't overrun tail
-    subtest_no++;
-    ret = rbuf_bump_head(buff, 9);
-    CHECK_EQ(ret, 0, "ret");
-    CHECK_EQ(rbuf_bytes_available(buff), 2, "size_avail");
-    CHECK_EQ(rbuf_bytes_free(buff), 8, "size_free");
-    CHECK_EQ(buff->head, buff->data + 2, "head_ptr");
-    CHECK_EQ(buff->tail, buff->data, "tail_ptr");
-
-    // check head can fill the buffer
-    subtest_no++;
-    ret = rbuf_bump_head(buff, 8);
-    CHECK_EQ(ret, 1, "ret");
-    CHECK_EQ(rbuf_bytes_available(buff), 10, "size_avail");
-    CHECK_EQ(rbuf_bytes_free(buff), 0, "size_free");
-    CHECK_EQ(buff->head, buff->data, "head_ptr");
-    CHECK_EQ(buff->tail, buff->data, "tail_ptr");
-
-    // check can empty the buffer
-    subtest_no++;
-    ret = rbuf_bump_tail(buff, 10);
-    CHECK_EQ(ret, 1, "ret");
-    CHECK_EQ(rbuf_bytes_available(buff), 0, "size_avail");
-    CHECK_EQ(rbuf_bytes_free(buff), 10, "size_free");
-    CHECK_EQ(buff->head, buff->data, "head_ptr");
-    CHECK_EQ(buff->tail, buff->data, "tail_ptr");
-}
-
-static void test_rbuf_bump_tail()
-{
-    TEST_DECL();
-    test_rbuf_bump_tail_noopt(subtest_no);
-    test_rbuf_bump_tail_opt(subtest_no);
-}
-
-#define ASCII_A 0x61
-#define ASCII_Z 0x7A
-#define TEST_DATA_SIZE ASCII_Z-ASCII_A+1
-static void test_rbuf_push()
-{
-    TEST_DECL();
-    rbuf_t buff = rbuf_create(10);
-    int i;
-    char test_data[TEST_DATA_SIZE];
-
-    for (int i = 0; i <= TEST_DATA_SIZE; i++)
-        test_data[i] = i + ASCII_A;
-
-    int ret = rbuf_push(buff, test_data, 10);
-    CHECK_EQ(ret, 10, "written 10 bytes");
-    CHECK_EQ(rbuf_bytes_free(buff), 0, "empty size == 0");
-    for (i = 0; i < 10; i++)
-        CHECK_EQ(buff->data[i], i + ASCII_A, "Check data");
-
-    subtest_no++;
-    rbuf_flush(buff);
-    rbuf_bump_head(buff, 5);
-    rbuf_bump_tail_noopt(buff, 5); //to not reset both pointers to beginning
-    ret = rbuf_push(buff, test_data, 10);
-    CHECK_EQ(ret, 10, "written 10 bytes");
-    for (i = 0; i < 10; i++)
-        CHECK_EQ(buff->data[i], ((i+5)%10) + ASCII_A, "Check Data");
-
-    subtest_no++;
-    rbuf_flush(buff);
-    rbuf_bump_head(buff, 9);
-    rbuf_bump_tail_noopt(buff, 9);
-    ret = rbuf_push(buff, test_data, 10);
-    CHECK_EQ(ret, 10, "written 10 bytes");
-    for (i = 0; i < 10; i++)
-        CHECK_EQ(buff->data[i], ((i + 1) % 10) + ASCII_A, "Check data");
-
-    // let tail > head
-    subtest_no++;
-    rbuf_flush(buff);
-    rbuf_bump_head(buff, 9);
-    rbuf_bump_tail_noopt(buff, 9);
-    rbuf_bump_head(buff, 1);
-    ret = rbuf_push(buff, test_data, 9);
-    CHECK_EQ(ret, 9, "written 9 bytes");
-    CHECK_EQ(buff->head, buff->end - 1, "head_ptr");
-    CHECK_EQ(buff->tail, buff->head, "tail_ptr");
-    rbuf_bump_tail(buff, 1);
-    //TODO push byte can be usefull optimisation
-    ret = rbuf_push(buff, &test_data[9], 1);
-    CHECK_EQ(ret, 1, "written 1 byte");
-    CHECK_EQ(rbuf_bytes_free(buff), 0, "empty size == 0");
-    for (i = 0; i < 10; i++)
-        CHECK_EQ(buff->data[i], i + ASCII_A, "Check data");
-
-    subtest_no++;
-    rbuf_flush(buff);
-    rbuf_bump_head(buff, 9);
-    rbuf_bump_tail_noopt(buff, 7);
-    rbuf_bump_head(buff, 1);
-    ret = rbuf_push(buff, test_data, 7);
-    CHECK_EQ(ret, 7, "written 7 bytes");
-    CHECK_EQ(buff->head, buff->data + 7, "head_ptr");
-    CHECK_EQ(buff->tail, buff->head, "tail_ptr");
-    rbuf_bump_tail(buff, 3);
-    CHECK_EQ(buff->tail, buff->data, "tail_ptr");
-    //TODO push byte can be usefull optimisation
-    ret = rbuf_push(buff, &test_data[7], 3);
-    CHECK_EQ(ret, 3, "written 3 bytes");
-    CHECK_EQ(rbuf_bytes_free(buff), 0, "empty size == 0");
-    for (i = 0; i < 10; i++)
-        CHECK_EQ(buff->data[i], i + ASCII_A, "Check data");
-
-    // test can't overfill the buffer
-    subtest_no++;
-    rbuf_flush(buff);
-    rbuf_push(buff, test_data, TEST_DATA_SIZE);
-    CHECK_EQ(ret, 3, "written 10 bytes");
-    for (i = 0; i < 10; i++)
-        CHECK_EQ(buff->data[i], i + ASCII_A, "Check data");
-}
-
-#define TEST_RBUF_FIND_BYTES_SIZE 10
-void test_rbuf_find_bytes()
-{
-    TEST_DECL();
-    rbuf_t buff = rbuf_create(TEST_RBUF_FIND_BYTES_SIZE);
-    char *filler_3 = "   ";
-    char *needle = "needle";
-    int idx;
-    char *ptr;
-
-    // make sure needle is wrapped aroung in the buffer
-    // to test we still can find it
-    // target "edle    ne"
-    rbuf_bump_head(buff, TEST_RBUF_FIND_BYTES_SIZE / 2);
-    rbuf_push(buff, filler_3, strlen(filler_3));
-    rbuf_bump_tail(buff, TEST_RBUF_FIND_BYTES_SIZE / 2);
-    rbuf_push(buff, needle, strlen(needle));
-    ptr = rbuf_find_bytes(buff, needle, strlen(needle), &idx);
-    CHECK_EQ(ptr, buff->data + (TEST_RBUF_FIND_BYTES_SIZE / 2) + strlen(filler_3), "Pointer to needle correct");
-    CHECK_EQ(idx, ptr - buff->tail, "Check needle index");
-}
-
-int main()
-{
-    test_rbuf_bump_head();
-    test_rbuf_bump_tail();
-    test_rbuf_get_linear_insert_range();
-    test_rbuf_push();
-    test_rbuf_find_bytes();
-
-    printf(
-        KNRM "Total Tests %d, Total Checks %d, Successful Checks %d, Failed Checks %d\n",
-        total_tests, total_checks, total_checks - total_fails, total_fails);
-    if (total_fails)
-        printf(KRED "!!!Some test(s) Failed!!!\n");
-    else
-        printf(KGRN "ALL TESTS PASSED\n");
-
-    return total_fails;
-}

src/aclk/mqtt_websockets/common_internal.h

@@ -1,27 +1,12 @@
-// SPDX-License-Identifier: GPL-3.0-only
+// SPDX-License-Identifier: GPL-3.0-or-later
 
 #ifndef COMMON_INTERNAL_H
 #define COMMON_INTERNAL_H
 
 #include "endian_compat.h"
 
-#ifdef MQTT_WSS_CUSTOM_ALLOC
-#include "../helpers/mqtt_wss_pal.h"
-#else
-#define mw_malloc(...) malloc(__VA_ARGS__)
-#define mw_calloc(...) calloc(__VA_ARGS__)
-#define mw_free(...) free(__VA_ARGS__)
-#define mw_strdup(...) strdup(__VA_ARGS__)
-#define mw_realloc(...) realloc(__VA_ARGS__)
-#endif
-
 #ifndef MQTT_WSS_FRAG_MEMALIGN
 #define MQTT_WSS_FRAG_MEMALIGN (8)
 #endif
 
-#define OPENSSL_VERSION_095 0x00905100L
-#define OPENSSL_VERSION_097 0x00907000L
-#define OPENSSL_VERSION_110 0x10100000L
-#define OPENSSL_VERSION_111 0x10101000L
-
 #endif /* COMMON_INTERNAL_H */