Remove everything GPL that is not copyright Guus Sliepen, update copyright statements.

[meshlink] / src / protocol.c

diff --git a/src/protocol.c b/src/protocol.c
index bdc0378bf29c8e6429c4f17197d4f169a604df93..944547456ca0e798b9f445dc1ba1592cc9308d53 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-2012 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
@@ -28,9 +27,7 @@
 #include "utils.h"
 #include "xalloc.h"
 
-bool tunnelserver = false;
-bool strictsubnets = false;
-bool experimental = false;
+bool experimental = true;
 
 /* Jumptable for the request handlers */
 
@@ -38,9 +35,9 @@ static bool (*request_handlers[])(connection_t *, const char *) = {
                id_h, metakey_h, challenge_h, chal_reply_h, ack_h,
                status_h, error_h, termreq_h,
                ping_h, pong_h,
-               add_subnet_h, del_subnet_h,
+               NULL, NULL, //add_subnet_h, del_subnet_h,
                add_edge_h, del_edge_h,
-               key_changed_h, req_key_h, ans_key_h, tcppacket_h, control_h,
+               key_changed_h, req_key_h, ans_key_h, tcppacket_h, NULL, //control_h,
 };
 
 /* Request names */
@@ -111,7 +108,7 @@ void forward_request(connection_t *from, const char *request) {
 }
 
 bool receive_request(connection_t *c, const char *request) {
-       if(proxytype == PROXY_HTTP && c->allow_request == ID) {
+       if(c->outgoing && proxytype == PROXY_HTTP && c->allow_request == ID) {
                if(!request[0] || request[0] == '\r')
                        return true;
                if(!strncasecmp(request, "HTTP/1.1 ", 9)) {
@@ -195,7 +192,7 @@ bool seen_request(const char *request) {
        } else {
                new = xmalloc(sizeof *new);
                new->request = xstrdup(request);
-               new->firstseen = time(NULL);
+               new->firstseen = now.tv_sec;
                splay_insert(past_request_tree, new);
                timeout_add(&past_request_timeout, age_past_requests, NULL, &(struct timeval){10, rand() % 100000});
                return false;