Remove unused variables, fix some #includes.

diff --git a/src/control.c b/src/control.c
index d22d5b0e244387240c5be5630ad4c5539a639012..c71949648275c36ae0a9c4fe7cd1ebe8ec35acfc 100644 (file)
--- a/src/control.c
+++ b/src/control.c
@@ -29,7 +29,6 @@
 #include "netutl.h"
 #include "protocol.h"
 #include "route.h"
-#include "splay_tree.h"
 #include "utils.h"
 #include "xalloc.h"
 

diff --git a/src/net_packet.c b/src/net_packet.c
index eea8737e7c16779439beb957341beeb318b36ab6..88d791dce340ebf40631a6ae27153683ec433248 100644 (file)
--- a/src/net_packet.c
+++ b/src/net_packet.c
@@ -790,8 +790,6 @@ void broadcast_packet(const node_t *from, vpn_packet_t *packet) {
 }
 
 static node_t *try_harder(const sockaddr_t *from, const vpn_packet_t *pkt) {
-       splay_node_t *node;
-       edge_t *e;
        node_t *n = NULL;
        bool hard = false;
        static time_t last_hard_try = 0;

diff --git a/src/net_socket.c b/src/net_socket.c
index 0d2cb87b5adbde8919cde917597a840a7a5ce722..df6f3c048e78d81e00ed93f2d62627e44ee650c2 100644 (file)
--- a/src/net_socket.c
+++ b/src/net_socket.c
@@ -24,6 +24,7 @@
 
 #include "conf.h"
 #include "connection.h"
+#include "list.h"
 #include "logger.h"
 #include "meta.h"
 #include "net.h"