X-Git-Url: http://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fnet.c;h=8259a3672ba8a71403045fc3b7b4e3ec6262d4be;hb=0f6f54ff8aa96d981f68b5b71c7126b8fdbead6c;hp=81a0d894daaf8f818a8139c72404be5f40a7ea5f;hpb=0200d3cd5d773d9b101c33264532d2a301c2af32;p=tinc diff --git a/src/net.c b/src/net.c index 81a0d894..8259a367 100644 --- a/src/net.c +++ b/src/net.c @@ -29,7 +29,7 @@ #include "conf.h" #include "connection.h" #include "device.h" -#include "event.h" +#include "tevent.h" #include "graph.h" #include "logger.h" #include "meta.h" @@ -109,10 +109,10 @@ static void purge(void) } /* - 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; @@ -120,9 +120,6 @@ static int build_fdset(fd_set *readset, fd_set *writeset) cp(); - FD_ZERO(readset); - FD_ZERO(writeset); - for(node = connection_tree->head; node; node = next) { next = node->next; c = node->data; @@ -131,29 +128,10 @@ static int build_fdset(fd_set *readset, fd_set *writeset) 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; } /* @@ -182,6 +160,8 @@ void terminate_connection(connection_t *c, bool report) if(c->socket) closesocket(c->socket); + event_del(&c->ev); + if(c->edge) { if(report && !tunnelserver) send_del_edge(broadcast, c->edge); @@ -279,83 +259,51 @@ static void check_dead_connections(void) } } -/* - 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(); - - /* check input from kernel */ - if(FD_ISSET(device_fd, readset)) { - if(read_packet(&packet)) - route(myself, &packet); - } - - /* check meta connections */ - for(node = connection_tree->head; node; node = node->next) { - c = node->data; - - if(c->status.remove) - continue; - - if(FD_ISSET(c->socket, readset)) { - 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); - continue; - } - } - if(!receive_meta(c)) { - terminate_connection(c, c->status.active); - continue; - } - } + if (c->status.remove) + return; - if(FD_ISSET(c->socket, writeset)) { - if(!flush_meta(c)) { - terminate_connection(c, c->status.active); - continue; - } + 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; } } - for(i = 0; i < listen_sockets; i++) { - if(FD_ISSET(listen_socket[i].udp, readset)) - handle_incoming_vpn_data(listen_socket[i].udp); - - if(FD_ISSET(listen_socket[i].tcp, readset)) - handle_new_meta_connection(listen_socket[i].tcp); + if (!receive_meta(c)) { + terminate_connection(c, c->status.active); + return; } } +static void dummy(int a, short b, void *c) +{ +} + /* this is where it all happens... */ int main_loop(void) { - fd_set readset, writeset; struct timeval tv; - int r, maxfd; + int r; time_t last_ping_check, last_config_check, last_graph_dump; - event_t *event; + tevent_t *event; + struct event timeout; cp(); @@ -374,23 +322,30 @@ int main_loop(void) 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(); @@ -422,19 +377,14 @@ int main_loop(void) } - while((event = get_expired_event())) { + while((event = get_expired_tevent())) { event->handler(event->data); - free(event); + free_tevent(event); } if(sigalrm) { logger(LOG_INFO, _("Flushing event queue")); - - while(event_tree->head) { - event = event_tree->head->data; - event->handler(event->data); - event_del(event); - } + flush_tevents(); sigalrm = false; } @@ -463,7 +413,8 @@ int main_loop(void) if(c->outgoing) { free(c->outgoing->name); - freeaddrinfo(c->outgoing->ai); + if(c->outgoing->ai) + freeaddrinfo(c->outgoing->ai); free(c->outgoing); c->outgoing = NULL; }