if(c->socket)
closesocket(c->socket);
- event_del(&c->ev);
-
if(c->edge) {
if(report && !tunnelserver)
send_del_edge(broadcast, c->edge);
}
}
- free(c->outbuf);
- c->outbuf = NULL;
- c->outbuflen = 0;
- c->outbufsize = 0;
- c->outbufstart = 0;
-
/* Check if this was our outgoing connection */
- if(c->outgoing) {
+ if(c->outgoing)
retry_outgoing(c->outgoing);
- c->outgoing = NULL;
- } else {
- connection_del(c);
- }
+
+ connection_del(c);
}
/*
if(c->status.pinged) {
ifdebug(CONNECTIONS) logger(LOG_INFO, _("%s (%s) didn't respond to PING in %ld seconds"),
c->name, c->hostname, now - c->last_ping_time);
- c->status.timeout = true;
terminate_connection(c, true);
continue;
} else if(c->last_ping_time + pinginterval < now) {
send_ping(c);
}
} else {
- ifdebug(CONNECTIONS) logger(LOG_WARNING, _("Timeout from %s (%s) during authentication"),
- c->name, c->hostname);
if(c->status.connecting) {
+ ifdebug(CONNECTIONS)
+ logger(LOG_WARNING, _("Timeout while connecting to %s (%s)"), c->name, c->hostname);
c->status.connecting = false;
closesocket(c->socket);
do_outgoing_connection(c);
} else {
+ ifdebug(CONNECTIONS) logger(LOG_WARNING, _("Timeout from %s (%s) during authentication"), c->name, c->hostname);
terminate_connection(c, false);
continue;
}
socklen_t len = sizeof(result);
if(c->status.connecting) {
+ c->status.connecting = false;
+
getsockopt(c->socket, SOL_SOCKET, SO_ERROR, &result, &len);
if(!result)
ifdebug(CONNECTIONS) logger(LOG_DEBUG,
_("Error while connecting to %s (%s): %s"),
c->name, c->hostname, strerror(result));
- c->status.connecting = false;
closesocket(c->socket);
do_outgoing_connection(c);
return;
}
}
-static void sigusr1_handler(int signal, short events, void *data) {
- logger(LOG_NOTICE, _("Got %s signal"), strsignal(signal));
- dump_connections();
-}
-
-static void sigusr2_handler(int signal, short events, void *data) {
- logger(LOG_NOTICE, _("Got %s signal"), strsignal(signal));
- dump_device_stats();
- dump_nodes();
- dump_edges();
- dump_subnets();
-}
-
static void sigwinch_handler(int signal, short events, void *data) {
logger(LOG_NOTICE, _("Got %s signal"), strsignal(signal));
purge();
static void sighup_handler(int signal, short events, void *data) {
connection_t *c;
- splay_node_t *node;
+ splay_node_t *node, *next;
char *fname;
struct stat s;
static time_t last_config_check = 0;
/* Close connections to hosts that have a changed or deleted host config file */
- for(node = connection_tree->head; node; node = node->next) {
+ for(node = connection_tree->head; node; node = next) {
c = node->data;
+ next = node->next;
if(c->outgoing) {
free(c->outgoing->name);
struct event sigint_event;
struct event sigterm_event;
struct event sigquit_event;
- struct event sigusr1_event;
- struct event sigusr2_event;
struct event sigwinch_event;
struct event sigalrm_event;
signal_add(&sigterm_event, NULL);
signal_set(&sigquit_event, SIGQUIT, sigterm_handler, NULL);
signal_add(&sigquit_event, NULL);
- signal_set(&sigusr1_event, SIGUSR1, sigusr1_handler, NULL);
- signal_add(&sigusr1_event, NULL);
- signal_set(&sigusr2_event, SIGUSR2, sigusr2_handler, NULL);
- signal_add(&sigusr2_event, NULL);
signal_set(&sigwinch_event, SIGWINCH, sigwinch_handler, NULL);
signal_add(&sigwinch_event, NULL);
signal_set(&sigalrm_event, SIGALRM, sigalrm_handler, NULL);
signal_del(&sigint_event);
signal_del(&sigterm_event);
signal_del(&sigquit_event);
- signal_del(&sigusr1_event);
- signal_del(&sigusr2_event);
signal_del(&sigwinch_event);
signal_del(&sigalrm_event);
event_del(&timeout_event);