X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fprotocol.c;h=d166305bee8185ff0397e71ff34e757091b4baf5;hb=c83c2d080f21b12db42ef664d7c3272b8b700656;hp=1c5b6cfd9c1d43dba0c6a2e21defabdb4c431209;hpb=268c8545aaf83b7433f43402f5c77e39e20006ef;p=tinc

diff --git a/src/protocol.c b/src/protocol.c
index 1c5b6cfd..d166305b 100644
--- a/src/protocol.c
+++ b/src/protocol.c
@@ -30,7 +30,7 @@
 
 bool tunnelserver = false;
 bool strictsubnets = false;
-bool experimental = false;
+bool experimental = true;
 
 /* Jumptable for the request handlers */
 
@@ -56,6 +56,9 @@ static char (*request_name[]) = {
 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 != '_')
 			return false;
@@ -108,7 +111,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)) {
@@ -162,7 +165,24 @@ static void free_past_request(past_request_t *r) {
 	free(r);
 }
 
-static struct event past_request_event;
+static timeout_t past_request_timeout;
+
+static void age_past_requests(void *data) {
+	int left = 0, deleted = 0;
+
+	for splay_each(past_request_t, p, past_request_tree) {
+		if(p->firstseen + pinginterval <= now.tv_sec)
+			splay_delete_node(past_request_tree, node), deleted++;
+		else
+			left++;
+	}
+
+	if(left || deleted)
+		logger(DEBUG_SCARY_THINGS, LOG_DEBUG, "Aging past requests: deleted %d, left %d", deleted, left);
+
+	if(left)
+		timeout_set(&past_request_timeout, &(struct timeval){10, rand() % 100000});
+}
 
 bool seen_request(const char *request) {
 	past_request_t *new, p = {NULL};
@@ -175,46 +195,19 @@ 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);
-		event_add(&past_request_event, &(struct timeval){10, 0});
+		timeout_add(&past_request_timeout, age_past_requests, NULL, &(struct timeval){10, rand() % 100000});
 		return false;
 	}
 }
 
-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)
-			splay_delete_node(past_request_tree, node), deleted++;
-		else
-			left++;
-	}
-
-	if(left || deleted)
-		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);
+	timeout_del(&past_request_timeout);
 }