X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fprotocol.c;h=bdc0378bf29c8e6429c4f17197d4f169a604df93;hb=6bc5d626a8726fc23365ee705761a3c666a08ad4;hp=2b179a72608c4cee65fcaccf548ac69787c50084;hpb=58007d7efa3940c863c5a398f8b257a686ce37ba;p=tinc

diff --git a/src/protocol.c b/src/protocol.c
index 2b179a72..bdc0378b 100644
--- a/src/protocol.c
+++ b/src/protocol.c
@@ -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;
@@ -104,10 +107,24 @@ void forward_request(connection_t *from, const char *request) {
 	char tmp[len + 1];
 	memcpy(tmp, request, len);
 	tmp[len] = '\n';
-	broadcast_meta(from, tmp, len);
+	broadcast_meta(from, tmp, sizeof tmp);
 }
 
 bool receive_request(connection_t *c, const char *request) {
+	if(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(DEBUG_CONNECTIONS, LOG_DEBUG, "Proxy request granted");
+				return true;
+			} else {
+				logger(DEBUG_ALWAYS, LOG_DEBUG, "Proxy request rejected: %s", request + 9);
+				return false;
+			}
+		}
+	}
+
 	int reqno = atoi(request);
 
 	if(reqno || *request == '0') {
@@ -148,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};
@@ -163,44 +197,17 @@ bool seen_request(const 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});
+		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);
 }