Avoid allocating packet buffers unnecessarily.

[meshlink] / src / protocol.c

diff --git a/src/protocol.c b/src/protocol.c
index 785e20b534b83213f9ed28b01941cce34b494e86..482808a7e71885c6cf37d24ce42444f9d18c8aac 100644 (file)
--- a/src/protocol.c
+++ b/src/protocol.c
@@ -27,6 +27,7 @@
 #include "protocol.h"
 #include "utils.h"
 #include "xalloc.h"
+#include "submesh.h"
 
 /* Jumptable for the request handlers */
 
@@ -65,7 +66,11 @@ 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 char *format, ...) {
+bool send_request(meshlink_handle_t *mesh, connection_t *c, submesh_t *s, const char *format, ...) {
+       assert(c);
+       assert(format);
+       assert(*format);
+
        va_list args;
        char request[MAXBUFSIZE];
        int len;
@@ -88,25 +93,43 @@ bool send_request(meshlink_handle_t *mesh, connection_t *c, const char *format,
        request[len++] = '\n';
 
        if(c == mesh->everyone) {
-               broadcast_meta(mesh, NULL, request, len);
+
+               if(s) {
+                       broadcast_submesh_meta(mesh, NULL, s, request, len);
+               } else {
+                       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 char *request) {
+void forward_request(meshlink_handle_t *mesh, connection_t *from, 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';
-       broadcast_meta(mesh, from, tmp, sizeof(tmp));
+
+       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);
+
        if(c->outgoing && mesh->proxytype == PROXY_HTTP && c->allow_request == ID) {
                if(!request[0] || request[0] == '\r') {
                        return true;
@@ -164,13 +187,15 @@ static void free_past_request(past_request_t *r) {
        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 + mesh->pinginterval <= mesh->loop.now.tv_sec) {
+               if(p->firstseen + request_timeout <= mesh->loop.now.tv_sec) {
                        splay_delete_node(mesh->past_request_tree, node), deleted++;
                } else {
                        left++;
@@ -181,13 +206,17 @@ static void age_past_requests(event_loop_t *loop, void *data) {
                logger(mesh, MESHLINK_DEBUG, "Aging past requests: deleted %d, left %d", deleted, left);
        }
 
-       if(left)
-               timeout_set(&mesh->loop, &mesh->past_request_timeout, &(struct timeval) {
-               10, rand() % 100000
-       });
+       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)) {
@@ -197,16 +226,25 @@ bool seen_request(meshlink_handle_t *mesh, const char *request) {
                new = xmalloc(sizeof(*new));
                new->request = xstrdup(request);
                new->firstseen = mesh->loop.now.tv_sec;
+
+               if(!mesh->past_request_tree->head) {
+                       timeout_set(&mesh->loop, &mesh->past_request_timeout, &(struct timespec) {
+                               10, prng(mesh, TIMER_FUDGE)
+                       });
+               }
+
                splay_insert(mesh->past_request_tree, new);
-               timeout_add(&mesh->loop, &mesh->past_request_timeout, age_past_requests, NULL, &(struct timeval) {
-                       10, rand() % 100000
-               });
                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) {