#include "net.h"
#include "netutl.h"
#include "protocol.h"
+#include "sptps.h"
#include "xalloc.h"
#include <assert.h>
if(outgoing) {
do_outgoing_connection(mesh, outgoing);
}
-
-#ifndef HAVE_MINGW
- /* Clean up dead proxy processes */
-
- while(waitpid(-1, NULL, WNOHANG) > 0);
-
-#endif
}
/*
int pingtimeout = c->node ? mesh->dev_class_traits[c->node->devclass].pingtimeout : default_timeout;
int pinginterval = c->node ? mesh->dev_class_traits[c->node->devclass].pinginterval : default_interval;
+ if(c->outgoing && c->outgoing->timeout < 5) {
+ pingtimeout = 1;
+ }
+
// Also make sure that if outstanding key requests for the UDP counterpart of a connection has timed out, we restart it.
if(c->node) {
if(c->node->status.waitingforkey && c->node->last_req_key + pingtimeout <= mesh->loop.now.tv_sec) {
}
}
+ if(c->status.active && c->last_key_renewal + 3600 < mesh->loop.now.tv_sec) {
+ if(!sptps_force_kex(&c->sptps)) {
+ logger(mesh, MESHLINK_ERROR, "SPTPS key renewal for connection with %s failed", c->name);
+ terminate_connection(mesh, c, true);
+ continue;
+ } else {
+ c->last_key_renewal = mesh->loop.now.tv_sec;
+ }
+ }
+
if(c->last_ping_time + pingtimeout <= mesh->loop.now.tv_sec) {
if(c->status.active) {
if(c->status.pinged) {
}
}
- timeout_set(&mesh->loop, data, &(struct timeval) {
- default_timeout, prng(mesh, TIMER_FUDGE)
+ timeout_set(&mesh->loop, data, &(struct timespec) {
+ 1, prng(mesh, TIMER_FUDGE)
});
}
if(mesh->contradicting_del_edge > 100 && mesh->contradicting_add_edge > 100) {
logger(mesh, MESHLINK_WARNING, "Possible node with same Name as us! Sleeping %d seconds.", mesh->sleeptime);
- usleep(mesh->sleeptime * 1000000LL);
+ struct timespec ts = {mesh->sleeptime, 0};
+ clock_nanosleep(CLOCK_MONOTONIC, 0, &ts, NULL);
mesh->sleeptime *= 2;
if(mesh->sleeptime < 0) {
for splay_each(node_t, n, mesh->nodes) {
if(n->status.dirty) {
- node_write_config(mesh, n);
+ if(!node_write_config(mesh, n)) {
+ logger(mesh, MESHLINK_DEBUG, "Could not update %s", n->name);
+ }
+
n->status.dirty = false;
}
+
+ if(n->status.validkey && n->last_req_key + 3600 < mesh->loop.now.tv_sec) {
+ logger(mesh, MESHLINK_DEBUG, "SPTPS key renewal for node %s", n->name);
+
+ if(!sptps_force_kex(&n->sptps)) {
+ logger(mesh, MESHLINK_ERROR, "SPTPS key renewal for node %s failed", n->name);
+ n->status.validkey = false;
+ sptps_stop(&n->sptps);
+ n->status.waitingforkey = false;
+ n->last_req_key = 0;
+ } else {
+ n->last_req_key = mesh->loop.now.tv_sec;
+ }
+ }
}
- timeout_set(&mesh->loop, data, &(struct timeval) {
+ timeout_set(&mesh->loop, data, &(struct timespec) {
timeout, prng(mesh, TIMER_FUDGE)
});
}
for list_each(outgoing_t, outgoing, mesh->outgoings) {
outgoing->timeout = 0;
- if(outgoing->ev.cb)
- timeout_set(&mesh->loop, &outgoing->ev, &(struct timeval) {
- 0, 0
- });
+ if(outgoing->ev.cb) {
+ timeout_set(&mesh->loop, &outgoing->ev, &(struct timespec) {
+ 0, 0
+ });
+ }
}
-#ifdef HAVE_IFADDRS_H
- struct ifaddrs *ifa = NULL;
- getifaddrs(&ifa);
-#endif
-
/* For active connections, check if their addresses are still valid.
* If yes, reset their ping timers, otherwise terminate them. */
for list_each(connection_t, c, mesh->connections) {
c->last_ping_time = 0;
}
-#ifdef HAVE_IFADDRS_H
-
- if(!ifa) {
- continue;
- }
-
sockaddr_t sa;
socklen_t salen = sizeof(sa);
continue;
}
- bool found = false;
+ switch(sa.sa.sa_family) {
+ case AF_INET:
+ sa.in.sin_port = 0;
+ break;
- for(struct ifaddrs *ifap = ifa; ifap; ifap = ifap->ifa_next) {
- if(ifap->ifa_addr && !sockaddrcmp_noport(&sa, (sockaddr_t *)ifap->ifa_addr)) {
- found = true;
- break;
- }
+ case AF_INET6:
+ sa.in6.sin6_port = 0;
+ break;
+ default:
+ continue;
+ }
+
+ int sock = socket(sa.sa.sa_family, SOCK_STREAM, IPPROTO_TCP);
+
+ if(sock != -1) {
+ continue;
}
- if(!found) {
+ if(bind(sock, &sa.sa, salen) && errno == EADDRNOTAVAIL) {
logger(mesh, MESHLINK_DEBUG, "Local address for connection to %s no longer valid, terminating", c->name);
terminate_connection(mesh, c, c->status.active);
}
-#endif
+ closesocket(sock);
}
-#ifdef HAVE_IFADDRS_H
-
- if(ifa) {
- freeifaddrs(ifa);
- }
-
-#endif
-
/* Kick the ping timeout handler */
- timeout_set(&mesh->loop, &mesh->pingtimer, &(struct timeval) {
+ timeout_set(&mesh->loop, &mesh->pingtimer, &(struct timespec) {
0, 0
});
}
/*
this is where it all happens...
*/
-int main_loop(meshlink_handle_t *mesh) {
- timeout_add(&mesh->loop, &mesh->pingtimer, timeout_handler, &mesh->pingtimer, &(struct timeval) {
- default_timeout, prng(mesh, TIMER_FUDGE)
+void main_loop(meshlink_handle_t *mesh) {
+ timeout_add(&mesh->loop, &mesh->pingtimer, timeout_handler, &mesh->pingtimer, &(struct timespec) {
+ 1, prng(mesh, TIMER_FUDGE)
});
- timeout_add(&mesh->loop, &mesh->periodictimer, periodic_handler, &mesh->periodictimer, &(struct timeval) {
+ timeout_add(&mesh->loop, &mesh->periodictimer, periodic_handler, &mesh->periodictimer, &(struct timespec) {
0, 0
});
mesh->datafromapp.signum = 0;
signal_add(&mesh->loop, &mesh->datafromapp, meshlink_send_from_queue, mesh, mesh->datafromapp.signum);
- if(!event_loop_run(&mesh->loop, &mesh->mesh_mutex)) {
+ if(!event_loop_run(&mesh->loop, &mesh->mutex)) {
logger(mesh, MESHLINK_ERROR, "Error while waiting for input: %s", strerror(errno));
- abort();
- signal_del(&mesh->loop, &mesh->datafromapp);
- timeout_del(&mesh->loop, &mesh->periodictimer);
- timeout_del(&mesh->loop, &mesh->pingtimer);
-
- return 1;
+ call_error_cb(mesh, MESHLINK_ENETWORK);
}
signal_del(&mesh->loop, &mesh->datafromapp);
timeout_del(&mesh->loop, &mesh->periodictimer);
timeout_del(&mesh->loop, &mesh->pingtimer);
-
- return 0;
}
projects / meshlink / blobdiff