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);
}
}
}
}
- 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);