Move node_udp_cache, everyone and invitation_key to mesh.

[meshlink] / src / protocol.c

diff --git a/src/protocol.c b/src/protocol.c
index 65aabd8101ababb82b1e258c95f96e5aba007d1c..aa434ee46b23cf3aac870ba0778c2e8770a1d386 100644 (file)
--- a/src/protocol.c
+++ b/src/protocol.c
@@ -1,7 +1,6 @@
 /*
     protocol.c -- handle the meta-protocol, basic functions
-    Copyright (C) 1999-2005 Ivo Timmermans,
-                  2000-2013 Guus Sliepen <guus@tinc-vpn.org>
+    Copyright (C) 2014 Guus Sliepen <guus@meshlink.io>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -23,18 +22,16 @@
 #include "conf.h"
 #include "connection.h"
 #include "logger.h"
+#include "meshlink_internal.h"
 #include "meta.h"
 #include "protocol.h"
 #include "utils.h"
 #include "xalloc.h"
 
-bool tunnelserver = false;
-bool experimental = true;
-
 /* Jumptable for the request handlers */
 
 static bool (*request_handlers[])(connection_t *, const char *) = {
-               id_h, metakey_h, challenge_h, chal_reply_h, ack_h,
+               id_h, NULL, NULL, NULL /* metakey_h, challenge_h, chal_reply_h */, ack_h,
                status_h, error_h, termreq_h,
                ping_h, pong_h,
                NULL, NULL, //add_subnet_h, del_subnet_h,
@@ -91,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
@@ -110,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)) {