} /* int setup_vpn_in_socket */
static void retry_outgoing_handler(event_loop_t *loop, void *data) {
+ assert(data);
+
meshlink_handle_t *mesh = loop->data;
outgoing_t *outgoing = data;
setup_outgoing_connection(mesh, outgoing);
}
void retry_outgoing(meshlink_handle_t *mesh, outgoing_t *outgoing) {
- outgoing->timeout += 5;
+ if(!mesh->reachable && mesh->loop.now.tv_sec < mesh->last_unreachable + mesh->dev_class_traits[mesh->devclass].fast_retry_period) {
+ outgoing->timeout = 1;
+ } else {
+ outgoing->timeout += 5;
+ }
if(outgoing->timeout > mesh->maxtimeout) {
outgoing->timeout = mesh->maxtimeout;
}
timeout_add(&mesh->loop, &outgoing->ev, retry_outgoing_handler, outgoing, &(struct timeval) {
- outgoing->timeout, rand() % 100000
+ outgoing->timeout, prng(mesh, TIMER_FUDGE)
});
logger(mesh, MESHLINK_INFO, "Trying to re-establish outgoing connection in %d seconds", outgoing->timeout);
return false;
}
-bool do_outgoing_connection(meshlink_handle_t *mesh, outgoing_t *outgoing) {
+void do_outgoing_connection(meshlink_handle_t *mesh, outgoing_t *outgoing) {
struct addrinfo *proxyai = NULL;
int result;
retry_outgoing(mesh, outgoing);
}
- return false;
+ return;
}
connection_t *c = new_connection();
/* Now that there is a working socket, fill in the rest and register this connection. */
c->status.connecting = true;
+ c->status.initiator = true;
c->name = xstrdup(outgoing->node->name);
c->last_ping_time = mesh->loop.now.tv_sec;
connection_add(mesh, c);
io_add(&mesh->loop, &c->io, handle_meta_io, c, c->socket, IO_READ | IO_WRITE);
+}
- return true;
+void reset_outgoing(outgoing_t *outgoing) {
+ if(outgoing->ai) {
+ if(outgoing->state == OUTGOING_RECENT || outgoing->state == OUTGOING_KNOWN) {
+ free_known_addresses(outgoing->ai);
+ } else {
+ freeaddrinfo(outgoing->ai);
+ }
+ }
+
+ outgoing->ai = NULL;
+ outgoing->aip = NULL;
+ outgoing->state = OUTGOING_START;
}
void setup_outgoing_connection(meshlink_handle_t *mesh, outgoing_t *outgoing) {
return;
}
-
- if(outgoing->ai) {
- if(outgoing->state == OUTGOING_RECENT || outgoing->state == OUTGOING_KNOWN) {
- free_known_addresses(outgoing->ai);
- } else {
- freeaddrinfo(outgoing->ai);
- }
- }
-
- outgoing->state = OUTGOING_START;
+ reset_outgoing(outgoing);
if(outgoing->node->status.blacklisted) {
return;