X-Git-Url: http://git.meshlink.io/?p=meshlink;a=blobdiff_plain;f=src%2Fprotocol.c;h=1c5b6cfd9c1d43dba0c6a2e21defabdb4c431209;hp=f36538e382899ca4f4d3a27ff4267899fb64f185;hb=19be9cf7150858311f7898fa3fb525d692d02f64;hpb=00e71ece25070dc919f9bc0696e4ff3a387360d0

diff --git a/src/protocol.c b/src/protocol.c
index f36538e3..1c5b6cfd 100644
--- a/src/protocol.c
+++ b/src/protocol.c
@@ -30,16 +30,17 @@
 
 bool tunnelserver = false;
 bool strictsubnets = false;
+bool experimental = false;
 
 /* Jumptable for the request handlers */
 
-static bool (*request_handlers[])(connection_t *) = {
+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,
 		add_edge_h, del_edge_h,
-		key_changed_h, req_key_h, ans_key_h, tcppacket_h,
+		key_changed_h, req_key_h, ans_key_h, tcppacket_h, control_h,
 };
 
 /* Request names */
@@ -49,10 +50,10 @@ static char (*request_name[]) = {
 		"STATUS", "ERROR", "TERMREQ",
 		"PING", "PONG",
 		"ADD_SUBNET", "DEL_SUBNET",
-		"ADD_EDGE", "DEL_EDGE", "KEY_CHANGED", "REQ_KEY", "ANS_KEY", "PACKET",
+		"ADD_EDGE", "DEL_EDGE", "KEY_CHANGED", "REQ_KEY", "ANS_KEY", "PACKET", "CONTROL",
 };
 
