Rearrange conflicting tincd globals

[tinc] / src / net_socket.c

diff --git a/src/net_socket.c b/src/net_socket.c
index a29398d..a8e197b 100644 (file)
--- a/src/net_socket.c
+++ b/src/net_socket.c
@@ -25,6 +25,7 @@
 #include "address_cache.h"
 #include "conf.h"
 #include "connection.h"
+#include "crypto.h"
 #include "list.h"
 #include "logger.h"
 #include "names.h"
@@ -115,7 +116,7 @@ static bool bind_to_interface(int sd) {
        int status;
 #endif /* defined(SOL_SOCKET) && defined(SO_BINDTODEVICE) */
 
-       if(!get_config_string(lookup_config(config_tree, "BindToInterface"), &iface)) {
+       if(!get_config_string(lookup_config(&config_tree, "BindToInterface"), &iface)) {
                return true;
        }
 
@@ -216,7 +217,7 @@ int setup_listen_socket(const sockaddr_t *sa) {
 #endif
 
        if(get_config_string
-                       (lookup_config(config_tree, "BindToInterface"), &iface)) {
+                       (lookup_config(&config_tree, "BindToInterface"), &iface)) {
 #if defined(SOL_SOCKET) && defined(SO_BINDTODEVICE)
                struct ifreq ifr;
 
@@ -408,7 +409,7 @@ void retry_outgoing(outgoing_t *outgoing) {
        }
 
        timeout_add(&outgoing->ev, retry_outgoing_handler, outgoing, &(struct timeval) {
-               outgoing->timeout, rand() % 100000
+               outgoing->timeout, jitter()
        });
 
        logger(DEBUG_CONNECTIONS, LOG_NOTICE, "Trying to re-establish outgoing connection in %d seconds", outgoing->timeout);
@@ -829,7 +830,7 @@ void try_outgoing_connections(void) {
 
        /* Make sure there is one outgoing_t in the list for each ConnectTo. */
 
-       for(config_t *cfg = lookup_config(config_tree, "ConnectTo"); cfg; cfg = lookup_config_next(config_tree, cfg)) {
+       for(config_t *cfg = lookup_config(&config_tree, "ConnectTo"); cfg; cfg = lookup_config_next(&config_tree, cfg)) {
                char *name;
                get_config_string(cfg, &name);