X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fprotocol.c;h=c8c75cfc4714b0a7c15f62c4491ebfbd0054edc1;hb=fec95d1221c2d7e2059d6ba2fe244211ccee95ad;hp=92418f179c12165432d535a75031c7d9fc49e786;hpb=bcd1979454cd14087394f0c0a983205f6fbfcaf4;p=meshlink

diff --git a/src/protocol.c b/src/protocol.c
index 92418f17..c8c75cfc 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,21 +128,7 @@ 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) {
-	if(c->outgoing && mesh->proxytype == PROXY_HTTP && c->allow_request == ID) {
-		if(!request[0] || request[0] == '\r') {
-			return true;
-		}
-
-		if(!strncasecmp(request, "HTTP/1.1 ", 9)) {
-			if(!strncmp(request + 9, "200", 3)) {
-				logger(mesh, MESHLINK_DEBUG, "Proxy request granted");
-				return true;
-			} else {
-				logger(mesh, MESHLINK_DEBUG, "Proxy request rejected: %s", request + 9);
-				return false;
-			}
-		}
-	}
+	assert(request);
 
 	int reqno = atoi(request);
 
@@ -201,13 +191,16 @@ static void age_past_requests(event_loop_t *loop, void *data) {
 	}
 
 	if(left) {
-		timeout_set(&mesh->loop, &mesh->past_request_timeout, &(struct timeval) {
-			10, rand() % 100000
+		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)) {
@@ -219,8 +212,8 @@ bool seen_request(meshlink_handle_t *mesh, const char *request) {
 		new->firstseen = mesh->loop.now.tv_sec;
 
 		if(!mesh->past_request_tree->head) {
-			timeout_set(&mesh->loop, &mesh->past_request_timeout, &(struct timeval) {
-				10, rand() % 100000
+			timeout_set(&mesh->loop, &mesh->past_request_timeout, &(struct timespec) {
+				10, prng(mesh, TIMER_FUDGE)
 			});
 		}
 
@@ -230,8 +223,10 @@ bool seen_request(meshlink_handle_t *mesh, const char *request) {
 }
 
 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 timeval) {
+	timeout_add(&mesh->loop, &mesh->past_request_timeout, age_past_requests, NULL, &(struct timespec) {
 		0, 0
 	});
 }