X-Git-Url: http://git.meshlink.io/?p=meshlink;a=blobdiff_plain;f=src%2Fprotocol.c;h=482808a7e71885c6cf37d24ce42444f9d18c8aac;hp=95f6aa39f49eda059094a615753ce417c33a43ed;hb=963c5055505f2fc117cd5efa06eaa02c9b2bf85d;hpb=0d133a5ff230ad78da3208d32521d7549836187e

diff --git a/src/protocol.c b/src/protocol.c
index 95f6aa39..482808a7 100644
--- a/src/protocol.c
+++ b/src/protocol.c
@@ -67,14 +67,14 @@ bool check_id(const char *id) {
    detection as well */
 
 bool send_request(meshlink_handle_t *mesh, connection_t *c, submesh_t *s, const char *format, ...) {
+	assert(c);
+	assert(format);
+	assert(*format);
+
 	va_list args;
 	char request[MAXBUFSIZE];
 	int len;
 
-	if(!c) {
-		return false;
-	}
-
 	/* Use vsnprintf instead of vxasprintf: faster, no memory
 	   fragmentation, cleanup is automatic, and there is a limit on the
 	   input buffer anyway */
@@ -107,6 +107,10 @@ bool send_request(meshlink_handle_t *mesh, connection_t *c, submesh_t *s, const
 }
 
 void forward_request(meshlink_handle_t *mesh, connection_t *from, submesh_t *s, const char *request) {
+	assert(from);
+	assert(request);
+	assert(*request);
+
 	logger(mesh, MESHLINK_DEBUG, "Forwarding %s from %s: %s", request_name[atoi(request)], from->name, request);
 
 	// Create a temporary newline-terminated copy of the request
@@ -124,6 +128,8 @@ void forward_request(meshlink_handle_t *mesh, connection_t *from, submesh_t *s,
 }
 
 bool receive_request(meshlink_handle_t *mesh, connection_t *c, const char *request) {
+	assert(request);
+
 	if(c->outgoing && mesh->proxytype == PROXY_HTTP && c->allow_request == ID) {
 		if(!request[0] || request[0] == '\r') {
 			return true;
@@ -181,13 +187,15 @@ static void free_past_request(past_request_t *r) {
 	free(r);
 }
 
+static const int request_timeout = 60;
+
 static void age_past_requests(event_loop_t *loop, void *data) {
 	(void)data;
 	meshlink_handle_t *mesh = loop->data;
 	int left = 0, deleted = 0;
 
 	for splay_each(past_request_t, p, mesh->past_request_tree) {
-		if(p->firstseen + mesh->pinginterval <= mesh->loop.now.tv_sec) {
+		if(p->firstseen + request_timeout <= mesh->loop.now.tv_sec) {
 			splay_delete_node(mesh->past_request_tree, node), deleted++;
 		} else {
 			left++;
@@ -198,13 +206,17 @@ static void age_past_requests(event_loop_t *loop, void *data) {
 		logger(mesh, MESHLINK_DEBUG, "Aging past requests: deleted %d, left %d", deleted, left);
 	}
 
-	if(left)
-		timeout_set(&mesh->loop, &mesh->past_request_timeout, &(struct timeval) {
-		10, rand() % 100000
-	});
+	if(left) {
+		timeout_set(&mesh->loop, &mesh->past_request_timeout, &(struct timespec) {
+			10, prng(mesh, TIMER_FUDGE)
+		});
+	}
 }
 
 bool seen_request(meshlink_handle_t *mesh, const char *request) {
+	assert(request);
+	assert(*request);
+
 	past_request_t *new, p = {.request = request};
 
 	if(splay_search(mesh->past_request_tree, &p)) {
@@ -214,16 +226,25 @@ bool seen_request(meshlink_handle_t *mesh, const char *request) {
 		new = xmalloc(sizeof(*new));
 		new->request = xstrdup(request);
 		new->firstseen = mesh->loop.now.tv_sec;
+
+		if(!mesh->past_request_tree->head) {
+			timeout_set(&mesh->loop, &mesh->past_request_timeout, &(struct timespec) {
+				10, prng(mesh, TIMER_FUDGE)
+			});
+		}
+
 		splay_insert(mesh->past_request_tree, new);
-		timeout_add(&mesh->loop, &mesh->past_request_timeout, age_past_requests, NULL, &(struct timeval) {
-			10, rand() % 100000
-		});
 		return false;
 	}
 }
 
 void init_requests(meshlink_handle_t *mesh) {
+	assert(!mesh->past_request_tree);
+
 	mesh->past_request_tree = splay_alloc_tree((splay_compare_t) past_request_compare, (splay_action_t) free_past_request);
+	timeout_add(&mesh->loop, &mesh->past_request_timeout, age_past_requests, NULL, &(struct timespec) {
+		0, 0
+	});
 }
 
 void exit_requests(meshlink_handle_t *mesh) {