-static avl_tree_t *past_request_tree;
+static splay_tree_t *past_request_tree;
 
 bool check_id(const char *id) {
 	for(; *id; id++)
@@ -67,116 +68,83 @@ bool check_id(const char *id) {
 
 bool send_request(connection_t *c, const char *format, ...) {
 	va_list args;
-	char buffer[MAXBUFSIZE];
-	int len, request = 0;
+	char request[MAXBUFSIZE];
+	int len;
 
 	/* Use vsnprintf instead of vxasprintf: faster, no memory
 	   fragmentation, cleanup is automatic, and there is a limit on the
 	   input buffer anyway */
 
 	va_start(args, format);
-	len = vsnprintf(buffer, MAXBUFSIZE, format, args);
+	len = vsnprintf(request, MAXBUFSIZE, format, args);
 	va_end(args);
 
 	if(len < 0 || len > MAXBUFSIZE - 1) {
-		logger(LOG_ERR, "Output buffer overflow while sending request to %s (%s)",
+		logger(DEBUG_ALWAYS, LOG_ERR, "Output buffer overflow while sending request to %s (%s)",
 			   c->name, c->hostname);
 		return false;
 	}
 
-	ifdebug(PROTOCOL) {
-		sscanf(buffer, "%d", &request);
-		ifdebug(META)
-			logger(LOG_DEBUG, "Sending %s to %s (%s): %s",
-				   request_name[request], c->name, c->hostname, buffer);
-		else
-			logger(LOG_DEBUG, "Sending %s to %s (%s)", request_name[request],
-				   c->name, c->hostname);
-	}
+	logger(DEBUG_META, LOG_DEBUG, "Sending %s to %s (%s): %s", request_name[atoi(request)], c->name, c->hostname, request);
 
-	buffer[len++] = '\n';
+	request[len++] = '\n';
 
 	if(c == everyone) {
-		broadcast_meta(NULL, buffer, len);
+		broadcast_meta(NULL, request, len);
 		return true;
 	} else
-		return send_meta(c, buffer, len);
+		return send_meta(c, request, len);
 }
 
-void forward_request(connection_t *from) {
-	int request;
-
-	ifdebug(PROTOCOL) {
-		sscanf(from->buffer, "%d", &request);
-		ifdebug(META)
-			logger(LOG_DEBUG, "Forwarding %s from %s (%s): %s",
-				   request_name[request], from->name, from->hostname,
-				   from->buffer);
-		else
-			logger(LOG_DEBUG, "Forwarding %s from %s (%s)",
-				   request_name[request], from->name, from->hostname);
-	}
-
-	from->buffer[from->reqlen - 1] = '\n';
+void forward_request(connection_t *from, const char *request) {
+	logger(DEBUG_META, LOG_DEBUG, "Forwarding %s from %s (%s): %s", request_name[atoi(request)], from->name, from->hostname, request);
 
-	broadcast_meta(from, from->buffer, from->reqlen);
+	// Create a temporary newline-terminated copy of the request
+	int len = strlen(request);
+	char tmp[len + 1];
+	memcpy(tmp, request, len);
+	tmp[len] = '\n';
+	broadcast_meta(from, tmp, sizeof tmp);
 }
 
-bool receive_request(connection_t *c) {
-	int request;
-
+bool receive_request(connection_t *c, const char *request) {
 	if(proxytype == PROXY_HTTP && c->allow_request == ID) {
-		if(!c->buffer[0] || c->buffer[0] == '\r')
+		if(!request[0] || request[0] == '\r')
 			return true;
-		if(!strncasecmp(c->buffer, "HTTP/1.1 ", 9)) {
-			if(!strncmp(c->buffer + 9, "200", 3)) {
-				logger(LOG_DEBUG, "Proxy request granted");
+		if(!strncasecmp(request, "HTTP/1.1 ", 9)) {
+			if(!strncmp(request + 9, "200", 3)) {
+				logger(DEBUG_CONNECTIONS, LOG_DEBUG, "Proxy request granted");
 				return true;
 			} else {
-				logger(LOG_DEBUG, "Proxy request rejected: %s", c->buffer + 9);
+				logger(DEBUG_ALWAYS, LOG_DEBUG, "Proxy request rejected: %s", request + 9);
 				return false;
 			}
 		}
 	}
 
-	if(sscanf(c->buffer, "%d", &request) == 1) {
-		if((request < 0) || (request >= LAST) || !request_handlers[request]) {
-			ifdebug(META)
-				logger(LOG_DEBUG, "Unknown request from %s (%s): %s",
-					   c->name, c->hostname, c->buffer);
-			else
-				logger(LOG_ERR, "Unknown request from %s (%s)",
-					   c->name, c->hostname);
+	int reqno = atoi(request);
 
+	if(reqno || *request == '0') {
+		if((reqno < 0) || (reqno >= LAST) || !request_handlers[reqno]) {
+			logger(DEBUG_META, LOG_DEBUG, "Unknown request from %s (%s): %s", c->name, c->hostname, request);
 			return false;
 		} else {
-			ifdebug(PROTOCOL) {
-				ifdebug(META)
-					logger(LOG_DEBUG, "Got %s from %s (%s): %s",
-						   request_name[request], c->name, c->hostname,
-						   c->buffer);
-				else
-					logger(LOG_DEBUG, "Got %s from %s (%s)",
-						   request_name[request], c->name, c->hostname);
-			}
+			logger(DEBUG_META, LOG_DEBUG, "Got %s from %s (%s): %s", request_name[reqno], c->name, c->hostname, request);
 		}
 
-		if((c->allow_request != ALL) && (c->allow_request != request)) {
-			logger(LOG_ERR, "Unauthorized request from %s (%s)", c->name,
-				   c->hostname);
+		if((c->allow_request != ALL) && (c->allow_request != reqno)) {
+			logger(DEBUG_ALWAYS, LOG_ERR, "Unauthorized request from %s (%s)", c->name, c->hostname);
 			return false;
 		}
 
-		if(!request_handlers[request](c)) {
+		if(!request_handlers[reqno](c, request)) {
 			/* Something went wrong. Probably scriptkiddies. Terminate. */
 
-			logger(LOG_ERR, "Error while processing %s from %s (%s)",
-				   request_name[request], c->name, c->hostname);
+			logger(DEBUG_ALWAYS, LOG_ERR, "Error while processing %s from %s (%s)", request_name[reqno], c->name, c->hostname);
 			return false;
 		}
 	} else {
-		logger(LOG_ERR, "Bogus data received from %s (%s)",
-			   c->name, c->hostname);
+		logger(DEBUG_ALWAYS, LOG_ERR, "Bogus data received from %s (%s)", c->name, c->hostname);
 		return false;
 	}
 
@@ -189,52 +157,64 @@ 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);
+		free((char *)r->request);
 
 	free(r);
 }
 
-void init_requests(void) {
-	past_request_tree = avl_alloc_tree((avl_compare_t) past_request_compare, (avl_action_t) free_past_request);
-}
+static struct event past_request_event;
 
-void exit_requests(void) {
-	avl_delete_tree(past_request_tree);
-}
-
-bool seen_request(char *request) {
+bool seen_request(const char *request) {
 	past_request_t *new, p = {NULL};
 
 	p.request = request;
 
-	if(avl_search(past_request_tree, &p)) {
-		ifdebug(SCARY_THINGS) logger(LOG_DEBUG, "Already seen request");
+	if(splay_search(past_request_tree, &p)) {
+		logger(DEBUG_SCARY_THINGS, LOG_DEBUG, "Already seen request");
 		return true;
 	} else {
-		new = xmalloc(sizeof(*new));
+		new = xmalloc(sizeof *new);
 		new->request = xstrdup(request);
-		new->firstseen = now;
-		avl_insert(past_request_tree, new);
+		new->firstseen = time(NULL);
+		splay_insert(past_request_tree, new);
+		event_add(&past_request_event, &(struct timeval){10, 0});
 		return false;
 	}
 }
 
-void age_past_requests(void) {
-	avl_node_t *node, *next;
+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);
 
 	for(node = past_request_tree->head; node; node = next) {
 		next = node->next;
 		p = node->data;
 
 		if(p->firstseen + pinginterval <= now)
-			avl_delete_node(past_request_tree, node), deleted++;
+			splay_delete_node(past_request_tree, node), deleted++;
 		else
 			left++;
 	}
 
 	if(left || deleted)
-		ifdebug(SCARY_THINGS) logger(LOG_DEBUG, "Aging past requests: deleted %d, left %d",
+		logger(DEBUG_SCARY_THINGS, LOG_DEBUG, "Aging past requests: deleted %d, left %d",
 			   deleted, left);
+
+	if(left)
+		event_add(&past_request_event, &(struct timeval){10, 0});
+}
+
+void init_requests(void) {
+	past_request_tree = splay_alloc_tree((splay_compare_t) past_request_compare, (splay_action_t) free_past_request);
+
+	timeout_set(&past_request_event, age_past_requests, NULL);
+}
+
+void exit_requests(void) {
+	splay_delete_tree(past_request_tree);
+
+	if(timeout_initialized(&past_request_event))
+		event_del(&past_request_event);
 }