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

diff --git a/src/protocol.c b/src/protocol.c
index 90eca015..b8b81043 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);
 }
 
@@ -189,12 +190,13 @@ bool seen_request(char *request) {
 		new->request = xstrdup(request);
 		new->firstseen = time(NULL);
 		splay_insert(past_request_tree, new);
-		event_add(&past_request_event, &(struct timeval){10, 0});
+		past_request_event.time = time(NULL) + 10;
+		event_add(&past_request_event);
 		return false;
 	}
 }
 
-void age_past_requests(int fd, short events, void *data) {
+void age_past_requests(void *data) {
 	splay_node_t *node, *next;
 	past_request_t *p;
 	int left = 0, deleted = 0;
@@ -214,14 +216,18 @@ void age_past_requests(int fd, short events, void *data) {
 		ifdebug(SCARY_THINGS) logger(LOG_DEBUG, "Aging past requests: deleted %d, left %d",
 			   deleted, left);
 
-	if(left)
-		event_add(&past_request_event, &(struct timeval){10, 0});
+	if(left) {
+		past_request_event.time = time(NULL) + 10;
+		event_add(&past_request_event);
+	}
 }
 
 void init_requests(void) {
 	past_request_tree = splay_alloc_tree((splay_compare_t) past_request_compare, (splay_action_t) free_past_request);
 
-	timeout_set(&past_request_event, age_past_requests, NULL);
+	past_request_event.handler = age_past_requests;
+	past_request_event.time = time(NULL) + 10;
+	event_add(&past_request_event);
 }
 
 void exit_requests(void) {