X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fprotocol.c;h=fd908949b6fa13bb6ab49a7640169504680ed338;hb=434e57ae5ee79b3d990c4d75358047bad641998b;hp=90eca015ea5d5a009749afa27fa1e0e69161a71c;hpb=103543aa2c15d9f1e2aa313a2e593a7524cce484;p=tinc

diff --git a/src/protocol.c b/src/protocol.c
index 90eca015..fd908949 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);
 }
 
@@ -177,7 +178,7 @@ static void free_past_request(past_request_t *r) {
 static struct event past_request_event;
 
 bool seen_request(char *request) {
-	past_request_t *new, p = {0};
+	past_request_t *new, p = {NULL};
 
 	p.request = request;
 
@@ -194,7 +195,7 @@ bool seen_request(char *request) {
 	}
 }
 
-void age_past_requests(int fd, short events, void *data) {
+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;
@@ -227,5 +228,6 @@ void init_requests(void) {
 void exit_requests(void) {
 	splay_delete_tree(past_request_tree);
 
-	event_del(&past_request_event);
+	if(timeout_initialized(&past_request_event))
+		event_del(&past_request_event);
 }