#include "conf.h"
#include "connection.h"
#include "device.h"
-#include "tevent.h"
#include "graph.h"
#include "logger.h"
#include "meta.h"
}
/*
- put all file descriptors in an fd_set array
- While we're at it, purge stuff that needs to be removed.
+ put all file descriptors into events
+ While we're at it, purge stuf that needs to be removed.
*/
-static int build_fdset(fd_set *readset, fd_set *writeset)
+static int build_fdset(void)
{
avl_node_t *node, *next;
connection_t *c;
cp();
- FD_ZERO(readset);
- FD_ZERO(writeset);
-
for(node = connection_tree->head; node; node = next) {
next = node->next;
c = node->data;
connection_del(c);
if(!connection_tree->head)
purge();
- } else {
- FD_SET(c->socket, readset);
- if(c->outbuflen > 0)
- FD_SET(c->socket, writeset);
- if(c->socket > max)
- max = c->socket;
}
}
- for(i = 0; i < listen_sockets; i++) {
- FD_SET(listen_socket[i].tcp, readset);
- if(listen_socket[i].tcp > max)
- max = listen_socket[i].tcp;
- FD_SET(listen_socket[i].udp, readset);
- if(listen_socket[i].udp > max)
- max = listen_socket[i].udp;
- }
-
- FD_SET(device_fd, readset);
- if(device_fd > max)
- max = device_fd;
-
- return max;
+ return 0;
}
/*
if(c->socket)
closesocket(c->socket);
+ event_del(&c->ev);
+
if(c->edge) {
if(report && !tunnelserver)
send_del_edge(broadcast, c->edge);
}
}
-/*
- check all connections to see if anything
- happened on their sockets
-*/
-static void check_network_activity(fd_set * readset, fd_set * writeset)
+void handle_meta_connection_data(int fd, short events, void *data)
{
- connection_t *c;
- avl_node_t *node;
- int result, i;
+ connection_t *c = data;
+ int result;
socklen_t len = sizeof(result);
- vpn_packet_t packet;
- cp();
+ if (c->status.remove)
+ return;
- /* check input from kernel */
- if(FD_ISSET(device_fd, readset)) {
- if(read_packet(&packet))
- route(myself, &packet);
+ if(c->status.connecting) {
+ c->status.connecting = false;
+ getsockopt(c->socket, SOL_SOCKET, SO_ERROR, &result, &len);
+
+ if(!result)
+ finish_connecting(c);
+ else {
+ ifdebug(CONNECTIONS) logger(LOG_DEBUG,
+ _("Error while connecting to %s (%s): %s"),
+ c->name, c->hostname, strerror(result));
+ closesocket(c->socket);
+ do_outgoing_connection(c);
+ return;
+ }
}
- /* check meta connections */
- for(node = connection_tree->head; node; node = node->next) {
- c = node->data;
+ if (!receive_meta(c)) {
+ terminate_connection(c, c->status.active);
+ return;
+ }
+}
- if(c->status.remove)
- continue;
+static void dummy(int a, short b, void *c)
+{
+}
- if(FD_ISSET(c->socket, readset)) {
- if(c->status.connecting) {
- c->status.connecting = false;
- getsockopt(c->socket, SOL_SOCKET, SO_ERROR, &result, &len);
+void sighup_handler(int signal, short events, void *data) {
+ connection_t *c;
+ avl_node_t *node;
+ char *fname;
+ struct stat s;
+ static time_t last_config_check = 0;
+
+ /* Reread our own configuration file */
- if(!result)
- finish_connecting(c);
- else {
- ifdebug(CONNECTIONS) logger(LOG_DEBUG,
- _("Error while connecting to %s (%s): %s"),
- c->name, c->hostname, strerror(result));
- closesocket(c->socket);
- do_outgoing_connection(c);
- continue;
- }
- }
+ exit_configuration(&config_tree);
+ init_configuration(&config_tree);
- if(!receive_meta(c)) {
- terminate_connection(c, c->status.active);
- continue;
- }
- }
+ if(!read_server_config()) {
+ logger(LOG_ERR, _("Unable to reread configuration file, exitting."));
+ event_loopexit(NULL);
+ return;
+ }
- if(FD_ISSET(c->socket, writeset)) {
- if(!flush_meta(c)) {
- terminate_connection(c, c->status.active);
- continue;
- }
+ /* Close connections to hosts that have a changed or deleted host config file */
+
+ for(node = connection_tree->head; node; node = node->next) {
+ c = node->data;
+
+ if(c->outgoing) {
+ free(c->outgoing->name);
+ if(c->outgoing->ai)
+ freeaddrinfo(c->outgoing->ai);
+ free(c->outgoing);
+ c->outgoing = NULL;
}
+
+ asprintf(&fname, "%s/hosts/%s", confbase, c->name);
+ if(stat(fname, &s) || s.st_mtime > last_config_check)
+ terminate_connection(c, c->status.active);
+ free(fname);
}
- for(i = 0; i < listen_sockets; i++) {
- if(FD_ISSET(listen_socket[i].udp, readset))
- handle_incoming_vpn_data(listen_socket[i].udp);
+ last_config_check = time(NULL);
- if(FD_ISSET(listen_socket[i].tcp, readset))
- handle_new_meta_connection(listen_socket[i].tcp);
- }
+ /* Try to make outgoing connections */
+
+ try_outgoing_connections();
}
/*
*/
int main_loop(void)
{
- fd_set readset, writeset;
struct timeval tv;
- int r, maxfd;
- time_t last_ping_check, last_config_check, last_graph_dump;
- tevent_t *event;
+ int r;
+ time_t last_ping_check;
+ struct event timeout;
+ struct event sighup_event;
cp();
+ signal_set(&sighup_event, SIGHUP, sighup_handler, NULL);
+ signal_add(&sighup_event, NULL);
+
last_ping_check = now;
- last_config_check = now;
- last_graph_dump = now;
srand(now);
tv.tv_sec = 1;
tv.tv_usec = 0;
- maxfd = build_fdset(&readset, &writeset);
-
- r = select(maxfd + 1, &readset, &writeset, NULL, &tv);
+ /* XXX: libevent transition: old timeout code in this loop */
+ timeout_set(&timeout, dummy, NULL);
+ timeout_add(&timeout, &tv);
+ r = build_fdset();
if(r < 0) {
- if(errno != EINTR && errno != EAGAIN) {
- logger(LOG_ERR, _("Error while waiting for input: %s"),
- strerror(errno));
- cp_trace();
- dump_connections();
- return 1;
- }
+ logger(LOG_ERR, _("Error building fdset: %s"), strerror(errno));
+ cp_trace();
+ dump_connections();
+ return 1;
+ }
- continue;
+ 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;
}
- check_network_activity(&readset, &writeset);
+ /* XXX: more libevent transition */
+ timeout_del(&timeout);
if(do_purge) {
purge();
}
}
-
- while((event = get_expired_event())) {
- event->handler(event->data);
- free_event(event);
- }
-
if(sigalrm) {
logger(LOG_INFO, _("Flushing event queue"));
- flush_events();
+ // TODO: do this another way
sigalrm = false;
}
-
- if(sighup) {
- connection_t *c;
- avl_node_t *node;
- char *fname;
- struct stat s;
-
- sighup = false;
-
- /* Reread our own configuration file */
-
- exit_configuration(&config_tree);
- init_configuration(&config_tree);
-
- if(!read_server_config()) {
- logger(LOG_ERR, _("Unable to reread configuration file, exitting."));
- return 1;
- }
-
- /* Close connections to hosts that have a changed or deleted host config file */
-
- for(node = connection_tree->head; node; node = node->next) {
- c = node->data;
-
- if(c->outgoing) {
- free(c->outgoing->name);
- if(c->outgoing->ai)
- freeaddrinfo(c->outgoing->ai);
- free(c->outgoing);
- c->outgoing = NULL;
- }
-
- asprintf(&fname, "%s/hosts/%s", confbase, c->name);
- if(stat(fname, &s) || s.st_mtime > last_config_check)
- terminate_connection(c, c->status.active);
- free(fname);
- }
-
- last_config_check = now;
-
- /* Try to make outgoing connections */
-
- try_outgoing_connections();
- }
-
- /* Dump graph if wanted every 60 seconds*/
-
- if(last_graph_dump + 60 < now) {
- dump_graph();
- last_graph_dump = now;
- }
}
+ signal_del(&sighup_event);
+
return 0;
}
projects / tinc / blobdiff