X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fprotocol.c;h=c3fe6f37c1700536ffbb3f72e31d336605eba6a4;hb=fb0cfccf7dc2240b576011edcf74fd5b058916cb;hp=6ad9740fc1301003ca6aceae82b759a8e2b50d80;hpb=ddc6a81a854023e38b563f213aa9a449ee91add8;p=tinc

diff --git a/src/protocol.c b/src/protocol.c
index 6ad9740f..c3fe6f37 100644
--- a/src/protocol.c
+++ b/src/protocol.c
@@ -53,10 +53,9 @@ static char (*request_name[]) = {
 		"ADD_EDGE", "DEL_EDGE", "KEY_CHANGED", "REQ_KEY", "ANS_KEY", "PACKET",
 };
 
-static avl_tree_t *past_request_tree;
+static splay_tree_t *past_request_tree;
 
-bool check_id(const char *id)
-{
+bool check_id(const char *id) {
 	for(; *id; id++)
 		if(!isalnum(*id) && *id != '_')
 			return false;
@@ -67,8 +66,7 @@ bool check_id(const char *id)
 /* Generic request routines - takes care of logging and error
    detection as well */
 
-bool send_request(connection_t *c, const char *format, ...)
-{
+bool send_request(connection_t *c, const char *format, ...) {
 	va_list args;
 	char buffer[MAXBUFSIZE];
 	int len, request;
@@ -108,8 +106,7 @@ bool send_request(connection_t *c, const char *format, ...)
 		return send_meta(c, buffer, len);
 }
 
-void forward_request(connection_t *from)
-{
+void forward_request(connection_t *from) {
 	int request;
 
 	cp();
@@ -130,8 +127,7 @@ void forward_request(connection_t *from)
 	broadcast_meta(from, from->buffer, from->reqlen);
 }
 
-bool receive_request(connection_t *c)
-{
+bool receive_request(connection_t *c) {
 	int request;
 
 	cp();
@@ -180,13 +176,11 @@ bool receive_request(connection_t *c)
 	return true;
 }
 
-static int past_request_compare(const past_request_t *a, const past_request_t *b)
-{
+static int past_request_compare(const past_request_t *a, const past_request_t *b) {
 	return strcmp(a->request, b->request);
 }
 
-static void free_past_request(past_request_t *r)
-{
+static void free_past_request(past_request_t *r) {
 	cp();
 
 	if(r->request)
@@ -197,30 +191,28 @@ static void free_past_request(past_request_t *r)
 
 static struct event past_request_event;
 
-bool seen_request(char *request)
-{
+bool seen_request(char *request) {
 	past_request_t *new, p = {0};
 
 	cp();
 
 	p.request = request;
 
-	if(avl_search(past_request_tree, &p)) {
+	if(splay_search(past_request_tree, &p)) {
 		ifdebug(SCARY_THINGS) logger(LOG_DEBUG, _("Already seen request"));
 		return true;
 	} else {
 		new = xmalloc(sizeof(*new));
 		new->request = xstrdup(request);
 		new->firstseen = time(NULL);
-		avl_insert(past_request_tree, new);
+		splay_insert(past_request_tree, new);
 		event_add(&past_request_event, &(struct timeval){10, 0});
 		return false;
 	}
 }
 
-void age_past_requests(int fd, short events, void *data)
-{
-	avl_node_t *node, *next;
+void age_past_requests(int fd, short events, void *data) {
+	splay_node_t *node, *next;
 	past_request_t *p;
 	int left = 0, deleted = 0;
 	time_t now = time(NULL);
@@ -232,7 +224,7 @@ void age_past_requests(int fd, short events, void *data)
 		p = node->data;
 
 		if(p->firstseen + pinginterval < now)
-			avl_delete_node(past_request_tree, node), deleted++;
+			splay_delete_node(past_request_tree, node), deleted++;
 		else
 			left++;
 	}
@@ -245,20 +237,18 @@ void age_past_requests(int fd, short events, void *data)
 		event_add(&past_request_event, &(struct timeval){10, 0});
 }
 
-void init_requests(void)
-{
+void init_requests(void) {
 	cp();
 
-	past_request_tree = avl_alloc_tree((avl_compare_t) past_request_compare, (avl_action_t) free_past_request);
+	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);
 }
 
-void exit_requests(void)
-{
+void exit_requests(void) {
 	cp();
 
-	avl_delete_tree(past_request_tree);
+	splay_delete_tree(past_request_tree);
 
 	event_del(&past_request_event);
 }