X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnet.c;h=ae6fbed8bb1178deeba8434546d27d852b2d0b17;hp=dc632b608f457defcdde384a6c27b24021233a34;hb=ffb88ff6410f33de92db108bd1e0c3a915368214;hpb=ee96ccabbbf0180d5631d3c22838456f28ee9c15 diff --git a/src/net.c b/src/net.c index dc632b60..8c3f9a08 100644 --- a/src/net.c +++ b/src/net.c @@ -1,6 +1,7 @@ /* net.c -- most of the network code - Copyright (C) 1998,1999,2000 Ivo Timmermans + Copyright (C) 1998-2001 Ivo Timmermans , + 2000,2001 Guus Sliepen 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 @@ -15,240 +16,160 @@ You should have received a copy of the GNU General Public License 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.145 2001/10/31 20:22:52 guus Exp $ */ #include "config.h" -#include #include #include #include #include +#ifdef HAVE_LINUX + #include + #include +#endif #include #include #include #include -#include #include #include #include #include +#include +/* SunOS really wants sys/socket.h BEFORE net/if.h, + and FreeBSD wants these lines below the rest. */ +#include +#include +#include + +#include +#include +#include + +#ifndef HAVE_RAND_PSEUDO_BYTES +#define RAND_pseudo_bytes RAND_bytes +#endif -#include #include #include +#include +#include #include "conf.h" -#include "encr.h" +#include "connection.h" +#include "meta.h" #include "net.h" #include "netutl.h" +#include "process.h" #include "protocol.h" +#include "subnet.h" +#include "process.h" +#include "route.h" +#include "device.h" -int tap_fd = -1; +#include "system.h" -int total_tap_in = 0; -int total_tap_out = 0; -int total_socket_in = 0; -int total_socket_out = 0; +int maxtimeout = 900; +int seconds_till_retry = 5; -time_t last_ping_time = 0; +int tcp_socket = -1; +int udp_socket = -1; -/* The global list of existing connections */ -conn_list_t *conn_list = NULL; -conn_list_t *myself = NULL; +int keylifetime = 0; +int keyexpires = 0; -/* - strip off the MAC adresses of an ethernet frame -*/ -void strip_mac_addresses(vpn_packet_t *p) -{ - unsigned char tmp[MAXSIZE]; -cp - memcpy(tmp, p->data, p->len); - p->len -= 12; - memcpy(p->data, &tmp[12], p->len); -cp -} +int do_prune = 0; -/* - reassemble MAC addresses -*/ -void add_mac_addresses(vpn_packet_t *p) +/* VPN packet I/O */ + +void receive_udppacket(node_t *n, vpn_packet_t *inpkt) { - unsigned char tmp[MAXSIZE]; + vpn_packet_t outpkt; + int outlen, outpad; + EVP_CIPHER_CTX ctx; cp - memcpy(&tmp[12], p->data, p->len); - p->len += 12; - tmp[0] = tmp[6] = 0xfe; - tmp[1] = tmp[7] = 0xfd; - *((ip_t*)(&tmp[2])) = (ip_t)(htonl(myself->vpn_ip)); - *((ip_t*)(&tmp[8])) = *((ip_t*)(&tmp[26])); - memcpy(p->data, &tmp[0], p->len); + /* Decrypt the packet */ + + EVP_DecryptInit(&ctx, myself->cipher, myself->key, myself->key + myself->cipher->key_len); + EVP_DecryptUpdate(&ctx, outpkt.salt, &outlen, inpkt->salt, inpkt->len); + EVP_DecryptFinal(&ctx, outpkt.salt + outlen, &outpad); + outlen += outpad; + outpkt.len = outlen - sizeof(outpkt.salt); + + receive_packet(n, &outpkt); cp } -int xsend(conn_list_t *cl, void *packet) +void receive_tcppacket(connection_t *c, char *buffer, int len) { - int r; - real_packet_t rp; + vpn_packet_t outpkt; cp - do_encrypt((vpn_packet_t*)packet, &rp, cl->key); - rp.from = htonl(myself->vpn_ip); - rp.data.len = htons(rp.data.len); - rp.len = htons(rp.len); + outpkt.len = len; + memcpy(outpkt.data, buffer, len); - if(debug_lvl > 3) - syslog(LOG_ERR, "Sent %d bytes to %lx", ntohs(rp.len), cl->vpn_ip); - - if((r = send(cl->socket, (char*)&rp, ntohs(rp.len), 0)) < 0) - { - syslog(LOG_ERR, "Error sending data: %m"); - return -1; - } - - total_socket_out += r; + receive_packet(c->node, &outpkt); cp - return 0; } -int xrecv(conn_list_t *cl, void *packet) +void receive_packet(node_t *n, vpn_packet_t *packet) { - vpn_packet_t vp; - int lenin; cp - do_decrypt((real_packet_t*)packet, &vp, cl->key); - add_mac_addresses(&vp); + if(debug_lvl >= DEBUG_TRAFFIC) + syslog(LOG_DEBUG, _("Received packet of %d bytes from %s (%s)"), packet->len, n->name, n->hostname); - if((lenin = write(tap_fd, &vp, vp.len + sizeof(vp.len))) < 0) - syslog(LOG_ERR, "Can't write to tap device: %m"); - else - total_tap_out += lenin; + route_incoming(n, packet); cp - return 0; } -/* - add the given packet of size s to the - queue q, be it the send or receive queue -*/ -void add_queue(packet_queue_t **q, void *packet, size_t s) +void send_udppacket(node_t *n, vpn_packet_t *inpkt) { - queue_element_t *e; + vpn_packet_t outpkt; + int outlen, outpad; + EVP_CIPHER_CTX ctx; + struct sockaddr_in to; + socklen_t tolen = sizeof(to); + vpn_packet_t *copy; cp - if(debug_lvl > 3) - syslog(LOG_DEBUG, "packet to queue: %d", s); - - e = xmalloc(sizeof(*e)); - e->packet = xmalloc(s); - memcpy(e->packet, packet, s); - - if(!*q) + if(!n->status.validkey) { - *q = xmalloc(sizeof(**q)); - (*q)->head = (*q)->tail = NULL; - } + if(debug_lvl >= DEBUG_TRAFFIC) + syslog(LOG_INFO, _("No valid key known yet for %s (%s), queueing packet"), + n->name, n->hostname); - e->next = NULL; /* We insert at the tail */ + /* Since packet is on the stack of handle_tap_input(), + we have to make a copy of it first. */ - if((*q)->tail) /* Do we have a tail? */ - { - (*q)->tail->next = e; - e->prev = (*q)->tail; - } - else /* No tail -> no head too */ - { - (*q)->head = e; - e->prev = NULL; - } + copy = xmalloc(sizeof(vpn_packet_t)); + memcpy(copy, inpkt, sizeof(vpn_packet_t)); - (*q)->tail = e; -cp -} + list_insert_tail(n->queue, copy); -/* Remove a queue element */ -void del_queue(packet_queue_t **q, queue_element_t *e) -{ -cp - free(e->packet); - - if(e->next) /* There is a successor, so we are not tail */ - { - if(e->prev) /* There is a predecessor, so we are not head */ - { - e->next->prev = e->prev; - e->prev->next = e->next; - } - else /* We are head */ - { - e->next->prev = NULL; - (*q)->head = e->next; - } - } - else /* We are tail (or all alone!) */ - { - if(e->prev) /* We are not alone :) */ - { - e->prev->next = NULL; - (*q)->tail = e->prev; - } - else /* Adieu */ - { - free(*q); - *q = NULL; - } + if(!n->status.waitingforkey) + send_req_key(n->nexthop->connection, myself, n); + return; } - - free(e); -cp -} -/* - flush a queue by calling function for - each packet, and removing it when that - returned a zero exit code -*/ -void flush_queue(conn_list_t *cl, packet_queue_t **pq, - int (*function)(conn_list_t*,void*)) -{ - queue_element_t *p, *next = NULL; -cp - for(p = (*pq)->head; p != NULL; ) - { - next = p->next; + /* Encrypt the packet. */ - if(!function(cl, p->packet)) - del_queue(pq, p); - - p = next; - } + RAND_pseudo_bytes(inpkt->salt, sizeof(inpkt->salt)); - if(debug_lvl > 3) - syslog(LOG_DEBUG, "queue flushed"); -cp -} + EVP_EncryptInit(&ctx, n->cipher, n->key, n->key + n->cipher->key_len); + EVP_EncryptUpdate(&ctx, outpkt.salt, &outlen, inpkt->salt, inpkt->len + sizeof(inpkt->salt)); + EVP_EncryptFinal(&ctx, outpkt.salt + outlen, &outpad); + outlen += outpad; -/* - flush the send&recv queues - void because nothing goes wrong here, packets - remain in the queue if something goes wrong -*/ -void flush_queues(conn_list_t *cl) -{ -cp - if(cl->sq) - { - if(debug_lvl > 1) - syslog(LOG_DEBUG, "Flushing send queue for " IP_ADDR_S, - IP_ADDR_V(cl->vpn_ip)); - flush_queue(cl, &(cl->sq), xsend); - } + to.sin_family = AF_INET; + to.sin_addr.s_addr = htonl(n->address); + to.sin_port = htons(n->port); - if(cl->rq) + if((sendto(udp_socket, (char *) outpkt.salt, outlen, 0, (const struct sockaddr *)&to, tolen)) < 0) { - if(debug_lvl > 1) - syslog(LOG_DEBUG, "Flushing receive queue for " IP_ADDR_S, - IP_ADDR_V(cl->vpn_ip)); - flush_queue(cl, &(cl->rq), xrecv); + syslog(LOG_ERR, _("Error sending packet to %s (%s): %m"), + n->name, n->hostname); + return; } cp } @@ -256,132 +177,151 @@ cp /* send a packet to the given vpn ip. */ -int send_packet(ip_t to, vpn_packet_t *packet) +void send_packet(node_t *n, vpn_packet_t *packet) { - conn_list_t *cl; cp - if((cl = lookup_conn(to)) == NULL) + if(debug_lvl >= DEBUG_TRAFFIC) + syslog(LOG_ERR, _("Sending packet of %d bytes to %s (%s)"), + packet->len, n->name, n->hostname); + + if(n == myself) { - if(debug_lvl > 2) + if(debug_lvl >= DEBUG_TRAFFIC) { - syslog(LOG_NOTICE, "trying to look up " IP_ADDR_S " in connection list failed.", - IP_ADDR_V(to)); + syslog(LOG_NOTICE, _("Packet is looping back to us!")); } - for(cl = conn_list; cl != NULL && !cl->status.outgoing; cl = cl->next); - if(!cl) - { /* No open outgoing connection has been found. */ - if(debug_lvl > 2) - syslog(LOG_NOTICE, "There is no remote host I can send this packet to."); - return -1; - } - } - if(my_key_expiry <= time(NULL)) - regenerate_keys(); + return; + } - if(!cl->status.dataopen) - if(setup_vpn_connection(cl) < 0) - return -1; + if(n->via != n && debug_lvl >= DEBUG_TRAFFIC) + syslog(LOG_ERR, _("Sending packet to %s via %s (%s)"), + n->name, n->via->name, n->via->hostname); - if(!cl->status.validkey) + if((myself->options | n->via->options) & OPTION_TCPONLY) { - add_queue(&(cl->sq), packet, packet->len + 2); - if(!cl->status.waitingforkey) - send_key_request(cl->vpn_ip); /* Keys should be sent to the host running the tincd */ - return 0; + if(send_tcppacket(n->via->connection, packet)) + terminate_connection(n->via->connection, 1); } + else + send_udppacket(n->via, packet); +} + +/* Broadcast a packet to all active direct connections */ + +void broadcast_packet(node_t *from, vpn_packet_t *packet) +{ + avl_node_t *node; + connection_t *c; +cp + if(debug_lvl >= DEBUG_TRAFFIC) + syslog(LOG_INFO, _("Broadcasting packet of %d bytes from %s (%s)"), + packet->len, from->name, from->hostname); - if(!cl->status.active) + for(node = connection_tree->head; node; node = node->next) { - add_queue(&(cl->sq), packet, packet->len + 2); - if(debug_lvl > 1) - syslog(LOG_INFO, IP_ADDR_S " is not ready, queueing packet.", IP_ADDR_V(cl->vpn_ip)); - return 0; /* We don't want to mess up, do we? */ + c = (connection_t *)node->data; + if(c->status.active && c != from->nexthop->connection) + send_packet(c->node, packet); } - - /* can we send it? can we? can we? huh? */ cp - return xsend(cl, packet); } -/* - open the local ethertap device -*/ -int setup_tap_fd(void) +void flush_queue(node_t *n) { - int nfd; - const char *tapfname; - config_t const *cfg; -cp - if((cfg = get_config_val(tapdevice)) == NULL) - tapfname = "/dev/tap0"; - else - tapfname = cfg->data.ptr; + list_node_t *node, *next; +cp + if(debug_lvl >= DEBUG_TRAFFIC) + syslog(LOG_INFO, _("Flushing queue for %s (%s)"), n->name, n->hostname); - if((nfd = open(tapfname, O_RDWR | O_NONBLOCK)) < 0) + for(node = n->queue->head; node; node = next) { - syslog(LOG_ERR, "Could not open %s: %m", tapfname); - return -1; + next = node->next; + send_udppacket(n, (vpn_packet_t *)node->data); + list_delete_node(n->queue, node); } - - tap_fd = nfd; cp - return 0; } -/* - set up the socket that we listen on for incoming - (tcp) connections -*/ -int setup_listen_meta_socket(int port) +/* Setup sockets */ + +int setup_listen_socket(int port) { int nfd, flags; struct sockaddr_in a; - const int one = 1; + int option; + char *interface; + char *address; + ip_mask_t *ipmask; cp if((nfd = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP)) < 0) { - syslog(LOG_ERR, "Creating metasocket failed: %m"); - return -1; - } - - if(setsockopt(nfd, SOL_SOCKET, SO_REUSEADDR, &one, sizeof(one))) - { - syslog(LOG_ERR, "setsockopt: %m"); + syslog(LOG_ERR, _("Creating metasocket failed: %m")); return -1; } flags = fcntl(nfd, F_GETFL); if(fcntl(nfd, F_SETFL, flags | O_NONBLOCK) < 0) { - syslog(LOG_ERR, "fcntl: %m"); + close(nfd); + syslog(LOG_ERR, _("System call `%s' failed: %m"), + "fcntl"); return -1; } + /* Optimize TCP settings */ + + option = 1; + setsockopt(nfd, SOL_SOCKET, SO_REUSEADDR, &option, sizeof(option)); + setsockopt(nfd, SOL_SOCKET, SO_KEEPALIVE, &option, sizeof(option)); +#ifdef HAVE_LINUX + setsockopt(nfd, SOL_TCP, TCP_NODELAY, &option, sizeof(option)); + + option = IPTOS_LOWDELAY; + setsockopt(nfd, SOL_IP, IP_TOS, &option, sizeof(option)); + + if(get_config_string(lookup_config(config_tree, "BindToInterface"), &interface)) + if(setsockopt(nfd, SOL_SOCKET, SO_BINDTODEVICE, interface, strlen(interface))) + { + close(nfd); + syslog(LOG_ERR, _("Can't bind to interface %s: %m"), interface); + return -1; + } +#endif + memset(&a, 0, sizeof(a)); a.sin_family = AF_INET; - a.sin_port = htons(port); a.sin_addr.s_addr = htonl(INADDR_ANY); + a.sin_port = htons(port); + + if(get_config_string(lookup_config(config_tree, "BindToAddress"), &address)) + { + ipmask = strtoip(address); + if(ipmask) + { + a.sin_addr.s_addr = htonl(ipmask->address); + free(ipmask); + } + } if(bind(nfd, (struct sockaddr *)&a, sizeof(struct sockaddr))) { - syslog(LOG_ERR, "Can't bind to port %hd/tcp: %m", port); + close(nfd); + syslog(LOG_ERR, _("Can't bind to port %hd/tcp: %m"), port); return -1; } if(listen(nfd, 3)) { - syslog(LOG_ERR, "listen: %m"); + close(nfd); + syslog(LOG_ERR, _("System call `%s' failed: %m"), + "listen"); return -1; } cp return nfd; } -/* - setup the socket for incoming encrypted - data (the udp part) -*/ int setup_vpn_in_socket(int port) { int nfd, flags; @@ -390,20 +330,19 @@ int setup_vpn_in_socket(int port) cp if((nfd = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP)) < 0) { - syslog(LOG_ERR, "Creating socket failed: %m"); + close(nfd); + syslog(LOG_ERR, _("Creating socket failed: %m")); return -1; } - if(setsockopt(nfd, SOL_SOCKET, SO_REUSEADDR, &one, sizeof(one))) - { - syslog(LOG_ERR, "setsockopt: %m"); - return -1; - } + setsockopt(nfd, SOL_SOCKET, SO_REUSEADDR, &one, sizeof(one)); flags = fcntl(nfd, F_GETFL); if(fcntl(nfd, F_SETFL, flags | O_NONBLOCK) < 0) { - syslog(LOG_ERR, "fcntl: %m"); + close(nfd); + syslog(LOG_ERR, _("System call `%s' failed: %m"), + "fcntl"); return -1; } @@ -414,294 +353,517 @@ cp if(bind(nfd, (struct sockaddr *)&a, sizeof(struct sockaddr))) { - syslog(LOG_ERR, "Can't bind to port %hd/udp: %m", port); + close(nfd); + syslog(LOG_ERR, _("Can't bind to port %hd/udp: %m"), port); return -1; } cp return nfd; } -/* - setup an outgoing meta (tcp) socket -*/ -int setup_outgoing_meta_socket(conn_list_t *cl) +int setup_outgoing_socket(connection_t *c) { int flags; struct sockaddr_in a; - config_t const *cfg; cp - if((cfg = get_config_val(upstreamport)) == NULL) - cl->port = 655; - else - cl->port = cfg->data.val; + if(debug_lvl >= DEBUG_CONNECTIONS) + syslog(LOG_INFO, _("Trying to connect to %s (%s)"), c->name, c->hostname); + + c->socket = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); - cl->meta_socket = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); - if(cl->meta_socket == -1) + if(c->socket == -1) { - syslog(LOG_ERR, "Creating socket failed: %m"); + syslog(LOG_ERR, _("Creating socket for %s port %d failed: %m"), + c->hostname, c->port); return -1; } + /* Bind first to get a fix on our source port??? + a.sin_family = AF_INET; - a.sin_port = htons(cl->port); - a.sin_addr.s_addr = htonl(cl->real_ip); + a.sin_port = htons(0); + a.sin_addr.s_addr = htonl(INADDR_ANY); - if(connect(cl->meta_socket, (struct sockaddr *)&a, sizeof(a)) == -1) + if(bind(c->socket, (struct sockaddr *)&a, sizeof(struct sockaddr))) { - syslog(LOG_ERR, IP_ADDR_S ":%d: %m", IP_ADDR_V(cl->real_ip), cl->port); + close(c->socket); + syslog(LOG_ERR, _("System call `%s' failed: %m"), "bind"); return -1; } - flags = fcntl(cl->meta_socket, F_GETFL); - if(fcntl(cl->meta_socket, F_SETFL, flags | O_NONBLOCK) < 0) + */ + + /* Optimize TCP settings? + + option = 1; + setsockopt(c->socket, SOL_SOCKET, SO_KEEPALIVE, &option, sizeof(option)); +#ifdef HAVE_LINUX + setsockopt(c->socket, SOL_TCP, TCP_NODELAY, &option, sizeof(option)); + + option = IPTOS_LOWDELAY; + setsockopt(c->socket, SOL_IP, IP_TOS, &option, sizeof(option)); +#endif + + */ + + /* Connect */ + + a.sin_family = AF_INET; + a.sin_port = htons(c->port); + a.sin_addr.s_addr = htonl(c->address); + + if(connect(c->socket, (struct sockaddr *)&a, sizeof(a)) == -1) { - syslog(LOG_ERR, "fcntl: %m"); + close(c->socket); + syslog(LOG_ERR, _("%s port %hd: %m"), c->hostname, c->port); return -1; } - cl->hostname = hostlookup(htonl(cl->real_ip)); + flags = fcntl(c->socket, F_GETFL); + + if(fcntl(c->socket, F_SETFL, flags | O_NONBLOCK) < 0) + { + close(c->socket); + syslog(LOG_ERR, _("fcntl for %s port %d: %m"), + c->hostname, c->port); + return -1; + } - syslog(LOG_INFO, "Connected to %s:%hd" , cl->hostname, cl->port); + if(debug_lvl >= DEBUG_CONNECTIONS) + syslog(LOG_INFO, _("Connected to %s port %hd"), + c->hostname, c->port); cp return 0; } -/* - setup an outgoing connection. It's not - necessary to also open an udp socket as - well, because the other host will initiate - an authentication sequence during which - we will do just that. -*/ -int setup_outgoing_connection(ip_t ip) +int setup_outgoing_connection(char *name) { - conn_list_t *ncn; + connection_t *c; + node_t *n; + struct hostent *h; cp - ncn = new_conn_list(); - ncn->real_ip = ip; + n = lookup_node(name); + + if(n) + if(n->connection) + { + if(debug_lvl >= DEBUG_CONNECTIONS) + syslog(LOG_INFO, _("Already connected to %s"), name); + return 0; + } - if(setup_outgoing_meta_socket(ncn) < 0) + c = new_connection(); + c->name = xstrdup(name); + + init_configuration(&c->config_tree); + read_connection_config(c); + + if(!get_config_string(lookup_config(c->config_tree, "Address"), &c->hostname)) + { + syslog(LOG_ERR, _("No address specified for %s"), c->name); + free_connection(c); + return -1; + } + + if(!get_config_port(lookup_config(c->config_tree, "Port"), &c->port)) + { + syslog(LOG_ERR, _("No port specified for %s"), c->name); + free_connection(c); + return -1; + } + + if(!(h = gethostbyname(c->hostname))) + { + syslog(LOG_ERR, _("Error looking up `%s': %m"), c->hostname); + free_connection(c); + return -1; + } + + c->address = ntohl(*((ipv4_t*)(h->h_addr_list[0]))); + c->hostname = hostlookup(htonl(c->address)); + + if(setup_outgoing_socket(c) < 0) { - syslog(LOG_ERR, "Could not set up a meta connection."); - free_conn_element(ncn); + syslog(LOG_ERR, _("Could not set up a meta connection to %s (%s)"), + c->name, c->hostname); + free_connection(c); return -1; } - ncn->status.meta = 1; - ncn->status.outgoing = 1; - ncn->next = conn_list; - conn_list = ncn; + c->status.outgoing = 1; + c->last_ping_time = time(NULL); + + connection_add(c); + + send_id(c); cp return 0; } -/* - set up the local sockets (listen only) -*/ -int setup_myself(void) +int read_rsa_public_key(connection_t *c) { - config_t const *cfg; + FILE *fp; + char *fname; + char *key; + void *result; cp - myself = new_conn_list(); + if(!c->rsa_key) + c->rsa_key = RSA_new(); + + /* First, check for simple PublicKey statement */ - if(!(cfg = get_config_val(myvpnip))) + if(get_config_string(lookup_config(c->config_tree, "PublicKey"), &key)) { - syslog(LOG_ERR, "No value for my VPN IP given"); - return -1; + BN_hex2bn(&c->rsa_key->n, key); + BN_hex2bn(&c->rsa_key->e, "FFFF"); + return 0; } - myself->vpn_ip = cfg->data.ip->ip; - myself->vpn_mask = cfg->data.ip->mask; + /* Else, check for PublicKeyFile statement and read it */ - if(!(cfg = get_config_val(listenport))) - myself->port = 655; - else - myself->port = cfg->data.val; + if(get_config_string(lookup_config(c->config_tree, "PublicKeyFile"), &fname)) + { + if(is_safe_path(fname)) + { + if((fp = fopen(fname, "r")) == NULL) + { + syslog(LOG_ERR, _("Error reading RSA public key file `%s': %m"), + fname); + return -1; + } + result = PEM_read_RSAPublicKey(fp, &c->rsa_key, NULL, NULL); + fclose(fp); + if(!result) + { + syslog(LOG_ERR, _("Reading RSA public key file `%s' failed: %m"), + fname); + return -1; + } + return 0; + } + else + return -1; + } + + /* Else, check if a harnessed public key is in the config file */ - if((myself->meta_socket = setup_listen_meta_socket(myself->port)) < 0) + result = NULL; + + asprintf(&fname, "%s/hosts/%s", confbase, c->name); + if((fp = fopen(fname, "r"))) { - syslog(LOG_ERR, "Unable to set up a listening socket"); - return -1; + result = PEM_read_RSAPublicKey(fp, &c->rsa_key, NULL, NULL); + fclose(fp); + free(fname); } - if((myself->socket = setup_vpn_in_socket(myself->port)) < 0) + free(fname); + + if(result) + return 0; + else { - syslog(LOG_ERR, "Unable to set up an incoming vpn data socket"); - close(myself->meta_socket); + syslog(LOG_ERR, _("No public key for %s specified!"), c->name); return -1; } +} - myself->status.active = 1; +int read_rsa_private_key(void) +{ + FILE *fp; + void *result; + char *fname, *key; +cp + if(!myself->connection->rsa_key) + myself->connection->rsa_key = RSA_new(); - syslog(LOG_NOTICE, "Ready: listening on port %d.", myself->port); + if(get_config_string(lookup_config(config_tree, "PrivateKey"), &key)) + { + BN_hex2bn(&myself->connection->rsa_key->d, key); + BN_hex2bn(&myself->connection->rsa_key->e, "FFFF"); + } + else if(get_config_string(lookup_config(config_tree, "PrivateKeyFile"), &fname)) + { + if((fp = fopen(fname, "r")) == NULL) + { + syslog(LOG_ERR, _("Error reading RSA private key file `%s': %m"), + fname); + return -1; + } + result = PEM_read_RSAPrivateKey(fp, &myself->connection->rsa_key, NULL, NULL); + fclose(fp); + if(!result) + { + syslog(LOG_ERR, _("Reading RSA private key file `%s' failed: %m"), + fname); + return -1; + } + } + else + { + syslog(LOG_ERR, _("No private key for tinc daemon specified!")); + return -1; + } cp return 0; } /* - setup all initial network connections + Configure node_t myself and set up the local sockets (listen only) */ -int setup_network_connections(void) +int setup_myself(void) { - config_t const *cfg; + config_t *cfg; + subnet_t *subnet; + char *name, *mode; + int choice; cp - if((cfg = get_config_val(pingtimeout)) == NULL) - timeout = 10; - else - timeout = cfg->data.val; + myself = new_node(); + myself->connection = new_connection(); + init_configuration(&myself->connection->config_tree); - if(setup_tap_fd() < 0) - return -1; + asprintf(&myself->hostname, _("MYSELF")); + asprintf(&myself->connection->hostname, _("MYSELF")); - if(setup_myself() < 0) + myself->connection->options = 0; + myself->connection->protocol_version = PROT_CURRENT; + + if(!get_config_string(lookup_config(config_tree, "Name"), &name)) /* Not acceptable */ + { + syslog(LOG_ERR, _("Name for tinc daemon required!")); + return -1; + } + + if(check_id(name)) + { + syslog(LOG_ERR, _("Invalid name for myself!")); + free(name); + return -1; + } + + myself->name = name; + myself->connection->name = xstrdup(name); + +cp + if(read_rsa_private_key()) return -1; - if((cfg = get_config_val(upstreamip)) == NULL) - /* No upstream IP given, we're listen only. */ - return 0; + if(read_connection_config(myself->connection)) + { + syslog(LOG_ERR, _("Cannot open host configuration file for myself!")); + return -1; + } - if(setup_outgoing_connection(cfg->data.ip->ip)) + if(read_rsa_public_key(myself->connection)) return -1; cp - return 0; -} -RETSIGTYPE -sigalrm_handler(int a) -{ - config_t const *cfg; - static int seconds_till_retry; +/* + if(RSA_check_key(rsa_key) != 1) + { + syslog(LOG_ERR, _("Invalid public/private keypair!")); + return -1; + } +*/ + if(!get_config_port(lookup_config(myself->connection->config_tree, "Port"), &myself->port)) + myself->port = 655; + + myself->connection->port = myself->port; + +/* Read in all the subnets specified in the host configuration file */ + + cfg = lookup_config(myself->connection->config_tree, "Subnet"); + + while(cfg) + { + if(!get_config_subnet(cfg, &subnet)) + return -1; + + subnet_add(myself, subnet); + + cfg = lookup_config_next(myself->connection->config_tree, cfg); + } + cp - cfg = get_config_val(upstreamip); + /* Check some options */ + + if(get_config_bool(lookup_config(config_tree, "IndirectData"), &choice)) + if(choice) + myself->options |= OPTION_INDIRECT; + + if(get_config_bool(lookup_config(config_tree, "TCPOnly"), &choice)) + if(choice) + myself->options |= OPTION_TCPONLY; + + if(get_config_bool(lookup_config(myself->connection->config_tree, "IndirectData"), &choice)) + if(choice) + myself->options |= OPTION_INDIRECT; + + if(get_config_bool(lookup_config(myself->connection->config_tree, "TCPOnly"), &choice)) + if(choice) + myself->options |= OPTION_TCPONLY; - if(!setup_outgoing_connection(cfg->data.ip->ip)) + if(myself->options & OPTION_TCPONLY) + myself->options |= OPTION_INDIRECT; + + if(get_config_string(lookup_config(config_tree, "Mode"), &mode)) { - signal(SIGALRM, SIG_IGN); - seconds_till_retry = 5; + if(!strcasecmp(mode, "router")) + routing_mode = RMODE_ROUTER; + else if (!strcasecmp(mode, "switch")) + routing_mode = RMODE_SWITCH; + else if (!strcasecmp(mode, "hub")) + routing_mode = RMODE_HUB; + else + { + syslog(LOG_ERR, _("Invalid routing mode!")); + return -1; + } } else + routing_mode = RMODE_ROUTER; + +cp + /* Open sockets */ + + if((tcp_socket = setup_listen_socket(myself->port)) < 0) { - signal(SIGALRM, sigalrm_handler); - seconds_till_retry += 5; - alarm(seconds_till_retry); - syslog(LOG_ERR, "Still failed to connect to other. Will retry in %d seconds.", - seconds_till_retry); + syslog(LOG_ERR, _("Unable to set up a listening TCP socket!")); + return -1; } + + if((udp_socket = setup_vpn_in_socket(myself->port)) < 0) + { + syslog(LOG_ERR, _("Unable to set up a listening UDP socket!")); + return -1; + } +cp + /* Generate packet encryption key */ + + myself->cipher = EVP_bf_cbc(); + + myself->keylength = myself->cipher->key_len + myself->cipher->iv_len; + + myself->key = (char *)xmalloc(myself->keylength); + RAND_pseudo_bytes(myself->key, myself->keylength); + + if(!get_config_int(lookup_config(config_tree, "KeyExpire"), &keylifetime)) + keylifetime = 3600; + + keyexpires = time(NULL) + keylifetime; cp + /* Done */ + + myself->nexthop = myself; + myself->via = myself; + myself->status.active = 1; + node_add(myself); + + syslog(LOG_NOTICE, _("Ready: listening on port %hd"), myself->port); +cp + return 0; } /* - close all open network connections + setup all initial network connections */ -void close_network_connections(void) +int setup_network_connections(void) { - conn_list_t *p; cp - for(p = conn_list; p != NULL; p = p->next) + init_connections(); + init_subnets(); + init_nodes(); + init_edges(); + + if(get_config_int(lookup_config(config_tree, "PingTimeout"), &timeout)) { - if(p->status.dataopen) - { - shutdown(p->socket, 0); /* No more receptions */ - close(p->socket); - } - if(p->status.meta) - { - send_termreq(p); - shutdown(p->meta_socket, 0); /* No more receptions */ - close(p->meta_socket); + if(timeout < 1) + { + timeout = 86400; } } + else + timeout = 60; - if(myself) - if(myself->status.active) - { - close(myself->meta_socket); - close(myself->socket); - } + if(setup_device() < 0) + return -1; - close(tap_fd); - destroy_conn_list(); + /* Run tinc-up script to further initialize the tap interface */ + execute_script("tinc-up"); - syslog(LOG_NOTICE, "Terminating."); + if(setup_myself() < 0) + return -1; + + signal(SIGALRM, try_outgoing_connections); + alarm(5); cp - return; + return 0; } /* - create a data (udp) socket + close all open network connections */ -int setup_vpn_connection(conn_list_t *cl) +void close_network_connections(void) { - int nfd, flags; - struct sockaddr_in a; + avl_node_t *node, *next; + connection_t *c; cp - if(debug_lvl > 1) - syslog(LOG_DEBUG, "Opening UDP socket to " IP_ADDR_S, IP_ADDR_V(cl->real_ip)); - - nfd = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP); - if(nfd == -1) + for(node = connection_tree->head; node; node = next) { - syslog(LOG_ERR, "Creating data socket failed: %m"); - return -1; + next = node->next; + c = (connection_t *)node->data; + c->status.outgoing = 0; + terminate_connection(c, 0); } - a.sin_family = AF_INET; - a.sin_port = htons(cl->port); - a.sin_addr.s_addr = htonl(cl->real_ip); + terminate_connection(myself->connection, 0); - if(connect(nfd, (struct sockaddr *)&a, sizeof(a)) == -1) - { - syslog(LOG_ERR, "Create connection to %08lx:%d failed: %m", ntohs(cl->real_ip), - cl->port); - return -1; - } +// destroy_trees(); + exit_edges(); + exit_subnets(); + exit_nodes(); + exit_connections(); - flags = fcntl(nfd, F_GETFL); - if(fcntl(nfd, F_SETFL, flags | O_NONBLOCK) < 0) - { - syslog(LOG_ERR, "This is a bug: %s:%d: %d:%m", __FILE__, __LINE__, nfd); - return -1; - } + execute_script("tinc-down"); - cl->socket = nfd; - cl->status.dataopen = 1; + close_device(); cp - return 0; + return; } /* handle an incoming tcp connect call and open a connection to it. */ -conn_list_t *create_new_connection(int sfd) +connection_t *create_new_connection(int sfd) { - conn_list_t *p; + connection_t *c; struct sockaddr_in ci; int len = sizeof(ci); cp - p = new_conn_list(); + c = new_connection(); - if(getpeername(sfd, &ci, &len) < 0) + if(getpeername(sfd, (struct sockaddr *) &ci, (socklen_t *) &len) < 0) { - syslog(LOG_ERR, "Error: getpeername: %m"); + syslog(LOG_ERR, _("System call `%s' failed: %m"), + "getpeername"); + close(sfd); return NULL; } - p->hostname = hostlookup(ci.sin_addr.s_addr); - p->real_ip = ntohl(ci.sin_addr.s_addr); - p->meta_socket = sfd; - p->status.meta = 1; - p->buflen = 0; - - syslog(LOG_NOTICE, "Connection from %s:%d", p->hostname, htons(ci.sin_port)); + c->address = ntohl(ci.sin_addr.s_addr); + c->hostname = hostlookup(ci.sin_addr.s_addr); + c->port = htons(ci.sin_port); /* This one will be overwritten later */ + c->socket = sfd; + c->last_ping_time = time(NULL); - if(send_basic_info(p) < 0) - { - free(p); - return NULL; - } + if(debug_lvl >= DEBUG_CONNECTIONS) + syslog(LOG_NOTICE, _("Connection from %s port %d"), + c->hostname, htons(ci.sin_port)); + + c->allow_request = ID; cp - return p; + return c; } /* @@ -709,21 +871,20 @@ cp */ void build_fdset(fd_set *fs) { - conn_list_t *p; + avl_node_t *node; + connection_t *c; cp FD_ZERO(fs); - for(p = conn_list; p != NULL; p = p->next) + for(node = connection_tree->head; node; node = node->next) { - if(p->status.meta) - FD_SET(p->meta_socket, fs); - if(p->status.dataopen) - FD_SET(p->socket, fs); + c = (connection_t *)node->data; + FD_SET(c->socket, fs); } - FD_SET(myself->meta_socket, fs); - FD_SET(myself->socket, fs); - FD_SET(tap_fd, fs); + FD_SET(tcp_socket, fs); + FD_SET(udp_socket, fs); + FD_SET(device_fd, fs); cp } @@ -732,265 +893,250 @@ cp udp socket and write it to the ethertap device after being decrypted */ -int handle_incoming_vpn_data(conn_list_t *cl) +void handle_incoming_vpn_data(void) { - real_packet_t rp; - int lenin; + vpn_packet_t pkt; int x, l = sizeof(x); - conn_list_t *f; + struct sockaddr_in from; + socklen_t fromlen = sizeof(from); + node_t *n; cp - if(getsockopt(cl->socket, SOL_SOCKET, SO_ERROR, &x, &l) < 0) + if(getsockopt(udp_socket, SOL_SOCKET, SO_ERROR, &x, &l) < 0) { - syslog(LOG_ERR, "This is a bug: %s:%d: %d:%m", __FILE__, __LINE__, cl->socket); - return -1; + syslog(LOG_ERR, _("This is a bug: %s:%d: %d:%m"), + __FILE__, __LINE__, udp_socket); + return; } if(x) { - syslog(LOG_ERR, "Incoming data socket error: %s", sys_errlist[x]); - return -1; + syslog(LOG_ERR, _("Incoming data socket error: %s"), strerror(x)); + return; } - rp.len = -1; - lenin = recvfrom(cl->socket, &rp, MTU, 0, NULL, NULL); - if(lenin <= 0) + if((pkt.len = recvfrom(udp_socket, (char *) pkt.salt, MTU, 0, (struct sockaddr *)&from, &fromlen)) <= 0) { - syslog(LOG_ERR, "Receiving data failed: %m"); - return -1; + syslog(LOG_ERR, _("Receiving packet failed: %m")); + return; } - total_socket_in += lenin; - rp.data.len = ntohs(rp.data.len); - rp.len = ntohs(rp.len); - rp.from = ntohl(rp.from); + n = lookup_node_udp(ntohl(from.sin_addr.s_addr), ntohs(from.sin_port)); - if(rp.len >= 0) + if(!n) { - f = lookup_conn(rp.from); - if(debug_lvl > 3) - syslog(LOG_DEBUG, "packet from " IP_ADDR_S " (len %d)", - IP_ADDR_V(rp.from), rp.len); - if(!f) - { - syslog(LOG_ERR, "Got packet from unknown source " IP_ADDR_S, - IP_ADDR_V(rp.from)); - return -1; - } - - if(f->status.validkey) - xrecv(f, &rp); - else - { - add_queue(&(f->rq), &rp, rp.len); - if(!cl->status.waitingforkey) - send_key_request(rp.from); - } - - if(my_key_expiry <= time(NULL)) - regenerate_keys(); + syslog(LOG_WARNING, _("Received UDP packet on port %hd from unknown source %x:%hd"), myself->port, ntohl(from.sin_addr.s_addr), ntohs(from.sin_port)); + return; } +/* + if(n->connection) + n->connection->last_ping_time = time(NULL); +*/ + receive_udppacket(n, &pkt); cp - return 0; } /* - terminate a connection and notify the other - end before closing the sockets + Terminate a connection: + - Close the socket + - Remove associated edge and tell other connections about it if report = 1 + - Check if we need to retry making an outgoing connection + - Deactivate the host */ -void terminate_connection(conn_list_t *cl) +void terminate_connection(connection_t *c, int report) { + avl_node_t *node; + connection_t *other; cp - if(cl->status.remove) + if(c->status.remove) return; + + if(debug_lvl >= DEBUG_CONNECTIONS) + syslog(LOG_NOTICE, _("Closing connection with %s (%s)"), + c->name, c->hostname); - if(debug_lvl > 0) - syslog(LOG_NOTICE, "Closing connection with %s.", cl->hostname); - - if(cl->status.timeout) - send_timeout(cl); - else if(!cl->status.termreq) - send_termreq(cl); - - close(cl->socket); - if(cl->status.meta) - close(cl->meta_socket); + c->status.remove = 1; + + if(c->socket) + close(c->socket); - if(cl->status.outgoing) + if(c->edge) { - alarm(5); - signal(SIGALRM, sigalrm_handler); - syslog(LOG_NOTICE, "Try to re-establish outgoing connection in 5 seconds."); + if(report) + { + for(node = connection_tree->head; node; node = node->next) + { + other = (connection_t *)node->data; + if(other->status.active && other != c) + send_del_edge(other, c->edge); + } + } + + edge_del(c->edge); } - - cl->status.remove = 1; -cp -} -/* - send out a ping request to all active - connections -*/ -int send_broadcast_ping(void) -{ - conn_list_t *p; -cp - for(p = conn_list; p != NULL; p = p->next) + /* Check if this was our outgoing connection */ + + if(c->status.outgoing) { - if(p->status.remove) - continue; - if(p->status.active && p->status.meta) - { - if(send_ping(p)) - terminate_connection(p); - else - { - p->status.pinged = 1; - p->status.got_pong = 0; - } - } + c->status.outgoing = 0; + signal(SIGALRM, try_outgoing_connections); + alarm(seconds_till_retry); + syslog(LOG_NOTICE, _("Trying to re-establish outgoing connection in %d seconds"), seconds_till_retry); } - last_ping_time = time(NULL); + /* Deactivate */ + + c->status.active = 0; + if(c->node) + c->node->connection = NULL; + do_prune = 1; cp - return 0; } /* - end all connections that did not respond - to the ping probe in time + Check if the other end is active. + If we have sent packets, but didn't receive any, + then possibly the other end is dead. We send a + PING request over the meta connection. If the other + end does not reply in time, we consider them dead + and close the connection. */ -int check_dead_connections(void) +void check_dead_connections(void) { - conn_list_t *p; + time_t now; + avl_node_t *node, *next; + connection_t *c; cp - for(p = conn_list; p != NULL; p = p->next) + now = time(NULL); + + for(node = connection_tree->head; node; node = next) { - if(p->status.remove) - continue; - if(p->status.active && p->status.meta && p->status.pinged && !p->status.got_pong) - { - syslog(LOG_INFO, "%s (" IP_ADDR_S ") didn't respond to ping", - p->hostname, IP_ADDR_V(p->vpn_ip)); - p->status.timeout = 1; - terminate_connection(p); - } + next = node->next; + c = (connection_t *)node->data; + if(c->last_ping_time + timeout < now) + { + if(c->status.active) + { + if(c->status.pinged) + { + if(debug_lvl >= DEBUG_PROTOCOL) + syslog(LOG_INFO, _("%s (%s) didn't respond to PING"), + c->name, c->hostname); + c->status.timeout = 1; + terminate_connection(c, 1); + } + else + { + send_ping(c); + } + } + else + { + if(debug_lvl >= DEBUG_CONNECTIONS) + syslog(LOG_WARNING, _("Timeout from %s (%s) during authentication"), + c->name, c->hostname); + terminate_connection(c, 0); + } + } } cp - return 0; } /* accept a new tcp connect and create a new connection */ -int handle_new_meta_connection(conn_list_t *cl) +int handle_new_meta_connection() { - conn_list_t *ncn; + connection_t *new; struct sockaddr client; - int nfd, len = sizeof(client); + int fd, len = sizeof(client); cp - if((nfd = accept(cl->meta_socket, &client, &len)) < 0) + if((fd = accept(tcp_socket, &client, &len)) < 0) { - syslog(LOG_ERR, "Accepting a new connection failed: %m"); + syslog(LOG_ERR, _("Accepting a new connection failed: %m")); return -1; } - if((ncn = create_new_connection(nfd)) == NULL) + if(!(new = create_new_connection(fd))) { - shutdown(nfd, 2); - close(nfd); - syslog(LOG_NOTICE, "Closed attempted connection."); + shutdown(fd, 2); + close(fd); + syslog(LOG_NOTICE, _("Closed attempted connection")); return 0; } - ncn->status.meta = 1; - ncn->next = conn_list; - conn_list = ncn; + connection_add(new); + + send_id(new); cp return 0; } -/* - dispatch any incoming meta requests -*/ -int handle_incoming_meta_data(conn_list_t *cl) +void randomized_alarm(int seconds) { - int x, l = sizeof(x); - int request, oldlen, i; - int lenin = 0; -cp - if(getsockopt(cl->meta_socket, SOL_SOCKET, SO_ERROR, &x, &l) < 0) - { - syslog(LOG_ERR, "This is a bug: %s:%d: %d:%m", __FILE__, __LINE__, cl->meta_socket); - return -1; - } - if(x) - { - syslog(LOG_ERR, "Metadata socket error: %s", sys_errlist[x]); - return -1; - } - - if(cl->buflen >= MAXBUFSIZE) - { - syslog(LOG_ERR, "Metadata read buffer full! Discarding contents."); - cl->buflen = 0; - } + unsigned char r; + RAND_pseudo_bytes(&r, 1); + alarm((seconds * (int)r) / 128 + 1); +} - lenin = read(cl->meta_socket, cl->buffer, MAXBUFSIZE-cl->buflen); +/* This function is severely fucked up. + We want to redesign it so the following rules apply: + + - Try all ConnectTo's in a row: + - if a connect() fails, try next one immediately, + - if it works, wait 5 seconds or so. + - If none of them were succesful, increase delay and retry. + - If all were succesful, don't try anymore. +*/ - if(lenin<=0) - { - syslog(LOG_ERR, "Metadata socket read error: %m"); - return -1; - } +RETSIGTYPE +try_outgoing_connections(int a) +{ + static config_t *cfg = NULL; + static int retry = 0; + char *name; +cp + if(!cfg) + cfg = lookup_config(config_tree, "ConnectTo"); - oldlen = cl->buflen; - cl->buflen += lenin; + if(!cfg) + return; - for(;;) + while(cfg) { - cl->reqlen = 0; + get_config_string(cfg, &name); + cfg = lookup_config_next(config_tree, cfg); /* Next time skip to next ConnectTo line */ - for(i = oldlen; i < cl->buflen; i++) + if(check_id(name)) { - if(cl->buffer[i] == '\n') - { - cl->buffer[i] = 0; /* replace end-of-line by end-of-string so we can use sscanf */ - cl->reqlen = i + 1; - break; - } + syslog(LOG_ERR, _("Invalid name for outgoing connection in %s line %d"), cfg->file, cfg->line); + continue; } - if(cl->reqlen) - { - if(sscanf(cl->buffer, "%d", &request) == 1) - { - if(request_handlers[request] == NULL) - { - syslog(LOG_ERR, "Unknown request: %s", cl->buffer); - return 0; - } + if(setup_outgoing_connection(name)) /* function returns 0 when there are no problems */ + retry = 1; - if(debug_lvl > 3) - syslog(LOG_DEBUG, "Got request: %s", cl->buffer); + } - request_handlers[request](cl); - } - else - { - syslog(LOG_ERR, "Bogus data received: %s", cl->buffer); - } + get_config_int(lookup_config(config_tree, "MaxTimeout"), &maxtimeout); - cl->buflen -= cl->reqlen; - memmove(cl->buffer, cl->buffer + cl->reqlen, cl->buflen); - oldlen = 0; - } - else - { - break; - } + if(retry) + { + seconds_till_retry += 5; + if(seconds_till_retry > maxtimeout) /* Don't wait more than MAXTIMEOUT seconds. */ + seconds_till_retry = maxtimeout; + + syslog(LOG_ERR, _("Failed to setup all outgoing connections, will retry in %d seconds"), + seconds_till_retry); + + /* Randomize timeout to avoid global synchronisation effects */ + randomized_alarm(seconds_till_retry); } -cp - return 0; + else + { + seconds_till_retry = 5; + } +cp } /* @@ -999,96 +1145,45 @@ cp */ void check_network_activity(fd_set *f) { - conn_list_t *p; - int x, l = sizeof(x); + connection_t *c; + avl_node_t *node; cp - for(p = conn_list; p != NULL; p = p->next) + if(FD_ISSET(udp_socket, f)) + handle_incoming_vpn_data(); + + for(node = connection_tree->head; node; node = node->next) { - if(p->status.remove) - continue; + c = (connection_t *)node->data; + + if(c->status.remove) + return; - if(p->status.dataopen) - if(FD_ISSET(p->socket, f)) + if(FD_ISSET(c->socket, f)) + if(receive_meta(c) < 0) { - /* - The only thing that can happen to get us here is apparently an - error on this outgoing(!) UDP socket that isn't immediate (i.e. - something that will not trigger an error directly on send()). - I've once got here when it said `No route to host'. - */ - getsockopt(p->socket, SOL_SOCKET, SO_ERROR, &x, &l); - syslog(LOG_ERR, "Outgoing data socket error: %s", sys_errlist[x]); - terminate_connection(p); + terminate_connection(c, c->status.active); return; - } - - if(p->status.meta) - if(FD_ISSET(p->meta_socket, f)) - if(handle_incoming_meta_data(p) < 0) - { - terminate_connection(p); - return; - } + } } - - if(FD_ISSET(myself->socket, f)) - handle_incoming_vpn_data(myself); - if(FD_ISSET(myself->meta_socket, f)) - handle_new_meta_connection(myself); + if(FD_ISSET(tcp_socket, f)) + handle_new_meta_connection(); cp } -/* - read, encrypt and send data that is - available through the ethertap device -*/ -void handle_tap_input(void) +void prune_connections(void) { - vpn_packet_t vp; - ip_t from, to; - int ether_type, lenin; -cp - memset(&vp, 0, sizeof(vp)); - if((lenin = read(tap_fd, &vp, MTU)) <= 0) + connection_t *c; + avl_node_t *node, *next; +cp + for(node = connection_tree->head; node; node = next) { - syslog(LOG_ERR, "Error while reading from tapdevice: %m"); - return; - } - - total_tap_in += lenin; + next = node->next; + c = (connection_t *)node->data; - ether_type = ntohs(*((unsigned short*)(&vp.data[12]))); - if(ether_type != 0x0800) - { - if(debug_lvl > 0) - syslog(LOG_INFO, "Non-IP ethernet frame %04x from " MAC_ADDR_S, - ether_type, MAC_ADDR_V(vp.data[6])); - return; + if(c->status.remove) + connection_del(c); } - - if(lenin < 32) - { - if(debug_lvl > 0) - syslog(LOG_INFO, "Dropping short packet"); - return; - } - - from = ntohl(*((unsigned long*)(&vp.data[26]))); - to = ntohl(*((unsigned long*)(&vp.data[30]))); - - if(debug_lvl > 3) - syslog(LOG_DEBUG, "An IP packet (%04x) for " IP_ADDR_S " from " IP_ADDR_S, - ether_type, IP_ADDR_V(to), IP_ADDR_V(from)); - if(debug_lvl > 4) - syslog(LOG_DEBUG, MAC_ADDR_S " to " MAC_ADDR_S, - MAC_ADDR_V(vp.data[0]), MAC_ADDR_V(vp.data[6])); - - vp.len = (length_t)lenin - 2; - - strip_mac_addresses(&vp); - - send_packet(to, &vp); cp } @@ -1100,38 +1195,90 @@ void main_loop(void) fd_set fset; struct timeval tv; int r; + time_t last_ping_check; + int t; + vpn_packet_t packet; cp - last_ping_time = time(NULL); + last_ping_check = time(NULL); for(;;) { tv.tv_sec = timeout; tv.tv_usec = 0; - prune_conn_list(); + if(do_prune) + { + prune_connections(); + do_prune = 0; + } + build_fdset(&fset); if((r = select(FD_SETSIZE, &fset, NULL, NULL, &tv)) < 0) { - if(errno == EINTR) /* because of alarm */ - continue; - syslog(LOG_ERR, "Error while waiting for input: %m"); - return; + if(errno != EINTR) /* because of alarm */ + { + syslog(LOG_ERR, _("Error while waiting for input: %m")); + return; + } } - if(r == 0 || last_ping_time + timeout < time(NULL)) - /* Timeout... hm... something might be wrong. */ + if(sighup) + { + syslog(LOG_INFO, _("Rereading configuration file and restarting in 5 seconds")); + sighup = 0; + close_network_connections(); + exit_configuration(&config_tree); + + if(read_server_config()) + { + syslog(LOG_ERR, _("Unable to reread configuration file, exiting")); + exit(1); + } + + sleep(5); + + if(setup_network_connections()) + return; + + continue; + } + + t = time(NULL); + + /* Let's check if everybody is still alive */ + + if(last_ping_check + timeout < t) { check_dead_connections(); - send_broadcast_ping(); - continue; + last_ping_check = time(NULL); + + /* Should we regenerate our key? */ + + if(keyexpires < t) + { + if(debug_lvl >= DEBUG_STATUS) + syslog(LOG_INFO, _("Regenerating symmetric key")); + + RAND_pseudo_bytes(myself->key, myself->keylength); + send_key_changed(myself->connection, myself); + keyexpires = time(NULL) + keylifetime; + } } - check_network_activity(&fset); + if(r > 0) + { + check_network_activity(&fset); - /* local tap data */ - if(FD_ISSET(tap_fd, &fset)) - handle_tap_input(); + /* local tap data */ + if(FD_ISSET(device_fd, &fset)) + { + if(read_packet(&packet)) + return; + else + route_outgoing(&packet); + } + } } cp }