X-Git-Url: http://tinc-vpn.org/git/browse?a=blobdiff_plain;ds=sidebyside;f=src%2Fnet.c;h=469f10fce94ae69827d640ec23365268a152e882;hb=fb0cfccf7dc2240b576011edcf74fd5b058916cb;hp=b47c702d34fd47db08274184534294029623993c;hpb=3909b8e51b27b11c6d54541220cb7767bf25569c;p=tinc

diff --git a/src/net.c b/src/net.c
index b47c702d..469f10fc 100644
--- a/src/net.c
+++ b/src/net.c
@@ -25,7 +25,7 @@
 #include <openssl/rand.h>
 
 #include "utils.h"
-#include "avl_tree.h"
+#include "splay_tree.h"
 #include "conf.h"
 #include "connection.h"
 #include "device.h"
@@ -39,13 +39,10 @@
 #include "subnet.h"
 #include "xalloc.h"
 
-volatile bool running = false;
-
 /* Purge edges and subnets of unreachable nodes. Use carefully. */
 
-static void purge(void)
-{
-	avl_node_t *nnode, *nnext, *enode, *enext, *snode, *snext;
+static void purge(void) {
+	splay_node_t *nnode, *nnext, *enode, *enext, *snode, *snext;
 	node_t *n;
 	edge_t *e;
 	subnet_t *s;
@@ -107,9 +104,8 @@ static void purge(void)
   put all file descriptors into events
   While we're at it, purge stuf that needs to be removed.
 */
-static int build_fdset(void)
-{
-	avl_node_t *node, *next;
+static int build_fdset(void) {
+	splay_node_t *node, *next;
 	connection_t *c;
 	int i, max = 0;
 
@@ -136,8 +132,7 @@ static int build_fdset(void)
   - Check if we need to retry making an outgoing connection
   - Deactivate the host
 */
-void terminate_connection(connection_t *c, bool report)
-{
+void terminate_connection(connection_t *c, bool report) {
 	cp();
 
 	if(c->status.remove)
@@ -202,9 +197,8 @@ void terminate_connection(connection_t *c, bool report)
   end does not reply in time, we consider them dead
   and close the connection.
 */
-static void timeout_handler(int fd, short events, void *event)
-{
-	avl_node_t *node, *next;
+static void timeout_handler(int fd, short events, void *event) {
+	splay_node_t *node, *next;
 	connection_t *c;
 	time_t now = time(NULL);
 
@@ -247,8 +241,7 @@ static void timeout_handler(int fd, short events, void *event)
 	event_add(event, &(struct timeval){pingtimeout, 0});
 }
 
-void handle_meta_connection_data(int fd, short events, void *data)
-{
+void handle_meta_connection_data(int fd, short events, void *data) {
 	connection_t *c = data;
 	int result;
 	socklen_t len = sizeof(result);
@@ -278,13 +271,8 @@ void handle_meta_connection_data(int fd, short events, void *data)
 	}
 }
 
-static void dummy(int a, short b, void *c)
-{
-}
-
 static void sigterm_handler(int signal, short events, void *data) {
 	logger(LOG_NOTICE, _("Got %s signal"), strsignal(signal));
-	running = false;
 	event_loopexit(NULL);
 }
 
@@ -327,7 +315,7 @@ static void sigwinch_handler(int signal, short events, void *data) {
 
 static void sighup_handler(int signal, short events, void *data) {
 	connection_t *c;
-	avl_node_t *node;
+	splay_node_t *node;
 	char *fname;
 	struct stat s;
 	static time_t last_config_check = 0;
@@ -375,7 +363,7 @@ static void sigalrm_handler(int signal, short events, void *data) {
 	logger(LOG_NOTICE, _("Got %s signal"), strsignal(signal));
 
 	connection_t *c;
-	avl_node_t *node;
+	splay_node_t *node;
 
 	for(node = connection_tree->head; node; node = node->next) {
 		c = node->data;
@@ -394,8 +382,7 @@ static void sigalrm_handler(int signal, short events, void *data) {
 /*
   this is where it all happens...
 */
-int main_loop(void)
-{
+int main_loop(void) {
 	struct timeval tv;
 	int r;
 	struct event timeout_event;