X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fprotocol.c;h=3c08d725b56d608709ccbd47a10b5d7c0bb056ed;hb=d917c8cb6b69475d568ccbe82389b9f2b3eb5e80;hp=52ea69029b18286a96a19473018b0bee780dfaec;hpb=86c2990327fdf7ec1197aa73cb2b9a926a734db4;p=tinc

diff --git a/src/protocol.c b/src/protocol.c
index 52ea6902..3c08d725 100644
--- a/src/protocol.c
+++ b/src/protocol.c
@@ -34,7 +34,7 @@ bool experimental = false;
 
 /* Jumptable for the request handlers */
 
-static bool (*request_handlers[])(connection_t *, char *) = {
+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,
@@ -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;
@@ -96,16 +99,32 @@ bool send_request(connection_t *c, const char *format, ...) {
 		return send_meta(c, request, len);
 }
 
-void forward_request(connection_t *from, char *request) {
-	/* Note: request is not zero terminated anymore after a call to this function! */
+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);
 
+	// Create a temporary newline-terminated copy of the request
 	int len = strlen(request);
-	request[len++] = '\n';
-	broadcast_meta(from, request, len);
+	char tmp[len + 1];
+	memcpy(tmp, request, len);
+	tmp[len] = '\n';
+	broadcast_meta(from, tmp, sizeof tmp);
 }
 
-bool receive_request(connection_t *c, 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') {
@@ -141,14 +160,14 @@ 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);
 }
 
 static struct event past_request_event;
 
-bool seen_request(char *request) {
+bool seen_request(const char *request) {
 	past_request_t *new, p = {NULL};
 
 	p.request = request;
@@ -167,15 +186,10 @@ bool seen_request(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