From: Sven-Haegar Koch <haegar@sdinet.de>
Date: Wed, 31 Mar 2010 01:56:53 +0000 (+0200)
Subject: Fixed metadata protokoll corruption on forwarded requests
X-Git-Tag: release-1.1pre1~77
X-Git-Url: https://git.tinc-vpn.org/git/browse?a=commitdiff_plain;h=e49891e188f618a0e98f1d30bcbf240286e8ad5c;p=tinc

Fixed metadata protokoll corruption on forwarded requests

When forwarding a metadata request through forward_request() we were
adding the required newline char to our buffer, but then sending the
data without it - this results in the forwarded request and the next one
to be garbled together.

Additionally while at it add a warning comment that request string is
not zero terminated anymore after a call to the forward_request()
function - for now this is ok as it is not used by any caller after this.
---

diff --git a/src/protocol.c b/src/protocol.c
index 90eca015..e866e316 100644
--- a/src/protocol.c
+++ b/src/protocol.c
@@ -103,6 +103,7 @@ bool send_request(connection_t *c, const char *format, ...) {
 }
 
 void forward_request(connection_t *from, char *request) {
+	/* Note: request is not zero terminated anymore after a call to this function! */
 	ifdebug(PROTOCOL) {
 		ifdebug(META)
 			logger(LOG_DEBUG, "Forwarding %s from %s (%s): %s",
@@ -113,7 +114,7 @@ void forward_request(connection_t *from, char *request) {
 	}
 
 	int len = strlen(request);
-	request[len] = '\n';
+	request[len++] = '\n';
 	broadcast_meta(from, request, len);
 }