X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fnet_setup.c;h=c5f776af613111c417fec9d07792cd463ca47585;hb=fb0cfccf7dc2240b576011edcf74fd5b058916cb;hp=814d698f8ef3834da433ebf0f46bbeb29fb1aa38;hpb=7e1117197ca4fc62af93fda50e28e0ff06cb736c;p=tinc

diff --git a/src/net_setup.c b/src/net_setup.c
index 814d698f..c5f776af 100644
--- a/src/net_setup.c
+++ b/src/net_setup.c
@@ -28,7 +28,7 @@
 #include <openssl/err.h>
 #include <openssl/evp.h>
 
-#include "avl_tree.h"
+#include "splay_tree.h"
 #include "conf.h"
 #include "connection.h"
 #include "device.h"
@@ -46,8 +46,7 @@
 char *myport;
 static struct event device_ev;
 
-bool read_rsa_public_key(connection_t *c)
-{
+bool read_rsa_public_key(connection_t *c) {
 	FILE *fp;
 	char *fname;
 	char *key;
@@ -147,8 +146,7 @@ bool read_rsa_public_key(connection_t *c)
 	return false;
 }
 
-bool read_rsa_private_key(void)
-{
+bool read_rsa_private_key(void) {
 	FILE *fp;
 	char *fname, *key, *pubkey;
 	struct stat s;
@@ -241,8 +239,7 @@ void regenerate_key() {
 /*
   Configure node_t myself and set up the local sockets (listen only)
 */
-bool setup_myself(void)
-{
+bool setup_myself(void) {
 	config_t *cfg;
 	subnet_t *subnet;
 	char *name, *hostname, *mode, *afname, *cipher, *digest;
@@ -576,12 +573,9 @@ bool setup_myself(void)
 /*
   setup all initial network connections
 */
-bool setup_network_connections(void)
-{
+bool setup_network_connections(void) {
 	cp();
 
-	now = time(NULL);
-
 	init_connections();
 	init_subnets();
 	init_nodes();
@@ -614,9 +608,8 @@ bool setup_network_connections(void)
 /*
   close all open network connections
 */
-void close_network_connections(void)
-{
-	avl_node_t *node, *next;
+void close_network_connections(void) {
+	splay_node_t *node, *next;
 	connection_t *c;
 	char *envp[5];
 	int i;