#include "meta.h"
#include "net.h"
#include "netutl.h"
+#include "pmtu.h"
#include "protocol.h"
#include "sptps.h"
#include "xalloc.h"
- Check if we need to retry making an outgoing connection
*/
void terminate_connection(meshlink_handle_t *mesh, connection_t *c, bool report) {
- logger(mesh, MESHLINK_INFO, "Closing connection with %s", c->name);
-
- c->status.active = false;
+ if(c->status.active) {
+ logger(mesh, MESHLINK_INFO, "Closing connection with %s", c->name);
+ }
if(c->node && c->node->connection == c) {
+ if(c->status.active && mesh->meta_status_cb) {
+ mesh->meta_status_cb(mesh, (meshlink_node_t *)c->node, false);
+ }
+
c->node->connection = NULL;
}
+ c->status.active = false;
+
if(c->edge) {
if(report) {
send_del_edge(mesh, mesh->everyone, c->edge, 0);
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) {
+ if(c->outgoing && !c->status.active && 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->node->status.waitingforkey && c->node->last_req_key + pingtimeout < mesh->loop.now.tv_sec) {
send_req_key(mesh, c->node);
}
+
+ keepalive(mesh, c->node, false);
}
if(c->status.active && c->last_key_renewal + 3600 < mesh->loop.now.tv_sec) {
}
}
- if(c->last_ping_time + pingtimeout <= mesh->loop.now.tv_sec) {
+ if(c->last_ping_time + pingtimeout < mesh->loop.now.tv_sec) {
if(c->status.active) {
if(c->status.pinged) {
logger(mesh, MESHLINK_INFO, "%s didn't respond to PING in %ld seconds", c->name, (long)mesh->loop.now.tv_sec - c->last_ping_time);
}
terminate_connection(mesh, c, c->status.active);
+ continue;
}
}
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);
struct timespec ts = {mesh->sleeptime, 0};
- clock_nanosleep(CLOCK_MONOTONIC, 0, &ts, NULL);
+ nanosleep(&ts, NULL);
mesh->sleeptime *= 2;
if(mesh->sleeptime < 0) {
for splay_each(node_t, n, mesh->nodes) {
if(n->status.dirty) {
- if(!node_write_config(mesh, n)) {
+ if(!node_write_config(mesh, n, false)) {
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) {
+ if(n->status.reachable && 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);
devtool_sptps_renewal_probe((meshlink_node_t *)n);
n->status.validkey = false;
sptps_stop(&n->sptps);
n->status.waitingforkey = false;
- n->last_req_key = 0;
+ n->last_req_key = -3600;
} else {
n->last_req_key = mesh->loop.now.tv_sec;
}
}
if(!c->status.pinged) {
- c->last_ping_time = 0;
+ c->last_ping_time = -3600;
}
sockaddr_t sa;
int sock = socket(sa.sa.sa_family, SOCK_STREAM, IPPROTO_TCP);
- if(sock != -1) {
+ if(sock == -1) {
continue;
}
}
/* Kick the ping timeout handler */
- timeout_set(&mesh->loop, &mesh->pingtimer, &(struct timespec) {
- 0, 0
- });
+ if(mesh->pingtimer.cb) {
+ timeout_set(&mesh->loop, &mesh->pingtimer, &(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->mutex)) {
+ if(!event_loop_run(&mesh->loop, mesh)) {
logger(mesh, MESHLINK_ERROR, "Error while waiting for input: %s", strerror(errno));
call_error_cb(mesh, MESHLINK_ENETWORK);
}