X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;ds=sidebyside;f=src%2Fprotocol.c;h=e22053c79148758fa2c4360f3397df284052ca14;hb=fe1a9111456a73a6e690927e90d8bfa1e1d0ad22;hp=a279833bd8799a674ba47fac7cb502217f870d95;hpb=2cfd1205dc9c6e9d42cc569f415afe13f52357ec;p=meshlink

diff --git a/src/protocol.c b/src/protocol.c
index a279833b..e22053c7 100644
--- a/src/protocol.c
+++ b/src/protocol.c
@@ -49,8 +49,6 @@ static char (*request_name[]) = {
 		"ADD_EDGE", "DEL_EDGE", "KEY_CHANGED", "REQ_KEY", "ANS_KEY", "PACKET", "CONTROL",
 };
 
-static splay_tree_t *past_request_tree;
-
 bool check_id(const char *id) {
 	if(!id || !*id)
 		return false;
@@ -79,12 +77,12 @@ bool send_request(meshlink_handle_t *mesh, connection_t *c, const char *format,
 	va_end(args);
 
 	if(len < 0 || len > MAXBUFSIZE - 1) {
-		logger(DEBUG_ALWAYS, LOG_ERR, "Output buffer overflow while sending request to %s (%s)",
+		logger(mesh, MESHLINK_ERROR, "Output buffer overflow while sending request to %s (%s)",
 			   c->name, c->hostname);
 		return false;
 	}
 
-	logger(DEBUG_META, LOG_DEBUG, "Sending %s to %s (%s): %s", request_name[atoi(request)], c->name, c->hostname, request);
+	logger(mesh, MESHLINK_DEBUG, "Sending %s to %s (%s): %s", request_name[atoi(request)], c->name, c->hostname, request);
 
 	request[len++] = '\n';
 
@@ -96,7 +94,7 @@ bool send_request(meshlink_handle_t *mesh, connection_t *c, const char *format,
 }
 
 void forward_request(meshlink_handle_t *mesh, connection_t *from, const char *request) {
-	logger(DEBUG_META, LOG_DEBUG, "Forwarding %s from %s (%s): %s", request_name[atoi(request)], from->name, from->hostname, request);
+	logger(mesh, MESHLINK_DEBUG, "Forwarding %s from %s (%s): %s", request_name[atoi(request)], from->name, from->hostname, request);
 
 	// Create a temporary newline-terminated copy of the request
 	int len = strlen(request);
@@ -112,10 +110,10 @@ bool receive_request(meshlink_handle_t *mesh, connection_t *c, const char *reque
 			return true;
 		if(!strncasecmp(request, "HTTP/1.1 ", 9)) {
 			if(!strncmp(request + 9, "200", 3)) {
-				logger(DEBUG_CONNECTIONS, LOG_DEBUG, "Proxy request granted");
+				logger(mesh, MESHLINK_DEBUG, "Proxy request granted");
 				return true;
 			} else {
-				logger(DEBUG_ALWAYS, LOG_DEBUG, "Proxy request rejected: %s", request + 9);
+				logger(mesh, MESHLINK_DEBUG, "Proxy request rejected: %s", request + 9);
 				return false;
 			}
 		}
@@ -125,25 +123,25 @@ bool receive_request(meshlink_handle_t *mesh, connection_t *c, const char *reque
 
 	if(reqno || *request == '0') {
 		if((reqno < 0) || (reqno >= LAST) || !request_handlers[reqno]) {
-			logger(DEBUG_META, LOG_DEBUG, "Unknown request from %s (%s): %s", c->name, c->hostname, request);
+			logger(mesh, MESHLINK_DEBUG, "Unknown request from %s (%s): %s", c->name, c->hostname, request);
 			return false;
 		} else {
-			logger(DEBUG_META, LOG_DEBUG, "Got %s from %s (%s): %s", request_name[reqno], c->name, c->hostname, request);
+			logger(mesh, MESHLINK_DEBUG, "Got %s from %s (%s): %s", request_name[reqno], c->name, c->hostname, request);
 		}
 
 		if((c->allow_request != ALL) && (c->allow_request != reqno)) {
-			logger(DEBUG_ALWAYS, LOG_ERR, "Unauthorized request from %s (%s)", c->name, c->hostname);
+			logger(mesh, MESHLINK_ERROR, "Unauthorized request from %s (%s)", c->name, c->hostname);
 			return false;
 		}
 
 		if(!request_handlers[reqno](mesh, c, request)) {
 			/* Something went wrong. Probably scriptkiddies. Terminate. */
 
-			logger(DEBUG_ALWAYS, LOG_ERR, "Error while processing %s from %s (%s)", request_name[reqno], c->name, c->hostname);
+			logger(mesh, MESHLINK_ERROR, "Error while processing %s from %s (%s)", request_name[reqno], c->name, c->hostname);
 			return false;
 		}
 	} else {
-		logger(DEBUG_ALWAYS, LOG_ERR, "Bogus data received from %s (%s)", c->name, c->hostname);
+		logger(mesh, MESHLINK_ERROR, "Bogus data received from %s (%s)", c->name, c->hostname);
 		return false;
 	}
 
@@ -161,24 +159,22 @@ static void free_past_request(past_request_t *r) {
 	free(r);
 }
 
-static timeout_t past_request_timeout;
-
 static void age_past_requests(event_loop_t *loop, void *data) {
 	meshlink_handle_t *mesh = loop->data;
 	int left = 0, deleted = 0;
 
-	for splay_each(past_request_t, p, past_request_tree) {
+	for splay_each(past_request_t, p, mesh->past_request_tree) {
 		if(p->firstseen + mesh->pinginterval <= mesh->loop.now.tv_sec)
-			splay_delete_node(past_request_tree, node), deleted++;
+			splay_delete_node(mesh->past_request_tree, node), deleted++;
 		else
 			left++;
 	}
 
 	if(left || deleted)
-		logger(DEBUG_SCARY_THINGS, LOG_DEBUG, "Aging past requests: deleted %d, left %d", deleted, left);
+		logger(mesh, MESHLINK_DEBUG, "Aging past requests: deleted %d, left %d", deleted, left);
 
 	if(left)
-		timeout_set(&mesh->loop, &past_request_timeout, &(struct timeval){10, rand() % 100000});
+		timeout_set(&mesh->loop, &mesh->past_request_timeout, &(struct timeval){10, rand() % 100000});
 }
 
 bool seen_request(meshlink_handle_t *mesh, const char *request) {
@@ -186,26 +182,27 @@ bool seen_request(meshlink_handle_t *mesh, const char *request) {
 
 	p.request = request;
 
-	if(splay_search(past_request_tree, &p)) {
-		logger(DEBUG_SCARY_THINGS, LOG_DEBUG, "Already seen request");
+	if(splay_search(mesh->past_request_tree, &p)) {
+		logger(mesh, MESHLINK_DEBUG, "Already seen request");
 		return true;
 	} else {
 		new = xmalloc(sizeof *new);
 		new->request = xstrdup(request);
 		new->firstseen = mesh->loop.now.tv_sec;
-		splay_insert(past_request_tree, new);
-		timeout_add(&mesh->loop, &past_request_timeout, age_past_requests, NULL, &(struct timeval){10, rand() % 100000});
+		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;
 	}
 }
 
-// TODO: move past_request_tree to meshlink_handle_t
 void init_requests(meshlink_handle_t *mesh) {
-	past_request_tree = splay_alloc_tree((splay_compare_t) past_request_compare, (splay_action_t) free_past_request);
+	mesh->past_request_tree = splay_alloc_tree((splay_compare_t) past_request_compare, (splay_action_t) free_past_request);
 }
 
 void exit_requests(meshlink_handle_t *mesh) {
-	splay_delete_tree(past_request_tree);
+	if(mesh->past_request_tree)
+		splay_delete_tree(mesh->past_request_tree);
+	mesh->past_request_tree = NULL;
 
-	timeout_del(&mesh->loop, &past_request_timeout);
+	timeout_del(&mesh->loop, &mesh->past_request_timeout);
 }