Move pinginterval pingtimeout and maxtimeout to mesh

[meshlink] / src / net_socket.c

diff --git a/src/net_socket.c b/src/net_socket.c
index fbafc22bb86cd34dcc9b2e298fc84a7a4cbdfb50..7f87d9c42056fbc9ddd40b812762e59473d9a45d 100644 (file)
--- a/src/net_socket.c
+++ b/src/net_socket.c
@@ -37,7 +37,6 @@
 #endif
 
 int addressfamily = AF_UNSPEC;
-int maxtimeout = 900;
 int seconds_till_retry = 5;
 int max_connection_burst = 100;
 
@@ -240,8 +239,8 @@ static void retry_outgoing_handler(void *data) {
 void retry_outgoing(outgoing_t *outgoing) {
        outgoing->timeout += 5;
 
-       if(outgoing->timeout > maxtimeout)
-               outgoing->timeout = maxtimeout;
+       if(outgoing->timeout > mesh->maxtimeout)
+               outgoing->timeout = mesh->maxtimeout;
 
        timeout_add(&outgoing->ev, retry_outgoing_handler, outgoing, &(struct timeval){outgoing->timeout, rand() % 100000});