Move pinginterval pingtimeout and maxtimeout to mesh

[meshlink] / src / net_packet.c

diff --git a/src/net_packet.c b/src/net_packet.c
index c7d6a9d8cc0d83c066f6c20c62f7585c7821ebc1..281fd973c7fddba951bb12f1ddb0b1ea996e4427 100644 (file)
--- a/src/net_packet.c
+++ b/src/net_packet.c
@@ -23,11 +23,9 @@
 #include <zlib.h>
 #endif
 
-#include "cipher.h"
 #include "conf.h"
 #include "connection.h"
 #include "crypto.h"
-#include "digest.h"
 #include "graph.h"
 #include "logger.h"
 #include "meshlink_internal.h"
@@ -77,7 +75,7 @@ static void send_mtu_probe_handler(void *data) {
        if(n->mtuprobes > 32) {
                if(!n->minmtu) {
                        n->mtuprobes = 31;
-                       timeout = pinginterval;
+                       timeout = mesh->pinginterval;
                        goto end;
                }
 
@@ -104,10 +102,10 @@ static void send_mtu_probe_handler(void *data) {
        }
 
        if(n->mtuprobes == 31) {
-               timeout = pinginterval;
+               timeout = mesh->pinginterval;
                goto end;
        } else if(n->mtuprobes == 32) {
-               timeout = pingtimeout;
+               timeout = mesh->pingtimeout;
        }
 
        for(int i = 0; i < 4 + mesh->localdiscovery; i++) {
@@ -127,6 +125,7 @@ static void send_mtu_probe_handler(void *data) {
                        len = 64;
 
                vpn_packet_t packet;
+               packet.probe = true;
                memset(packet.data, 0, 14);
                randomize(packet.data + 14, len - 14);
                packet.len = len;
@@ -386,13 +385,13 @@ static void choose_udp_address(const node_t *n, const sockaddr_t **sa, int *sock
 
        if(candidate) {
                *sa = &candidate->address;
-               *sock = rand() % listen_sockets;
+               *sock = rand() % mesh->listen_sockets;
        }
 
        /* Make sure we have a suitable socket for the chosen address */
-       if(listen_socket[*sock].sa.sa.sa_family != (*sa)->sa.sa_family) {
-               for(int i = 0; i < listen_sockets; i++) {
-                       if(listen_socket[i].sa.sa.sa_family == (*sa)->sa.sa_family) {
+       if(mesh->listen_socket[*sock].sa.sa.sa_family != (*sa)->sa.sa_family) {
+               for(int i = 0; i < mesh->listen_sockets; i++) {
+                       if(mesh->listen_socket[i].sa.sa.sa_family == (*sa)->sa.sa_family) {
                                *sock = i;
                                break;
                        }
@@ -417,15 +416,15 @@ static void choose_broadcast_address(const node_t *n, const sockaddr_t **sa, int
                }
        };
 
-       *sock = rand() % listen_sockets;
+       *sock = rand() % mesh->listen_sockets;
 
-       if(listen_socket[*sock].sa.sa.sa_family == AF_INET6) {
+       if(mesh->listen_socket[*sock].sa.sa.sa_family == AF_INET6) {
                if(mesh->localdiscovery_address.sa.sa_family == AF_INET6) {
                        mesh->localdiscovery_address.in6.sin6_port = n->prevedge->address.in.sin_port;
                        *sa = &mesh->localdiscovery_address;
                } else {
                        broadcast_ipv6.in6.sin6_port = n->prevedge->address.in.sin_port;
-                       broadcast_ipv6.in6.sin6_scope_id = listen_socket[*sock].sa.in6.sin6_scope_id;
+                       broadcast_ipv6.in6.sin6_scope_id = mesh->listen_socket[*sock].sa.in6.sin6_scope_id;
                        *sa = &broadcast_ipv6;
                }
        } else {
@@ -484,7 +483,7 @@ bool send_sptps_data(void *handle, uint8_t type, const char *data, size_t len) {
        else
                choose_udp_address(to, &sa, &sock);
 
-       if(sendto(listen_socket[sock].udp.fd, data, len, 0, &sa->sa, SALEN(sa->sa)) < 0 && !sockwouldblock(sockerrno)) {
+       if(sendto(mesh->listen_socket[sock].udp.fd, data, len, 0, &sa->sa, SALEN(sa->sa)) < 0 && !sockwouldblock(sockerrno)) {
                if(sockmsgsize(sockerrno)) {
                        if(to->maxmtu >= len)
                                to->maxmtu = len - 1;
@@ -651,7 +650,7 @@ void handle_incoming_vpn_data(void *data, int flags) {
                n = try_harder(&from, &pkt);
                if(n)
                        update_node_udp(n, &from);
-               else if(debug_level >= DEBUG_PROTOCOL) {
+               else if(mesh->debug_level >= DEBUG_PROTOCOL) {
                        hostname = sockaddr2hostname(&from);
                        logger(DEBUG_PROTOCOL, LOG_WARNING, "Received UDP packet from unknown source %s", hostname);
                        free(hostname);
@@ -661,7 +660,7 @@ void handle_incoming_vpn_data(void *data, int flags) {
                        return;
        }
 
-       n->sock = ls - listen_socket;
+       n->sock = ls - mesh->listen_socket;
 
        receive_udppacket(n, &pkt);
 }