X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fprotocol.c;h=3c08d725b56d608709ccbd47a10b5d7c0bb056ed;hb=0b8b23e0dd7219344543f135ca0aeba8a4a42d48;hp=1e63f2ea2e2ee1e28a4f81673f6fc8d15222aa14;hpb=62b61a1b7c2382b1bade142b3a41a9b27c1fd40d;p=tinc

diff --git a/src/protocol.c b/src/protocol.c
index 1e63f2ea..3c08d725 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;
@@ -108,6 +111,20 @@ 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(!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') {
@@ -169,15 +186,10 @@ bool seen_request(const char *request) {
 }
 
 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;
-
+	for splay_each(past_request_t, p, past_request_tree) {
 		if(p->firstseen + pinginterval <= now)
 			splay_delete_node(past_request_tree, node), deleted++;
 		else