Move pinginterval pingtimeout and maxtimeout to mesh

[meshlink] / src / protocol.c

diff --git a/src/protocol.c b/src/protocol.c
index eb406544b68177cd2274c78b487c55896e5b9ffb..3e6db47e05c154409dc5107ffd034150e62978f2 100644 (file)
--- a/src/protocol.c
+++ b/src/protocol.c
@@ -22,6 +22,7 @@
 #include "conf.h"
 #include "connection.h"
 #include "logger.h"
+#include "meshlink_internal.h"
 #include "meta.h"
 #include "protocol.h"
 #include "utils.h"
@@ -87,7 +88,7 @@ bool send_request(connection_t *c, const char *format, ...) {
 
        request[len++] = '\n';
 
-       if(c == everyone) {
+       if(c == mesh->everyone) {
                broadcast_meta(NULL, request, len);
                return true;
        } else
@@ -106,7 +107,7 @@ void forward_request(connection_t *from, const char *request) {
 }
 
 bool receive_request(connection_t *c, const char *request) {
-       if(c->outgoing && proxytype == PROXY_HTTP && c->allow_request == ID) {
+       if(c->outgoing && mesh->proxytype == PROXY_HTTP && c->allow_request == ID) {
                if(!request[0] || request[0] == '\r')
                        return true;
                if(!strncasecmp(request, "HTTP/1.1 ", 9)) {
@@ -166,7 +167,7 @@ static void age_past_requests(void *data) {
        int left = 0, deleted = 0;
 
        for splay_each(past_request_t, p, past_request_tree) {
-               if(p->firstseen + pinginterval <= now.tv_sec)
+               if(p->firstseen + mesh->pinginterval <= now.tv_sec)
                        splay_delete_node(past_request_tree, node), deleted++;
                else
                        left++;