#include <openssl/rand.h>
#include "utils.h"
-#include "avl_tree.h"
+#include "splay_tree.h"
#include "conf.h"
#include "connection.h"
#include "device.h"
#include "subnet.h"
#include "xalloc.h"
-volatile bool running = false;
-
-time_t now = 0;
-
/* Purge edges and subnets of unreachable nodes. Use carefully. */
-static void purge(void)
-{
- avl_node_t *nnode, *nnext, *enode, *enext, *snode, *snext;
+static void purge(void) {
+ splay_node_t *nnode, *nnext, *enode, *enext, *snode, *snext;
node_t *n;
edge_t *e;
subnet_t *s;
}
}
-/*
- put all file descriptors into events
- While we're at it, purge stuf that needs to be removed.
-*/
-static int build_fdset(void)
-{
- avl_node_t *node, *next;
- connection_t *c;
- int i, max = 0;
-
- cp();
-
- for(node = connection_tree->head; node; node = next) {
- next = node->next;
- c = node->data;
-
- if(c->status.remove) {
- connection_del(c);
- if(!connection_tree->head)
- purge();
- }
- }
-
- return 0;
-}
-
/*
Terminate a connection:
- Close the socket
- Check if we need to retry making an outgoing connection
- Deactivate the host
*/
-void terminate_connection(connection_t *c, bool report)
-{
+void terminate_connection(connection_t *c, bool report) {
cp();
- if(c->status.remove)
- return;
-
ifdebug(CONNECTIONS) logger(LOG_NOTICE, _("Closing connection with %s (%s)"),
c->name, c->hostname);
- c->status.remove = true;
c->status.active = false;
if(c->node)
}
}
+ 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) {
retry_outgoing(c->outgoing);
c->outgoing = NULL;
+ } else {
+ connection_del(c);
}
-
- free(c->outbuf);
- c->outbuf = NULL;
- c->outbuflen = 0;
- c->outbufsize = 0;
- c->outbufstart = 0;
}
/*
end does not reply in time, we consider them dead
and close the connection.
*/
-static void check_dead_connections(void)
-{
- avl_node_t *node, *next;
+static void timeout_handler(int fd, short events, void *event) {
+ splay_node_t *node, *next;
connection_t *c;
+ time_t now = time(NULL);
cp();
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 {
- if(c->status.remove) {
- logger(LOG_WARNING, _("Old connection_t for %s (%s) status %04x still lingering, deleting..."),
- c->name, c->hostname, c->status.value);
- connection_del(c);
- continue;
- }
ifdebug(CONNECTIONS) logger(LOG_WARNING, _("Timeout from %s (%s) during authentication"),
c->name, c->hostname);
if(c->status.connecting) {
do_outgoing_connection(c);
} else {
terminate_connection(c, false);
+ continue;
}
}
}
-
- if(c->outbuflen > 0 && c->last_flushed_time + pingtimeout < now) {
- if(c->status.active) {
- ifdebug(CONNECTIONS) logger(LOG_INFO,
- _("%s (%s) could not flush for %ld seconds (%d bytes remaining)"),
- c->name, c->hostname, now - c->last_flushed_time, c->outbuflen);
- c->status.timeout = true;
- terminate_connection(c, true);
- }
- }
}
+
+ event_add(event, &(struct timeval){pingtimeout, 0});
}
-void handle_meta_connection_data(int fd, short events, void *data)
-{
+void handle_meta_connection_data(int fd, short events, void *data) {
connection_t *c = data;
int result;
socklen_t len = sizeof(result);
- if (c->status.remove)
- return;
-
if(c->status.connecting) {
getsockopt(c->socket, SOL_SOCKET, SO_ERROR, &result, &len);
}
}
-static void dummy(int a, short b, void *c)
-{
-}
-
static void sigterm_handler(int signal, short events, void *data) {
logger(LOG_NOTICE, _("Got %s signal"), strsignal(signal));
- running = false;
event_loopexit(NULL);
}
static void sighup_handler(int signal, short events, void *data) {
connection_t *c;
- avl_node_t *node;
+ splay_node_t *node;
char *fname;
struct stat s;
static time_t last_config_check = 0;
logger(LOG_NOTICE, _("Got %s signal"), strsignal(signal));
connection_t *c;
- avl_node_t *node;
+ splay_node_t *node;
for(node = connection_tree->head; node; node = node->next) {
c = node->data;
}
}
-static void keyexpire_handler(int fd, short events, void *event) {
- ifdebug(STATUS) logger(LOG_INFO, _("Regenerating symmetric key"));
-
- RAND_pseudo_bytes((unsigned char *)myself->key, myself->keylength);
- if(myself->cipher)
- EVP_DecryptInit_ex(&packet_ctx, myself->cipher, NULL, (unsigned char *)myself->key, (unsigned char *)myself->key + myself->cipher->key_len);
- send_key_changed(broadcast, myself);
-
- event_add(event, &(struct timeval){keylifetime, 0});
-}
-
/*
this is where it all happens...
*/
-int main_loop(void)
-{
- struct timeval tv;
- int r;
- time_t last_ping_check;
- struct event timeout;
+int main_loop(void) {
+ struct event timeout_event;
struct event sighup_event;
struct event sigint_event;
struct event sigterm_event;
struct event sigusr2_event;
struct event sigwinch_event;
struct event sigalrm_event;
- struct event keyexpire_event;
cp();
+ timeout_set(&timeout_event, timeout_handler, &timeout_event);
+ event_add(&timeout_event, &(struct timeval){pingtimeout, 0});
signal_set(&sighup_event, SIGHUP, sighup_handler, NULL);
signal_add(&sighup_event, NULL);
signal_set(&sigint_event, SIGINT, sigint_handler, NULL);
signal_add(&sigwinch_event, NULL);
signal_set(&sigalrm_event, SIGALRM, sigalrm_handler, NULL);
signal_add(&sigalrm_event, NULL);
- timeout_set(&keyexpire_event, keyexpire_handler, &keyexpire_event);
- event_add(&keyexpire_event, &(struct timeval){keylifetime, 0});
-
- last_ping_check = now;
-
- srand(now);
-
- running = true;
-
- while(running) {
- now = time(NULL);
-
- // tv.tv_sec = 1 + (rand() & 7); /* Approx. 5 seconds, randomized to prevent global synchronisation effects */
- tv.tv_sec = 1;
- tv.tv_usec = 0;
-
- /* XXX: libevent transition: old timeout code in this loop */
- timeout_set(&timeout, dummy, NULL);
- timeout_add(&timeout, &tv);
- r = build_fdset();
- if(r < 0) {
- logger(LOG_ERR, _("Error building fdset: %s"), strerror(errno));
- cp_trace();
- dump_connections();
- return 1;
- }
-
- r = event_loop(EVLOOP_ONCE);
- now = time(NULL);
- if(r < 0) {
- logger(LOG_ERR, _("Error while waiting for input: %s"),
- strerror(errno));
- cp_trace();
- dump_connections();
- return 1;
- }
-
- /* XXX: more libevent transition */
- timeout_del(&timeout);
-
- /* Let's check if everybody is still alive */
-
- if(last_ping_check + pingtimeout < now) {
- check_dead_connections();
- last_ping_check = now;
- }
+ if(event_loop(0) < 0) {
+ logger(LOG_ERR, _("Error while waiting for input: %s"), strerror(errno));
+ return 1;
}
signal_del(&sighup_event);
signal_del(&sigusr2_event);
signal_del(&sigwinch_event);
signal_del(&sigalrm_event);
- event_del(&keyexpire_event);
+ event_del(&timeout_event);
return 0;
}
projects / tinc / blobdiff