/*
net.c -- most of the network code
- Copyright (C) 1998-2003 Ivo Timmermans <ivo@o2w.nl>,
- 2000-2003 Guus Sliepen <guus@sliepen.eu.org>
+ Copyright (C) 1998-2005 Ivo Timmermans,
+ 2000-2006 Guus Sliepen <guus@tinc-vpn.org>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- $Id: net.c,v 1.35.4.202 2003/12/12 19:52:24 guus Exp $
+ $Id$
*/
#include "system.h"
#include "conf.h"
#include "connection.h"
#include "device.h"
-#include "event.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 * fs)
+static int build_fdset(void)
{
avl_node_t *node, *next;
connection_t *c;
cp();
- FD_ZERO(fs);
-
for(node = connection_tree->head; node; node = next) {
next = node->next;
c = node->data;
if(!connection_tree->head)
purge();
} else {
- FD_SET(c->socket, fs);
- if(c->socket > max)
- max = c->socket;
+ short events = EV_READ;
+ if(c->outbuflen > 0)
+ events |= EV_WRITE;
+ event_del(&c->ev);
+ event_set(&c->ev, c->socket, events,
+ handle_meta_connection_data, c);
+ if (event_add(&c->ev, NULL) < 0)
+ return -1;
}
}
-
- for(i = 0; i < listen_sockets; i++) {
- FD_SET(listen_socket[i].tcp, fs);
- if(listen_socket[i].tcp > max)
- max = listen_socket[i].tcp;
- FD_SET(listen_socket[i].udp, fs);
- if(listen_socket[i].udp > max)
- max = listen_socket[i].udp;
- }
-
- FD_SET(device_fd, fs);
- if(device_fd > max)
- max = device_fd;
-
- return max;
+ return 0;
}
/*
retry_outgoing(c->outgoing);
c->outgoing = NULL;
}
+
+ free(c->outbuf);
+ c->outbuf = NULL;
+ c->outbuflen = 0;
+ c->outbufsize = 0;
+ c->outbufstart = 0;
}
/*
if(c->last_ping_time + pingtimeout < now) {
if(c->status.active) {
if(c->status.pinged) {
- ifdebug(CONNECTIONS) logger(LOG_INFO, _("%s (%s) didn't respond to PING"),
- c->name, c->hostname);
+ 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);
- } else {
+ } 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, *(uint32_t *)&c->status);
+ 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);
- terminate_connection(c, false);
+ if(c->status.connecting) {
+ c->status.connecting = false;
+ closesocket(c->socket);
+ do_outgoing_connection(c);
+ } else {
+ terminate_connection(c, false);
+ }
+ }
+ }
+
+ 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);
}
}
}
}
-/*
- check all connections to see if anything
- happened on their sockets
-*/
-static void check_network_activity(fd_set * f)
+void handle_meta_connection_data(int fd, short events, void *data)
{
- connection_t *c;
- avl_node_t *node;
- int result, i;
- int len = sizeof(result);
- vpn_packet_t packet;
-
- cp();
-
- if(FD_ISSET(device_fd, f)) {
- if(read_packet(&packet))
- route(myself, &packet);
- }
-
- for(node = connection_tree->head; node; node = node->next) {
- c = node->data;
+ connection_t *c = data;
+ int result;
+ socklen_t len = sizeof(result);
- if(c->status.remove)
- continue;
-
- if(FD_ISSET(c->socket, f)) {
- if(c->status.connecting) {
- c->status.connecting = false;
- getsockopt(c->socket, SOL_SOCKET, SO_ERROR, &result, &len);
+ if (c->status.remove)
+ return;
- 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 (events & EV_READ) {
+ 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;
}
+ }
- if(!receive_meta(c)) {
- terminate_connection(c, c->status.active);
- continue;
- }
+ if (!receive_meta(c)) {
+ terminate_connection(c, c->status.active);
+ return;
}
}
- for(i = 0; i < listen_sockets; i++) {
- if(FD_ISSET(listen_socket[i].udp, f))
- handle_incoming_vpn_data(listen_socket[i].udp);
-
- if(FD_ISSET(listen_socket[i].tcp, f))
- handle_new_meta_connection(listen_socket[i].tcp);
+ if (events & EV_WRITE) {
+ if(!flush_meta(c)) {
+ terminate_connection(c, c->status.active);
+ }
}
}
+static void dummy(int a, short b, void *c)
+{
+}
+
/*
this is where it all happens...
*/
int main_loop(void)
{
- fd_set fset;
struct timeval tv;
- int r, maxfd;
- time_t last_ping_check, last_config_check;
- event_t *event;
+ int r;
+ time_t last_ping_check, last_config_check, last_graph_dump;
+ tevent_t *event;
+ struct event timeout;
cp();
last_ping_check = now;
last_config_check = now;
+ last_graph_dump = 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 + (rand() & 7); /* Approx. 5 seconds, randomized to prevent global synchronisation effects */
+ tv.tv_sec = 1;
tv.tv_usec = 0;
- maxfd = build_fdset(&fset);
-
- r = select(maxfd + 1, &fset, NULL, 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(&fset);
+ /* XXX: more libevent transition */
+ timeout_del(&timeout);
if(do_purge) {
purge();
if(keyexpires < now) {
ifdebug(STATUS) logger(LOG_INFO, _("Regenerating symmetric key"));
- RAND_pseudo_bytes(myself->key, myself->keylength);
+ RAND_pseudo_bytes((unsigned char *)myself->key, myself->keylength);
if(myself->cipher)
- EVP_DecryptInit_ex(&packet_ctx, myself->cipher, NULL, myself->key, myself->key + myself->cipher->key_len);
+ 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);
keyexpires = now + keylifetime;
}
}
- 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;
}
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;
}
try_outgoing_connections();
}
+
+ /* Dump graph if wanted every 60 seconds*/
+
+ if(last_graph_dump + 60 < now) {
+ dump_graph();
+ last_graph_dump = now;
+ }
}
return 0;
projects / tinc / blobdiff