Work around STATUS already being defined in the ESP32 header files.

[meshlink-tiny] / src / protocol.c

diff --git a/src/protocol.c b/src/protocol.c
index 9d1dff971e2b800a803584027aeb914866032be8..f0e911c1db8adf5232df49a9c415547795f9b4d2 100644 (file)
--- a/src/protocol.c
+++ b/src/protocol.c
@@ -27,14 +27,13 @@
 #include "protocol.h"
 #include "utils.h"
 #include "xalloc.h"
-#include "submesh.h"
 
 /* Jumptable for the request handlers */
 
 static bool (*request_handlers[NUM_REQUESTS])(meshlink_handle_t *, connection_t *, const char *) = {
        [ID] = id_h,
        [ACK] = ack_h,
-       [STATUS] = status_h,
+       [PSTATUS] = status_h,
        [ERROR] = error_h,
        [TERMREQ] = termreq_h,
        [PING] = ping_h,
@@ -44,14 +43,15 @@ static bool (*request_handlers[NUM_REQUESTS])(meshlink_handle_t *, connection_t
        [KEY_CHANGED] = key_changed_h,
        [REQ_KEY] = req_key_h,
        [ANS_KEY] = ans_key_h,
+       [PACKET] = raw_packet_h,
 };
 
 /* Request names */
 
-static const char *request_name[NUM_REQUESTS] = {
+static const char *request_name[NUM_REQUESTS] __attribute__((unused)) = {
        [ID] = "ID",
        [ACK] = "ACK",
-       [STATUS] = "STATUS",
+       [PSTATUS] = "STATUS",
        [ERROR] = "ERROR",
        [TERMREQ] = "TERMREQ",
        [PING] = "PING",
@@ -61,6 +61,7 @@ static const char *request_name[NUM_REQUESTS] = {
        [KEY_CHANGED] = "KEY_CHANGED",
        [REQ_KEY] = "REQ_KEY",
        [ANS_KEY] = "ANS_KEY",
+       [PACKET] = "PACKET",
 };
 
 bool check_id(const char *id) {
@@ -79,7 +80,7 @@ bool check_id(const char *id) {
 /* Generic request routines - takes care of logging and error
    detection as well */
 
-bool send_request(meshlink_handle_t *mesh, connection_t *c, const submesh_t *s, const char *format, ...) {
+bool send_request(meshlink_handle_t *mesh, connection_t *c, const char *format, ...) {
        assert(format);
        assert(*format);
 
@@ -110,40 +111,13 @@ bool send_request(meshlink_handle_t *mesh, connection_t *c, const submesh_t *s,
        request[len++] = '\n';
 
        if(c == mesh->everyone) {
-
-               if(s) {
-                       broadcast_submesh_meta(mesh, NULL, s, request, len);
-               } else {
-                       broadcast_meta(mesh, NULL, request, len);
-               }
-
+               broadcast_meta(mesh, NULL, request, len);
                return true;
        } else {
                return send_meta(mesh, c, request, len);
        }
 }
 
-void forward_request(meshlink_handle_t *mesh, connection_t *from, const submesh_t *s, const char *request) {
-       assert(from);
-       assert(request);
-       assert(*request);
-
-       logger(mesh, MESHLINK_DEBUG, "Forwarding %s from %s: %s", request_name[atoi(request)], from->name, request);
-
-       // Create a temporary newline-terminated copy of the request
-       int len = strlen(request);
-       char tmp[len + 1];
-
-       memcpy(tmp, request, len);
-       tmp[len] = '\n';
-
-       if(s) {
-               broadcast_submesh_meta(mesh, from, s, tmp, sizeof(tmp));
-       } else {
-               broadcast_meta(mesh, from, tmp, sizeof(tmp));
-       }
-}
-
 bool receive_request(meshlink_handle_t *mesh, connection_t *c, const char *request) {
        assert(request);
 
@@ -175,85 +149,3 @@ bool receive_request(meshlink_handle_t *mesh, connection_t *c, const char *reque
 
        return true;
 }
-
-static int past_request_compare(const past_request_t *a, const past_request_t *b) {
-       return strcmp(a->request, b->request);
-}
-
-static void free_past_request(past_request_t *r) {
-       if(r->request) {
-               free((void *)r->request);
-       }
-
-       free(r);
-}
-
-static const int request_timeout = 60;
-
-static void age_past_requests(event_loop_t *loop, void *data) {
-       (void)data;
-       meshlink_handle_t *mesh = loop->data;
-       int left = 0, deleted = 0;
-
-       for splay_each(past_request_t, p, mesh->past_request_tree) {
-               if(p->firstseen + request_timeout <= mesh->loop.now.tv_sec) {
-                       splay_delete_node(mesh->past_request_tree, splay_node), deleted++;
-               } else {
-                       left++;
-               }
-       }
-
-       if(left || deleted) {
-               logger(mesh, MESHLINK_DEBUG, "Aging past requests: deleted %d, left %d", deleted, left);
-       }
-
-       if(left) {
-               timeout_set(&mesh->loop, &mesh->past_request_timeout, &(struct timespec) {
-                       10, prng(mesh, TIMER_FUDGE)
-               });
-       }
-}
-
-bool seen_request(meshlink_handle_t *mesh, const char *request) {
-       assert(request);
-       assert(*request);
-
-       past_request_t *new, p = {.request = request};
-
-       if(splay_search(mesh->past_request_tree, &p)) {
-               logger(mesh, MESHLINK_DEBUG, "Already seen request");
-               return true;
-       } else {
-               new = xmalloc(sizeof(*new));
-               new->request = xstrdup(request);
-               new->firstseen = mesh->loop.now.tv_sec;
-
-               if(!mesh->past_request_tree->head && mesh->past_request_timeout.cb) {
-                       timeout_set(&mesh->loop, &mesh->past_request_timeout, &(struct timespec) {
-                               10, prng(mesh, TIMER_FUDGE)
-                       });
-               }
-
-               splay_insert(mesh->past_request_tree, new);
-               return false;
-       }
-}
-
-void init_requests(meshlink_handle_t *mesh) {
-       assert(!mesh->past_request_tree);
-
-       mesh->past_request_tree = splay_alloc_tree((splay_compare_t) past_request_compare, (splay_action_t) free_past_request);
-       timeout_add(&mesh->loop, &mesh->past_request_timeout, age_past_requests, NULL, &(struct timespec) {
-               0, 0
-       });
-}
-
-void exit_requests(meshlink_handle_t *mesh) {
-       if(mesh->past_request_tree) {
-               splay_delete_tree(mesh->past_request_tree);
-       }
-
-       mesh->past_request_tree = NULL;
-
-       timeout_del(&mesh->loop, &mesh->past_request_timeout);
-}