X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fprotocol.c;h=b8b8104328073b38445f3c56001c4126f78da998;hb=74c89c1dc9b14436c79cdf49366d3e5c19862457;hp=ac4b767ea5d10d50672a39df51f7667c4db2b552;hpb=7ea85043ac1fb2096baea44f6b0af27ac0d0b2cf;p=tinc

diff --git a/src/protocol.c b/src/protocol.c
index ac4b767e..b8b81043 100644
--- a/src/protocol.c
+++ b/src/protocol.c
@@ -29,6 +29,7 @@
 #include "xalloc.h"
 
 bool tunnelserver = false;
+bool strictsubnets = false;
 
 /* Jumptable for the request handlers */
 
@@ -38,7 +39,7 @@ static bool (*request_handlers[])(connection_t *, char *) = {
 		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 */
@@ -48,7 +49,7 @@ 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 splay_tree_t *past_request_tree;
@@ -102,6 +103,7 @@ bool send_request(connection_t *c, const char *format, ...) {
 }
 
 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",
@@ -112,7 +114,7 @@ void forward_request(connection_t *from, char *request) {
 	}
 
 	int len = strlen(request);
-	request[len] = '\n';
+	request[len++] = '\n';
 	broadcast_meta(from, request, len);
 }
 
@@ -188,12 +190,13 @@ bool seen_request(char *request) {
 		new->request = xstrdup(request);
 		new->firstseen = time(NULL);
 		splay_insert(past_request_tree, new);
-		event_add(&past_request_event, &(struct timeval){10, 0});
+		past_request_event.time = time(NULL) + 10;
+		event_add(&past_request_event);
 		return false;
 	}
 }
 
-void age_past_requests(int fd, short events, void *data) {
+void age_past_requests(void *data) {
 	splay_node_t *node, *next;
 	past_request_t *p;
 	int left = 0, deleted = 0;
@@ -213,14 +216,18 @@ void age_past_requests(int fd, short events, void *data) {
 		ifdebug(SCARY_THINGS) logger(LOG_DEBUG, "Aging past requests: deleted %d, left %d",
 			   deleted, left);
 
-	if(left)
-		event_add(&past_request_event, &(struct timeval){10, 0});
+	if(left) {
+		past_request_event.time = time(NULL) + 10;
+		event_add(&past_request_event);
+	}
 }
 
 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);
+	past_request_event.handler = age_past_requests;
+	past_request_event.time = time(NULL) + 10;
+	event_add(&past_request_event);
 }
 
 void exit_requests(void) {