X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fprotocol.c;h=ed34f523b16eac9ce5ee16445dc83818bf0b95a9;hb=2c6b2d70e6640f39563ad7bb0aa0ba87f883848c;hp=941459c71ccd82408e9e491be330796b569f2894;hpb=f6e87ab476a0faf8b124ecaaa27f967d825e6457;p=tinc

diff --git a/src/protocol.c b/src/protocol.c
index 941459c7..ed34f523 100644
--- a/src/protocol.c
+++ b/src/protocol.c
@@ -25,7 +25,6 @@
 #include "logger.h"
 #include "meta.h"
 #include "protocol.h"
-#include "utils.h"
 #include "xalloc.h"
 
 bool tunnelserver = false;
@@ -36,7 +35,7 @@ bool experimental = true;
 
 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,
+	NULL, NULL, termreq_h,
 	ping_h, pong_h,
 	add_subnet_h, del_subnet_h,
 	add_edge_h, del_edge_h,
@@ -76,13 +75,14 @@ bool send_request(connection_t *c, const char *format, ...) {
 	request[sizeof(request) - 1] = 0;
 	va_end(args);
 
-	if(len < 0 || len > sizeof(request) - 1) {
+	if(len < 0 || (size_t)len > sizeof(request) - 1) {
 		logger(DEBUG_ALWAYS, LOG_ERR, "Output buffer overflow while sending request to %s (%s)",
 		       c->name, c->hostname);
 		return false;
 	}
 
-	logger(DEBUG_META, LOG_DEBUG, "Sending %s to %s (%s): %s", request_name[atoi(request)], c->name, c->hostname, request);
+	int id = atoi(request);
+	logger(DEBUG_META, LOG_DEBUG, "Sending %s to %s (%s): %s", request_name[id], c->name, c->hostname, request);
 
 	request[len++] = '\n';
 
@@ -90,7 +90,12 @@ bool send_request(connection_t *c, const char *format, ...) {
 		broadcast_meta(NULL, request, len);
 		return true;
 	} else {
-		return send_meta(c, request, len);
+		if(id) {
+			return send_meta(c, request, len);
+		} else {
+			send_meta_raw(c, request, len);
+			return true;
+		}
 	}
 }
 
@@ -98,7 +103,7 @@ 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);
+	size_t len = strlen(request);
 	char tmp[len + 1];
 	memcpy(tmp, request, len);
 	tmp[len] = '\n';
@@ -159,16 +164,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((char *)r->request);
-	}
-
+	free((char *)r->request);
 	free(r);
 }
 
 static timeout_t past_request_timeout;
 
 static void age_past_requests(void *data) {
+	(void)data;
 	int left = 0, deleted = 0;
 
 	for splay_each(past_request_t, p, past_request_tree) {
@@ -190,7 +193,7 @@ static void age_past_requests(void *data) {
 }
 
 bool seen_request(const char *request) {
-	past_request_t *new, p = {NULL};
+	past_request_t *new, p = {0};
 
 	p.request = request;