X-Git-Url: http://git.meshlink.io/?p=meshlink;a=blobdiff_plain;f=src%2Fprotocol.c;h=482808a7e71885c6cf37d24ce42444f9d18c8aac;hp=116e139eebc98c686652bb62e8b4d0095b3a525e;hb=963c5055505f2fc117cd5efa06eaa02c9b2bf85d;hpb=3fba80174dbe29bcfe0d121a2a1d2e61be5ee57b

diff --git a/src/protocol.c b/src/protocol.c
index 116e139e..482808a7 100644
--- 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-2009 Guus Sliepen <guus@tinc-vpn.org>
+    Copyright (C) 2014-2017 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,42 +22,43 @@
 #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 strictsubnets = false;
-bool experimental = false;
+#include "submesh.h"
 
 /* Jumptable for the request handlers */
 
-static bool (*request_handlers[])(connection_t *, 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,
-		add_edge_h, del_edge_h,
-		key_changed_h, req_key_h, ans_key_h, tcppacket_h, control_h,
+static bool (*request_handlers[])(meshlink_handle_t *, connection_t *, const char *) = {
+	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,
+	add_edge_h, del_edge_h,
+	key_changed_h, req_key_h, ans_key_h, tcppacket_h, NULL, //control_h,
 };
 
 /* Request names */
 
 static char (*request_name[]) = {
-		"ID", "METAKEY", "CHALLENGE", "CHAL_REPLY", "ACK",
-		"STATUS", "ERROR", "TERMREQ",
-		"PING", "PONG",
-		"ADD_SUBNET", "DEL_SUBNET",
-		"ADD_EDGE", "DEL_EDGE", "KEY_CHANGED", "REQ_KEY", "ANS_KEY", "PACKET", "CONTROL",
+	"ID", "METAKEY", "CHALLENGE", "CHAL_REPLY", "ACK",
+	"STATUS", "ERROR", "TERMREQ",
+	"PING", "PONG",
+	"ADD_SUBNET", "DEL_SUBNET",
+	"ADD_EDGE", "DEL_EDGE", "KEY_CHANGED", "REQ_KEY", "ANS_KEY", "PACKET", "CONTROL",
 };
 
-static splay_tree_t *past_request_tree;
-
 bool check_id(const char *id) {
+	if(!id || !*id) {
+		return false;
+	}
+
 	for(; *id; id++)
-		if(!isalnum(*id) && *id != '_')
+		if(!isalnum(*id) && *id != '_' && *id != '-') {
 			return false;
+		}
 
 	return true;
 }
@@ -66,7 +66,11 @@ bool check_id(const char *id) {
 /* Generic request routines - takes care of logging and error
    detection as well */
 
-bool send_request(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;
@@ -80,85 +84,91 @@ bool send_request(connection_t *c, const char *format, ...) {
 	va_end(args);
 
 	if(len < 0 || len > MAXBUFSIZE - 1) {
-		logger(LOG_ERR, "Output buffer overflow while sending request to %s (%s)",
-			   c->name, c->hostname);
+		logger(mesh, MESHLINK_ERROR, "Output buffer overflow while sending request to %s", c->name);
 		return false;
 	}
 
-	ifdebug(PROTOCOL) {
-		ifdebug(META)
-			logger(LOG_DEBUG, "Sending %s to %s (%s): %s",
-				   request_name[atoi(request)], c->name, c->hostname, request);
-		else
-			logger(LOG_DEBUG, "Sending %s to %s (%s)", request_name[atoi(request)],
-				   c->name, c->hostname);
-	}
+	logger(mesh, MESHLINK_DEBUG, "Sending %s to %s: %s", request_name[atoi(request)], c->name, request);
 
 	request[len++] = '\n';
 
-	if(c == everyone) {
-		broadcast_meta(NULL, request, len);
+	if(c == mesh->everyone) {
+
+		if(s) {
+			broadcast_submesh_meta(mesh, NULL, s, request, len);
+		} else {
+			broadcast_meta(mesh, NULL, request, len);
+		}
+
 		return true;
-	} else
-		return send_meta(c, request, len);
+	} else {
+		return send_meta(mesh, c, request, len);
+	}
 }
 
-void forward_request(connection_t *from, char *request) {
-	/* Note: request is not zero terminated anymore after a call to this function! */
-	ifdebug(PROTOCOL) {
-		ifdebug(META)
-			logger(LOG_DEBUG, "Forwarding %s from %s (%s): %s",
-				   request_name[atoi(request)], from->name, from->hostname, request);
-		else
-			logger(LOG_DEBUG, "Forwarding %s from %s (%s)",
-				   request_name[atoi(request)], from->name, from->hostname);
-	}
+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);
-	request[len++] = '\n';
-	broadcast_meta(from, request, len);
+	char tmp[len + 1];
+
+	memcpy(tmp, request, len);
+	tmp[len] = '\n';
+
+	if(s) {
+		broadcast_submesh_meta(mesh, from, s, tmp, sizeof(tmp));
+	} else {
+		broadcast_meta(mesh, from, tmp, sizeof(tmp));
+	}
 }
 
-bool receive_request(connection_t *c, char *request) {
+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;
+		}
+
+		if(!strncasecmp(request, "HTTP/1.1 ", 9)) {
+			if(!strncmp(request + 9, "200", 3)) {
+				logger(mesh, MESHLINK_DEBUG, "Proxy request granted");
+				return true;
+			} else {
+				logger(mesh, MESHLINK_DEBUG, "Proxy request rejected: %s", request + 9);
+				return false;
+			}
+		}
+	}
+
 	int reqno = atoi(request);
 
 	if(reqno || *request == '0') {
 		if((reqno < 0) || (reqno >= LAST) || !request_handlers[reqno]) {
-			ifdebug(META)
-				logger(LOG_DEBUG, "Unknown request from %s (%s): %s",
-					   c->name, c->hostname, request);
-			else
-				logger(LOG_ERR, "Unknown request from %s (%s)",
-					   c->name, c->hostname);
-
+			logger(mesh, MESHLINK_DEBUG, "Unknown request from %s: %s", c->name, request);
 			return false;
 		} else {
-			ifdebug(PROTOCOL) {
-				ifdebug(META)
-					logger(LOG_DEBUG, "Got %s from %s (%s): %s",
-						   request_name[reqno], c->name, c->hostname, request);
-				else
-					logger(LOG_DEBUG, "Got %s from %s (%s)",
-						   request_name[reqno], c->name, c->hostname);
-			}
+			logger(mesh, MESHLINK_DEBUG, "Got %s from %s: %s", request_name[reqno], c->name, request);
 		}
 
 		if((c->allow_request != ALL) && (c->allow_request != reqno)) {
-			logger(LOG_ERR, "Unauthorized request from %s (%s)", c->name,
-				   c->hostname);
+			logger(mesh, MESHLINK_ERROR, "Unauthorized request from %s", c->name);
 			return false;
 		}
 
-		if(!request_handlers[reqno](c, request)) {
+		if(!request_handlers[reqno](mesh, c, request)) {
 			/* Something went wrong. Probably scriptkiddies. Terminate. */
 
-			logger(LOG_ERR, "Error while processing %s from %s (%s)",
-				   request_name[reqno], c->name, c->hostname);
+			logger(mesh, MESHLINK_ERROR, "Error while processing %s from %s", request_name[reqno], c->name);
 			return false;
 		}
 	} else {
-		logger(LOG_ERR, "Bogus data received from %s (%s)",
-			   c->name, c->hostname);
+		logger(mesh, MESHLINK_ERROR, "Bogus data received from %s", c->name);
 		return false;
 	}
 
@@ -170,65 +180,79 @@ static int past_request_compare(const past_request_t *a, const past_request_t *b
 }
 
 static void free_past_request(past_request_t *r) {
-	if(r->request)
-		free(r->request);
+	if(r->request) {
+		free((void *)r->request);
+	}
 
 	free(r);
 }
 
-static struct event past_request_event;
+static const int request_timeout = 60;
 
-bool seen_request(char *request) {
-	past_request_t *new, p = {NULL};
+static void age_past_requests(event_loop_t *loop, void *data) {
+	(void)data;
+	meshlink_handle_t *mesh = loop->data;
+	int left = 0, deleted = 0;
 
-	p.request = request;
+	for splay_each(past_request_t, p, mesh->past_request_tree) {
+		if(p->firstseen + request_timeout <= mesh->loop.now.tv_sec) {
+			splay_delete_node(mesh->past_request_tree, node), deleted++;
+		} else {
+			left++;
+		}
+	}
 
-	if(splay_search(past_request_tree, &p)) {
-		ifdebug(SCARY_THINGS) logger(LOG_DEBUG, "Already seen request");
-		return true;
-	} else {
-		new = xmalloc(sizeof *new);
-		new->request = xstrdup(request);
-		new->firstseen = time(NULL);
-		splay_insert(past_request_tree, new);
-		event_add(&past_request_event, &(struct timeval){10, 0});
-		return false;
+	if(left || deleted) {
+		logger(mesh, MESHLINK_DEBUG, "Aging past requests: deleted %d, left %d", deleted, left);
+	}
+
+	if(left) {
+		timeout_set(&mesh->loop, &mesh->past_request_timeout, &(struct timespec) {
+			10, prng(mesh, TIMER_FUDGE)
+		});
 	}
 }
 
-static void age_past_requests(int fd, short events, void *data) {
-	splay_node_t *node, *next;
-	past_request_t *p;
-	int left = 0, deleted = 0;
-	time_t now = time(NULL);
+bool seen_request(meshlink_handle_t *mesh, const char *request) {
+	assert(request);
+	assert(*request);
 
-	for(node = past_request_tree->head; node; node = next) {
-		next = node->next;
-		p = node->data;
+	past_request_t *new, p = {.request = request};
 
-		if(p->firstseen + pinginterval <= now)
-			splay_delete_node(past_request_tree, node), deleted++;
-		else
-			left++;
-	}
+	if(splay_search(mesh->past_request_tree, &p)) {
+		logger(mesh, MESHLINK_DEBUG, "Already seen request");
+		return true;
+	} else {
+		new = xmalloc(sizeof(*new));
+		new->request = xstrdup(request);
+		new->firstseen = mesh->loop.now.tv_sec;
 
-	if(left || deleted)
-		ifdebug(SCARY_THINGS) logger(LOG_DEBUG, "Aging past requests: deleted %d, left %d",
-			   deleted, left);
+		if(!mesh->past_request_tree->head) {
+			timeout_set(&mesh->loop, &mesh->past_request_timeout, &(struct timespec) {
+				10, prng(mesh, TIMER_FUDGE)
+			});
+		}
 
-	if(left)
-		event_add(&past_request_event, &(struct timeval){10, 0});
+		splay_insert(mesh->past_request_tree, new);
+		return false;
+	}
 }
 
-void init_requests(void) {
-	past_request_tree = splay_alloc_tree((splay_compare_t) past_request_compare, (splay_action_t) free_past_request);
+void init_requests(meshlink_handle_t *mesh) {
+	assert(!mesh->past_request_tree);
 
-	timeout_set(&past_request_event, age_past_requests, NULL);
+	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(void) {
-	splay_delete_tree(past_request_tree);
+void exit_requests(meshlink_handle_t *mesh) {
+	if(mesh->past_request_tree) {
+		splay_delete_tree(mesh->past_request_tree);
+	}
+
+	mesh->past_request_tree = NULL;
 
-	if(timeout_initialized(&past_request_event))
-		event_del(&past_request_event);
+	timeout_del(&mesh->loop, &mesh->past_request_timeout);
 }