Move code from libmeshlink.c into the new functions in meshlink.c.

[meshlink] / src / protocol.c

diff --git a/src/protocol.c b/src/protocol.c
index eb406544b68177cd2274c78b487c55896e5b9ffb..aa434ee46b23cf3aac870ba0778c2e8770a1d386 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)) {