X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnet.c;h=cdb593e10cf6239bcbfd9a8c2cbb151e0fff7787;hp=ec28d6a9f967e0d98400f3fc67e207d1386db312;hb=65247c063b36a76dd68156fe17b017c7460d982f;hpb=b50523dc44bbb32f03d24573e195c071cbff3fc4 diff --git a/src/net.c b/src/net.c index ec28d6a9..b0d3cd1e 100644 --- a/src/net.c +++ b/src/net.c @@ -1,6 +1,7 @@ /* net.c -- most of the network code - Copyright (C) 1998,99 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,227 +16,207 @@ 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.109 2001/05/28 08:21:43 guus Exp $ */ #include "config.h" -#include #include #include #include #include +#ifndef HAVE_FREEBSD + #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 + +#ifdef HAVE_OPENSSL_RAND_H +# include +#else +# include +#endif + +#ifdef HAVE_OPENSSL_EVP_H +# include +#else +# include +#endif + +#ifdef HAVE_OPENSSL_ERR_H +# include +#else +# include +#endif + +#ifdef HAVE_OPENSSL_PEM_H +# include +#else +# include +#endif + +#ifdef HAVE_TUNTAP +#include LINUX_IF_TUN_H +#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" -int tap_fd = -1; +#include "system.h" +int tap_fd = -1; +int taptype = TAP_TYPE_ETHERTAP; int total_tap_in = 0; int total_tap_out = 0; int total_socket_in = 0; int total_socket_out = 0; -time_t last_ping_time = 0; - -/* The global list of existing connections */ -conn_list_t *conn_list = NULL; -conn_list_t *myself = NULL; +config_t *upstreamcfg; +static int seconds_till_retry; -/* - strip off the MAC adresses of an ethernet frame -*/ -void strip_mac_addresses(vpn_packet_t *p) -{ - unsigned char tmp[MAXSIZE]; - - memcpy(tmp, p->data, p->len); - p->len -= 12; - memcpy(p->data, &tmp[12], p->len); -} +int keylifetime = 0; +int keyexpires = 0; -/* - reassemble MAC addresses -*/ -void add_mac_addresses(vpn_packet_t *p) -{ - unsigned char tmp[MAXSIZE]; - - 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); -} +char *unknown = NULL; -int xsend(conn_list_t *cl, void *packet) +void send_udppacket(connection_t *cl, vpn_packet_t *inpkt) { - int r; - real_packet_t rp; - - do_encrypt((vpn_packet_t*)packet, &rp, cl->key); - rp.from = myself->vpn_ip; - - if(debug_lvl > 3) - syslog(LOG_ERR, "Sent %d bytes to %lx", rp.len, cl->vpn_ip); - - if((r = send(cl->socket, (char*)&rp, rp.len, 0)) < 0) + 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(!cl->status.validkey) { - syslog(LOG_ERR, "Error sending data: %m"); - return -1; - } + if(debug_lvl >= DEBUG_TRAFFIC) + syslog(LOG_INFO, _("No valid key known yet for %s (%s), queueing packet"), + cl->name, cl->hostname); - total_socket_out += r; + /* Since packet is on the stack of handle_tap_input(), + we have to make a copy of it first. */ - return 0; -} + copy = xmalloc(sizeof(vpn_packet_t)); + memcpy(copy, inpkt, sizeof(vpn_packet_t)); -/* - write as many bytes as possible to the tap - device, possibly in multiple turns. -*/ -int write_n(int fd, void *buf, size_t len) -{ - int r, done = 0; - - do - { - if((r = write(fd, buf, len)) < 0) - return -1; - len -= r; - buf += r; - done += r; - } while(len > 0); - - return done; -} + list_insert_tail(cl->queue, copy); -int xrecv(conn_list_t *cl, void *packet) -{ - vpn_packet_t vp; - int lenin; + if(!cl->status.waitingforkey) + send_req_key(myself, cl); + return; + } - do_decrypt((real_packet_t*)packet, &vp, cl->key); - add_mac_addresses(&vp); + /* Encrypt the packet. */ - if((lenin = write_n(tap_fd, &vp, vp.len + 2)) < 0) - syslog(LOG_ERR, "Can't write to tap device: %m"); - else - total_tap_out += lenin; + RAND_bytes(inpkt->salt, sizeof(inpkt->salt)); - return 0; -} + EVP_EncryptInit(&ctx, cl->cipher_pkttype, cl->cipher_pktkey, cl->cipher_pktkey + cl->cipher_pkttype->key_len); + EVP_EncryptUpdate(&ctx, outpkt.salt, &outlen, inpkt->salt, inpkt->len + sizeof(inpkt->salt)); + EVP_EncryptFinal(&ctx, outpkt.salt + outlen, &outpad); + outlen += outpad; -/* - 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) -{ - queue_element_t *e, *p; + total_socket_out += outlen; - if(debug_lvl > 3) - syslog(LOG_DEBUG, "packet to queue: %d", s); + to.sin_family = AF_INET; + to.sin_addr.s_addr = htonl(cl->address); + to.sin_port = htons(cl->port); - e = xmalloc(sizeof(queue_element_t)); - e->packet = xmalloc(s); - memcpy(e->packet, packet, s); - if(!*q) + if((sendto(myself->socket, (char *) outpkt.salt, outlen, 0, (const struct sockaddr *)&to, tolen)) < 0) { - *q = xmalloc(sizeof(packet_queue_t)); - (*q)->head = (*q)->tail = NULL; + syslog(LOG_ERR, _("Error sending packet to %s (%s): %m"), + cl->name, cl->hostname); + return; } +cp +} - e->next = NULL; - - if((*q)->tail != NULL) - (*q)->tail->next = e; - - (*q)->tail = e; +void receive_packet(connection_t *cl, vpn_packet_t *packet) +{ +cp + if(debug_lvl >= DEBUG_TRAFFIC) + syslog(LOG_DEBUG, _("Received packet of %d bytes from %s (%s)"), packet->len, cl->name, cl->hostname); - if((*q)->head == NULL) - (*q)->head = e; + route_incoming(cl, packet); +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*)) +void receive_udppacket(connection_t *cl, vpn_packet_t *inpkt) { - queue_element_t *p, *prev = NULL, *next = NULL; + vpn_packet_t outpkt; + int outlen, outpad; + EVP_CIPHER_CTX ctx; +cp + /* Decrypt the packet */ - for(p = pq->head; p != NULL; ) - { - next = p->next; + EVP_DecryptInit(&ctx, myself->cipher_pkttype, myself->cipher_pktkey, myself->cipher_pktkey + myself->cipher_pkttype->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(cl, &outpkt); cp - if(!function(cl, p->packet)) - { - if(prev) - prev->next = next; - else - pq->head = next; +} +void receive_tcppacket(connection_t *cl, char *buffer, int len) +{ + vpn_packet_t outpkt; cp - free(p->packet); -cp - free(p); -cp - } - else - prev = p; -cp - - p = next; - } + outpkt.len = len; + memcpy(outpkt.data, buffer, len); - if(debug_lvl > 3) - syslog(LOG_DEBUG, "queue flushed"); + receive_packet(cl, &outpkt); +cp } -/* - 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) +void accept_packet(vpn_packet_t *packet) { cp - if(cl->sq) + if(debug_lvl >= DEBUG_TRAFFIC) + syslog(LOG_DEBUG, _("Writing packet of %d bytes to tap device"), + packet->len); + + if(taptype == TAP_TYPE_TUNTAP) { - 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); + if(write(tap_fd, packet->data, packet->len) < 0) + syslog(LOG_ERR, _("Can't write to tun/tap device: %m")); + else + total_tap_out += packet->len; } -cp - - if(cl->rq) + else /* ethertap */ { - 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); + if(write(tap_fd, packet->data - 2, packet->len + 2) < 0) + syslog(LOG_ERR, _("Can't write to ethertap device: %m")); + else + total_tap_out += packet->len; } cp } @@ -243,71 +224,57 @@ cp /* send a packet to the given vpn ip. */ -int send_packet(ip_t to, vpn_packet_t *packet) +void send_packet(connection_t *cl, vpn_packet_t *packet) { - conn_list_t *cl; +cp + if(debug_lvl >= DEBUG_TRAFFIC) + syslog(LOG_ERR, _("Sending packet of %d bytes to %s (%s)"), + packet->len, cl->name, cl->hostname); - if((cl = lookup_conn(to)) == NULL) + if(cl == 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)); - } - 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; + syslog(LOG_NOTICE, _("Packet is looping back to us!")); } - } - -cp - if(my_key_expiry <= time(NULL)) - regenerate_keys(); - -cp - if(!cl->status.dataopen) - if(setup_vpn_connection(cl) < 0) - return -1; -cp - if(!cl->status.validkey) - { - add_queue(&(cl->sq), packet, packet->len + 2); - if(!cl->status.waitingforkey) - send_key_request(to); - return 0; + return; } -cp if(!cl->status.active) { - 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? */ + if(debug_lvl >= DEBUG_TRAFFIC) + syslog(LOG_INFO, _("%s (%s) is not active, dropping packet"), + cl->name, cl->hostname); + + return; } - /* can we send it? can we? can we? huh? */ + /* Check if it has to go via TCP or UDP... */ cp - return xsend(cl, packet); + if((cl->options | myself->options) & OPTION_TCPONLY) + { + if(send_tcppacket(cl, packet)) + terminate_connection(cl); + } + else + send_udppacket(cl, packet); } -int send_broadcast(conn_list_t *cl, vpn_packet_t *packet) +void flush_queue(connection_t *cl) { - conn_list_t *p; - - for(p = cl; p != NULL; p = p->next) - if(send_packet(p->real_ip, packet) < 0) - { - syslog(LOG_ERR, "Could not send a broadcast packet to %08lx (%08lx): %m", - p->vpn_ip, p->real_ip); - break; /* FIXME: should retry later, and send a ping over the metaconnection. */ - } + list_node_t *node, *next; +cp + if(debug_lvl >= DEBUG_TRAFFIC) + syslog(LOG_INFO, _("Flushing queue for %s (%s)"), cl->name, cl->hostname); - return 0; + for(node = cl->queue->head; node; node = next) + { + next = node->next; + send_udppacket(cl, (vpn_packet_t *)node->data); + list_delete_node(cl->queue, node); + } +cp } /* @@ -318,19 +285,72 @@ int setup_tap_fd(void) int nfd; const char *tapfname; config_t const *cfg; - - if((cfg = get_config_val(tapdevice)) == NULL) - tapfname = "/dev/tap0"; - else - tapfname = cfg->data.ptr; +#ifdef HAVE_LINUX +# ifdef HAVE_TUNTAP + struct ifreq ifr; +# endif +#endif +cp + if((cfg = get_config_val(config, config_tapdevice))) + tapfname = cfg->data.ptr; + else + { +#ifdef HAVE_LINUX +# ifdef HAVE_TUNTAP + tapfname = "/dev/net/tun"; +# else + tapfname = "/dev/tap0"; +# endif +#endif +#ifdef HAVE_FREEBSD + tapfname = "/dev/tap0"; +#endif +#ifdef HAVE_SOLARIS + tapfname = "/dev/tun"; +#endif + } +cp if((nfd = open(tapfname, O_RDWR | O_NONBLOCK)) < 0) { - syslog(LOG_ERR, "Could not open %s: %m", tapfname); + syslog(LOG_ERR, _("Could not open %s: %m"), tapfname); return -1; } - +cp tap_fd = nfd; + + taptype = TAP_TYPE_ETHERTAP; + + /* Set default MAC address for ethertap devices */ + + mymac.type = SUBNET_MAC; + mymac.net.mac.address.x[0] = 0xfe; + mymac.net.mac.address.x[1] = 0xfd; + mymac.net.mac.address.x[2] = 0x00; + mymac.net.mac.address.x[3] = 0x00; + mymac.net.mac.address.x[4] = 0x00; + mymac.net.mac.address.x[5] = 0x00; + +#ifdef HAVE_LINUX + #ifdef HAVE_TUNTAP + /* Ok now check if this is an old ethertap or a new tun/tap thingie */ + memset(&ifr, 0, sizeof(ifr)); +cp + ifr.ifr_flags = IFF_TAP | IFF_NO_PI; + if (netname) + strncpy(ifr.ifr_name, netname, IFNAMSIZ); +cp + if (!ioctl(tap_fd, TUNSETIFF, (void *) &ifr)) + { + syslog(LOG_INFO, _("%s is a new style tun/tap device"), tapfname); + taptype = TAP_TYPE_TUNTAP; + } + #endif +#endif +#ifdef HAVE_FREEBSD + taptype = TAP_TYPE_TUNTAP; +#endif +cp return 0; } @@ -342,44 +362,70 @@ int setup_listen_meta_socket(int port) { int nfd, flags; struct sockaddr_in a; - const int one = 1; - + int option; + config_t const *cfg; +cp if((nfd = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP)) < 0) { - syslog(LOG_ERR, "Creating metasocket failed: %m"); + syslog(LOG_ERR, _("Creating metasocket failed: %m")); return -1; } - if(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, "setsockopt: %m"); + close(nfd); + syslog(LOG_ERR, _("System call `%s' failed: %m"), + "fcntl"); return -1; } - flags = fcntl(nfd, F_GETFL); - if(fcntl(nfd, F_SETFL, flags | O_NONBLOCK) < 0) + /* Optimize TCP settings */ + + option = 1; + setsockopt(nfd, SOL_SOCKET, SO_REUSEADDR, &option, sizeof(option)); + setsockopt(nfd, SOL_SOCKET, SO_KEEPALIVE, &option, sizeof(option)); +#ifndef HAVE_FREEBSD + setsockopt(nfd, SOL_TCP, TCP_NODELAY, &option, sizeof(option)); + + option = IPTOS_LOWDELAY; + setsockopt(nfd, SOL_IP, IP_TOS, &option, sizeof(option)); + + if((cfg = get_config_val(config, config_interface))) { - syslog(LOG_ERR, "fcntl: %m"); - return -1; + if(setsockopt(nfd, SOL_SOCKET, SO_BINDTODEVICE, cfg->data.ptr, strlen(cfg->data.ptr))) + { + close(nfd); + syslog(LOG_ERR, _("Unable to bind listen socket to interface %s: %m"), cfg->data.ptr); + 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); + + if((cfg = get_config_val(config, config_interfaceip))) + a.sin_addr.s_addr = htonl(cfg->data.ip->address); + else + a.sin_addr.s_addr = htonl(INADDR_ANY); 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; } @@ -392,23 +438,22 @@ int setup_vpn_in_socket(int port) int nfd, flags; struct sockaddr_in a; const int one = 1; - +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; } @@ -419,23 +464,28 @@ int setup_vpn_in_socket(int port) 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_meta_socket(connection_t *cl) { int flags; struct sockaddr_in a; config_t const *cfg; + int option; +cp + if(debug_lvl >= DEBUG_CONNECTIONS) + syslog(LOG_INFO, _("Trying to connect to %s"), cl->hostname); - if((cfg = get_config_val(upstreamport)) == NULL) + if((cfg = get_config_val(cl->config, config_port)) == NULL) cl->port = 655; else cl->port = cfg->data.val; @@ -443,155 +493,468 @@ int setup_outgoing_meta_socket(conn_list_t *cl) cl->meta_socket = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); if(cl->meta_socket == -1) { - syslog(LOG_ERR, "Creating socket failed: %m"); + syslog(LOG_ERR, _("Creating socket for %s port %d failed: %m"), + cl->hostname, cl->port); + return -1; + } + + /* Bind first to get a fix on our source port */ + + a.sin_family = AF_INET; + a.sin_port = htons(0); + a.sin_addr.s_addr = htonl(INADDR_ANY); + + if(bind(cl->meta_socket, (struct sockaddr *)&a, sizeof(struct sockaddr))) + { + close(cl->meta_socket); + syslog(LOG_ERR, _("System call `%s' failed: %m"), "bind"); return -1; } + /* Optimize TCP settings */ + + option = 1; + setsockopt(cl->meta_socket, SOL_SOCKET, SO_KEEPALIVE, &option, sizeof(option)); +#ifndef HAVE_FREEBSD + setsockopt(cl->meta_socket, SOL_TCP, TCP_NODELAY, &option, sizeof(option)); + + option = IPTOS_LOWDELAY; + setsockopt(cl->meta_socket, SOL_IP, IP_TOS, &option, sizeof(option)); +#endif + /* Connect */ + a.sin_family = AF_INET; a.sin_port = htons(cl->port); - a.sin_addr.s_addr = htonl(cl->real_ip); + a.sin_addr.s_addr = htonl(cl->address); if(connect(cl->meta_socket, (struct sockaddr *)&a, sizeof(a)) == -1) { - syslog(LOG_ERR, IP_ADDR_S ":%d: %m", IP_ADDR_V(cl->real_ip), cl->port); + close(cl->meta_socket); + syslog(LOG_ERR, _("%s port %hd: %m"), cl->hostname, cl->port); return -1; } flags = fcntl(cl->meta_socket, F_GETFL); if(fcntl(cl->meta_socket, F_SETFL, flags | O_NONBLOCK) < 0) { - syslog(LOG_ERR, "fcntl: %m"); + close(cl->meta_socket); + syslog(LOG_ERR, _("fcntl for %s port %d: %m"), + cl->hostname, cl->port); return -1; } - cl->hostname = hostlookup(htonl(cl->real_ip)); - - syslog(LOG_INFO, "Connected to %s:%hd" , cl->hostname, cl->port); + if(debug_lvl >= DEBUG_CONNECTIONS) + syslog(LOG_INFO, _("Connected to %s port %hd"), + cl->hostname, cl->port); + cl->status.meta = 1; +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. + Setup an outgoing meta connection. */ -int setup_outgoing_connection(ip_t ip) +int setup_outgoing_connection(char *name) { - conn_list_t *ncn; + connection_t *ncn; + struct hostent *h; + config_t const *cfg; +cp + if(check_id(name)) + { + syslog(LOG_ERR, _("Invalid name for outgoing connection")); + return -1; + } + + ncn = new_connection(); + asprintf(&ncn->name, "%s", name); + + if(read_host_config(ncn)) + { + syslog(LOG_ERR, _("Error reading host configuration file for %s"), ncn->name); + free_connection(ncn); + return -1; + } + + if(!(cfg = get_config_val(ncn->config, config_address))) + { + syslog(LOG_ERR, _("No address specified for %s"), ncn->name); + free_connection(ncn); + return -1; + } + + if(!(h = gethostbyname(cfg->data.ptr))) + { + syslog(LOG_ERR, _("Error looking up `%s': %m"), cfg->data.ptr); + free_connection(ncn); + return -1; + } - ncn = new_conn_list(); - ncn->real_ip = ip; + ncn->address = ntohl(*((ipv4_t*)(h->h_addr_list[0]))); + ncn->hostname = hostlookup(htonl(ncn->address)); if(setup_outgoing_meta_socket(ncn) < 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"), + ncn->hostname); + free_connection(ncn); return -1; } - ncn->status.meta = 1; ncn->status.outgoing = 1; - ncn->next = conn_list; - conn_list = ncn; + ncn->buffer = xmalloc(MAXBUFSIZE); + ncn->buflen = 0; + ncn->last_ping_time = time(NULL); + + connection_add(ncn); + + send_id(ncn); +cp + return 0; +} + +int read_rsa_public_key(connection_t *cl) +{ + config_t const *cfg; + FILE *fp; + char *fname; + void *result; +cp + if(!cl->rsa_key) + cl->rsa_key = RSA_new(); + + /* First, check for simple PublicKey statement */ + if((cfg = get_config_val(cl->config, config_publickey))) + { + BN_hex2bn(&cl->rsa_key->n, cfg->data.ptr); + BN_hex2bn(&cl->rsa_key->e, "FFFF"); + return 0; + } + + /* Else, check for PublicKeyFile statement and read it */ + + if((cfg = get_config_val(cl->config, config_publickeyfile))) + { + if(is_safe_path(cfg->data.ptr)) + { + if((fp = fopen(cfg->data.ptr, "r")) == NULL) + { + syslog(LOG_ERR, _("Error reading RSA public key file `%s': %m"), + cfg->data.ptr); + return -1; + } + result = PEM_read_RSAPublicKey(fp, &cl->rsa_key, NULL, NULL); + fclose(fp); + if(!result) + { + syslog(LOG_ERR, _("Reading RSA public key file `%s' failed: %m"), + cfg->data.ptr); + return -1; + } + return 0; + } + else + return -1; + } + + /* Else, check if a harnessed public key is in the config file */ + + asprintf(&fname, "%s/hosts/%s", confbase, cl->name); + if((fp = fopen(fname, "r"))) + { + result = PEM_read_RSAPublicKey(fp, &cl->rsa_key, NULL, NULL); + fclose(fp); + free(fname); + if(result) + return 0; + } + + free(fname); + + /* Nothing worked. */ + + syslog(LOG_ERR, _("No public key for %s specified!"), cl->name); +cp + return -1; +} + +int read_rsa_private_key(void) +{ + config_t const *cfg; + FILE *fp; + void *result; +cp + if(!myself->rsa_key) + myself->rsa_key = RSA_new(); + + if((cfg = get_config_val(config, config_privatekey))) + { + BN_hex2bn(&myself->rsa_key->d, cfg->data.ptr); + BN_hex2bn(&myself->rsa_key->e, "FFFF"); + } + else if((cfg = get_config_val(config, config_privatekeyfile))) + { + if((fp = fopen(cfg->data.ptr, "r")) == NULL) + { + syslog(LOG_ERR, _("Error reading RSA private key file `%s': %m"), + cfg->data.ptr); + return -1; + } + result = PEM_read_RSAPrivateKey(fp, &myself->rsa_key, NULL, NULL); + fclose(fp); + if(!result) + { + syslog(LOG_ERR, _("Reading RSA private key file `%s' failed: %m"), + cfg->data.ptr); + return -1; + } + } + else + { + syslog(LOG_ERR, _("No private key for tinc daemon specified!")); + return -1; + } +cp return 0; } /* - set up the local sockets (listen only) + Configure connection_t myself and set up the local sockets (listen only) */ int setup_myself(void) { config_t const *cfg; + config_t *next; + subnet_t *net; +cp + myself = new_connection(); - myself = new_conn_list(); + asprintf(&myself->hostname, "MYSELF"); + myself->options = 0; + myself->protocol_version = PROT_CURRENT; + + if(!(cfg = get_config_val(config, config_name))) /* Not acceptable */ + { + syslog(LOG_ERR, _("Name for tinc daemon required!")); + return -1; + } + else + asprintf(&myself->name, "%s", (char*)cfg->data.val); + + if(check_id(myself->name)) + { + syslog(LOG_ERR, _("Invalid name for myself!")); + return -1; + } +cp + if(read_rsa_private_key()) + return -1; - if(!(cfg = get_config_val(myvpnip))) + if(read_host_config(myself)) { - syslog(LOG_ERR, "No value for my VPN IP given"); + syslog(LOG_ERR, _("Cannot open host configuration file for myself!")); return -1; } - myself->vpn_ip = cfg->data.ip->ip; - myself->vpn_mask = cfg->data.ip->mask; + if(read_rsa_public_key(myself)) + return -1; +cp - if(!(cfg = get_config_val(listenport))) +/* + if(RSA_check_key(myself->rsa_key) != 1) + { + syslog(LOG_ERR, _("Invalid public/private keypair!")); + return -1; + } +*/ + if(!(cfg = get_config_val(myself->config, config_port))) myself->port = 655; else myself->port = cfg->data.val; + if((cfg = get_config_val(myself->config, config_indirectdata))) + if(cfg->data.val == stupid_true) + myself->options |= OPTION_INDIRECT; + + if((cfg = get_config_val(myself->config, config_tcponly))) + if(cfg->data.val == stupid_true) + myself->options |= OPTION_TCPONLY; + +/* Read in all the subnets specified in the host configuration file */ + + for(next = myself->config; (cfg = get_config_val(next, config_subnet)); next = cfg->next) + { + net = new_subnet(); + net->type = SUBNET_IPV4; + net->net.ipv4.address = cfg->data.ip->address; + net->net.ipv4.mask = cfg->data.ip->mask; + + /* Teach newbies what subnets are... */ + + if((net->net.ipv4.address & net->net.ipv4.mask) != net->net.ipv4.address) + { + syslog(LOG_ERR, _("Network address and subnet mask do not match!")); + return -1; + } + + subnet_add(myself, net); + } + if((myself->meta_socket = setup_listen_meta_socket(myself->port)) < 0) { - syslog(LOG_ERR, "Unable to set up a listening socket"); + syslog(LOG_ERR, _("Unable to set up a listening TCP socket!")); return -1; } if((myself->socket = setup_vpn_in_socket(myself->port)) < 0) { - syslog(LOG_ERR, "Unable to set up an incoming vpn data socket"); - close(myself->meta_socket); + syslog(LOG_ERR, _("Unable to set up a listening UDP socket!")); return -1; } +cp + /* Generate packet encryption key */ - myself->status.active = 1; + myself->cipher_pkttype = EVP_bf_cbc(); + + myself->cipher_pktkeylength = myself->cipher_pkttype->key_len + myself->cipher_pkttype->iv_len; + + myself->cipher_pktkey = (char *)xmalloc(myself->cipher_pktkeylength); + RAND_pseudo_bytes(myself->cipher_pktkey, myself->cipher_pktkeylength); + + if(!(cfg = get_config_val(config, config_keyexpire))) + keylifetime = 3600; + else + keylifetime = cfg->data.val; + + keyexpires = time(NULL) + keylifetime; +cp + /* Check some options */ + + if((cfg = get_config_val(config, config_indirectdata))) + { + if(cfg->data.val == stupid_true) + myself->options |= OPTION_INDIRECT; + } + + if((cfg = get_config_val(config, config_tcponly))) + { + if(cfg->data.val == stupid_true) + myself->options |= OPTION_TCPONLY; + } - syslog(LOG_NOTICE, "Ready: listening on port %d.", myself->port); + if(myself->options & OPTION_TCPONLY) + myself->options |= OPTION_INDIRECT; + /* Activate ourselves */ + + myself->status.active = 1; + + syslog(LOG_NOTICE, _("Ready: listening on port %hd"), myself->port); +cp return 0; } +RETSIGTYPE +sigalrm_handler(int a) +{ + config_t const *cfg; +cp + cfg = get_config_val(upstreamcfg, config_connectto); + + if(!cfg) + { + if(upstreamcfg == config) + { + /* No upstream IP given, we're listen only. */ + signal(SIGALRM, SIG_IGN); + return; + } + } + else + { + /* We previously tried all the ConnectTo lines. Now wrap back to the first. */ + cfg = get_config_val(config, config_connectto); + } + + while(cfg) + { + upstreamcfg = cfg->next; + if(!setup_outgoing_connection(cfg->data.ptr)) /* function returns 0 when there are no problems */ + { + signal(SIGALRM, SIG_IGN); + return; + } + cfg = get_config_val(upstreamcfg, config_connectto); /* Or else we try the next ConnectTo line */ + } + + signal(SIGALRM, sigalrm_handler); + upstreamcfg = config; + seconds_till_retry += 5; + if(seconds_till_retry > MAXTIMEOUT) /* Don't wait more than MAXTIMEOUT seconds. */ + seconds_till_retry = MAXTIMEOUT; + syslog(LOG_ERR, _("Still failed to connect to other, will retry in %d seconds"), + seconds_till_retry); + alarm(seconds_till_retry); +cp +} + /* setup all initial network connections */ int setup_network_connections(void) { config_t const *cfg; +cp + init_connections(); + init_subnets(); - if((cfg = get_config_val(pingtimeout)) == NULL) - timeout = 10; + if((cfg = get_config_val(config, config_pingtimeout)) == NULL) + timeout = 60; else - timeout = cfg->data.val; + { + timeout = cfg->data.val; + if(timeout < 1) + { + timeout = 86400; + } + } if(setup_tap_fd() < 0) return -1; + /* Run tinc-up script to further initialize the tap interface */ + execute_script("tinc-up"); + if(setup_myself() < 0) return -1; - if((cfg = get_config_val(upstreamip)) == NULL) + if(!(cfg = get_config_val(config, config_connectto))) /* No upstream IP given, we're listen only. */ return 0; - if(setup_outgoing_connection(cfg->data.ip->ip)) - return -1; - - return 0; -} - -RETSIGTYPE -sigalrm_handler(int a) -{ - config_t const *cfg; - static int seconds_till_retry; - - cfg = get_config_val(upstreamip); - - if(!setup_outgoing_connection(cfg->data.ip->ip)) + while(cfg) { - signal(SIGALRM, SIG_IGN); - seconds_till_retry = 5; + upstreamcfg = cfg->next; + if(!setup_outgoing_connection(cfg->data.ptr)) /* function returns 0 when there are no problems */ + return 0; + cfg = get_config_val(upstreamcfg, config_connectto); /* Or else we try the next ConnectTo line */ } - else + + if(do_detach) { signal(SIGALRM, sigalrm_handler); - seconds_till_retry += 5; + upstreamcfg = config; + seconds_till_retry = MAXTIMEOUT; + syslog(LOG_NOTICE, _("Trying to re-establish outgoing connection in %d seconds"), seconds_till_retry); alarm(seconds_till_retry); - syslog(LOG_ERR, "Still failed to connect to other. Will retry in %d seconds.", - seconds_till_retry); } + else + return -1; + +cp + return 0; } /* @@ -599,110 +962,71 @@ sigalrm_handler(int a) */ void close_network_connections(void) { - conn_list_t *p; - - for(p = conn_list; p != NULL; p = p->next) + avl_node_t *node; + connection_t *p; +cp + for(node = connection_tree->head; node; node = node->next) { - 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); - } + p = (connection_t *)node->data; + p->status.outgoing = 0; + p->status.active = 0; + terminate_connection(p); } if(myself) if(myself->status.active) { close(myself->meta_socket); - close(myself->socket); + free_connection(myself); + myself = NULL; } close(tap_fd); - destroy_conn_list(); - - syslog(LOG_NOTICE, "Terminating."); - return; -} - -/* - create a data (udp) socket -*/ -int setup_vpn_connection(conn_list_t *cl) -{ - int nfd, flags; - struct sockaddr_in a; - - 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) - { - syslog(LOG_ERR, "Creating data socket failed: %m"); - return -1; - } - - a.sin_family = AF_INET; - a.sin_port = htons(cl->port); - a.sin_addr.s_addr = htonl(cl->real_ip); - - 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; - } - - 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; - } - cl->socket = nfd; - cl->status.dataopen = 1; + /* Execute tinc-down script right after shutting down the interface */ + execute_script("tinc-down"); - return 0; + destroy_connection_tree(); +cp + 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 *p; struct sockaddr_in ci; int len = sizeof(ci); +cp + p = new_connection(); - p = new_conn_list(); - - 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->name = unknown; + p->address = ntohl(ci.sin_addr.s_addr); p->hostname = hostlookup(ci.sin_addr.s_addr); - p->real_ip = ntohl(ci.sin_addr.s_addr); + p->port = htons(ci.sin_port); /* This one will be overwritten later */ p->meta_socket = sfd; p->status.meta = 1; + p->buffer = xmalloc(MAXBUFSIZE); + p->buflen = 0; + p->last_ping_time = time(NULL); - syslog(LOG_NOTICE, "Connection from %s:%d", p->hostname, htons(ci.sin_port)); - - if(send_basic_info(p) < 0) - { - free(p); - return NULL; - } + if(debug_lvl >= DEBUG_CONNECTIONS) + syslog(LOG_NOTICE, _("Connection from %s port %d"), + p->hostname, htons(ci.sin_port)); + p->allow_request = ID; +cp return p; } @@ -711,21 +1035,23 @@ conn_list_t *create_new_connection(int sfd) */ void build_fdset(fd_set *fs) { - conn_list_t *p; - + avl_node_t *node; + connection_t *p; +cp FD_ZERO(fs); - for(p = conn_list; p != NULL; p = p->next) + FD_SET(myself->socket, fs); + + for(node = connection_tree->head; node; node = node->next) { + p = (connection_t *)node->data; if(p->status.meta) - FD_SET(p->meta_socket, fs); - if(p->status.dataopen) - FD_SET(p->socket, fs); + FD_SET(p->meta_socket, fs); } FD_SET(myself->meta_socket, fs); - FD_SET(myself->socket, fs); FD_SET(tap_fd, fs); +cp } /* @@ -733,213 +1059,189 @@ void build_fdset(fd_set *fs) 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; - - if(getsockopt(cl->socket, SOL_SOCKET, SO_ERROR, &x, &l) < 0) + struct sockaddr_in from; + socklen_t fromlen = sizeof(from); + connection_t *cl; +cp + if(getsockopt(myself->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__, myself->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(myself->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; - if(rp.len >= 0) - { - f = lookup_conn(rp.from); - if(debug_lvl > 2) - 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); - } + cl = lookup_connection(ntohl(from.sin_addr.s_addr), ntohs(from.sin_port)); - if(my_key_expiry <= time(NULL)) - regenerate_keys(); + if(!cl) + { + syslog(LOG_WARNING, _("Received UDP packets on port %hd from unknown source %x:%hd"), myself->port, ntohl(from.sin_addr.s_addr), ntohs(from.sin_port)); + return; } - return 0; + cl->last_ping_time = time(NULL); + + receive_udppacket(cl, &pkt); +cp } /* terminate a connection and notify the other end before closing the sockets */ -void terminate_connection(conn_list_t *cl) +void terminate_connection(connection_t *cl) { + connection_t *p; + subnet_t *subnet; + avl_node_t *node, *next; +cp if(cl->status.remove) return; - if(debug_lvl > 0) - syslog(LOG_NOTICE, "Closing connection with %s.", cl->hostname); + if(debug_lvl >= DEBUG_CONNECTIONS) + syslog(LOG_NOTICE, _("Closing connection with %s (%s)"), + cl->name, cl->hostname); - if(cl->status.timeout) - send_timeout(cl); - else if(!cl->status.termreq) - send_termreq(cl); + cl->status.remove = 1; - close(cl->socket); + if(cl->socket) + close(cl->socket); if(cl->status.meta) close(cl->meta_socket); - if(cl->status.outgoing) + if(cl->status.meta) { - alarm(5); - signal(SIGALRM, sigalrm_handler); - syslog(LOG_NOTICE, "Try to re-establish outgoing connection in 5 seconds."); + + /* Find all connections that were lost because they were behind cl + (the connection that was dropped). */ + + for(node = connection_tree->head; node; node = node->next) + { + p = (connection_t *)node->data; + if(p->nexthop == cl && p != cl) + terminate_connection(p); + } + + /* Inform others of termination if it was still active */ + + if(cl->status.active) + for(node = connection_tree->head; node; node = node->next) + { + p = (connection_t *)node->data; + if(p->status.meta && p->status.active && p != cl) + send_del_host(p, cl); /* Sounds like recursion, but p does not have a meta connection :) */ + } } - - cl->status.remove = 1; -} -/* - send out a ping request to all active - connections -*/ -int send_broadcast_ping(void) -{ - conn_list_t *p; + /* Remove the associated subnets */ - for(p = conn_list; p != NULL; p = p->next) + for(node = cl->subnet_tree->head; node; node = next) { - 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; - } - } + next = node->next; + subnet = (subnet_t *)node->data; + subnet_del(subnet); } - last_ping_time = time(NULL); + /* Check if this was our outgoing connection */ - return 0; + if(cl->status.outgoing) + { + cl->status.outgoing = 0; + signal(SIGALRM, sigalrm_handler); + seconds_till_retry = 5; + alarm(seconds_till_retry); + syslog(LOG_NOTICE, _("Trying to re-establish outgoing connection in 5 seconds")); + } + + /* Deactivate */ + + cl->status.active = 0; +cp } /* - 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; + connection_t *cl; +cp + now = time(NULL); - for(p = conn_list; p != NULL; p = p->next) + for(node = connection_tree->head; node; 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); - } + cl = (connection_t *)node->data; + if(cl->status.active && cl->status.meta) + { + if(cl->last_ping_time + timeout < now) + { + if(cl->status.pinged) + { + if(debug_lvl >= DEBUG_PROTOCOL) + syslog(LOG_INFO, _("%s (%s) didn't respond to PING"), + cl->name, cl->hostname); + cl->status.timeout = 1; + terminate_connection(cl); + } + else + { + send_ping(cl); + } + } + } } - - return 0; +cp } /* 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 *ncn; struct sockaddr client; - int nfd, len = sizeof(struct sockaddr); - - if((nfd = accept(cl->meta_socket, &client, &len)) < 0) + int nfd, len = sizeof(client); +cp + if((nfd = accept(myself->meta_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(!(ncn = create_new_connection(nfd))) { shutdown(nfd, 2); close(nfd); - syslog(LOG_NOTICE, "Closed attempted connection."); + syslog(LOG_NOTICE, _("Closed attempted connection")); return 0; } - ncn->status.meta = 1; - ncn->next = conn_list; - conn_list = ncn; - - return 0; -} - -/* - dispatch any incoming meta requests -*/ -int handle_incoming_meta_data(conn_list_t *cl) -{ - int x, l = sizeof(x), lenin; - unsigned char tmp[1600]; - int request; - - 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((lenin = recv(cl->meta_socket, &tmp, sizeof(tmp), 0)) <= 0) - { - syslog(LOG_ERR, "Receive failed: %m"); - return -1; - } - - request = (int)(tmp[0]); + connection_add(ncn); - if(debug_lvl > 3) - syslog(LOG_DEBUG, "got request %d", request); - - if(request_handlers[request] == NULL) - syslog(LOG_ERR, "Unknown request %d.", request); - else - if(request_handlers[request](cl, tmp, lenin) < 0) - return -1; - + send_id(ncn); +cp return 0; } @@ -949,45 +1251,30 @@ int handle_incoming_meta_data(conn_list_t *cl) */ void check_network_activity(fd_set *f) { - conn_list_t *p; - int x, l = sizeof(x); + connection_t *p; + avl_node_t *node; +cp + if(FD_ISSET(myself->socket, f)) + handle_incoming_vpn_data(); - for(p = conn_list; p != NULL; p = p->next) + for(node = connection_tree->head; node; node = node->next) { + p = (connection_t *)node->data; + if(p->status.remove) - continue; -cp - if(p->status.active) - if(FD_ISSET(p->socket, f)) - { - /* - 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); - return; - } -cp + return; + if(p->status.meta) if(FD_ISSET(p->meta_socket, f)) - if(handle_incoming_meta_data(p) < 0) + if(receive_meta(p) < 0) { terminate_connection(p); return; - } -cp + } } - -cp - if(FD_ISSET(myself->socket, f)) - handle_incoming_vpn_data(myself); -cp + if(FD_ISSET(myself->meta_socket, f)) - handle_new_meta_connection(myself); + handle_new_meta_connection(); cp } @@ -998,98 +1285,126 @@ cp void handle_tap_input(void) { vpn_packet_t vp; - ip_t from, to; - int ether_type, lenin; - - memset(&vp, 0, sizeof(vp)); - if((lenin = read(tap_fd, &vp, MTU)) <= 0) + int lenin; +cp + if(taptype == TAP_TYPE_TUNTAP) { - syslog(LOG_ERR, "Error while reading from tapdevice: %m"); - return; + if((lenin = read(tap_fd, vp.data, MTU)) <= 0) + { + syslog(LOG_ERR, _("Error while reading from tun/tap device: %m")); + return; + } + vp.len = lenin; } - - total_tap_in += lenin; - - ether_type = ntohs(*((unsigned short*)(&vp.data[12]))); - if(ether_type != 0x0800) + else /* ethertap */ { - 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((lenin = read(tap_fd, vp.data - 2, MTU)) <= 0) + { + syslog(LOG_ERR, _("Error while reading from ethertap device: %m")); + return; + } + vp.len = lenin - 2; } - + + total_tap_in += vp.len; + if(lenin < 32) { - if(debug_lvl > 0) - syslog(LOG_INFO, "Dropping short packet"); + if(debug_lvl >= DEBUG_TRAFFIC) + syslog(LOG_WARNING, _("Received short packet from tap device")); return; } - from = ntohl(*((unsigned long*)(&vp.data[26]))); - to = ntohl(*((unsigned long*)(&vp.data[30]))); + if(debug_lvl >= DEBUG_TRAFFIC) + { + syslog(LOG_DEBUG, _("Read packet of length %d from tap device"), vp.len); + } - if(debug_lvl > 2) - 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 > 3) - 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; -cp - strip_mac_addresses(&vp); -cp - send_packet(to, &vp); + route_outgoing(&vp); cp } /* - this is where it al happens... + this is where it all happens... */ void main_loop(void) { fd_set fset; struct timeval tv; int r; - - last_ping_time = time(NULL); + time_t last_ping_check; + int t; +cp + last_ping_check = time(NULL); for(;;) { tv.tv_sec = timeout; tv.tv_usec = 0; -cp - prune_conn_list(); -cp + prune_connection_tree(); build_fdset(&fset); -cp 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; + } } -cp - 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(); + clear_config(&config); + + 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_bytes(myself->cipher_pktkey, myself->cipher_pktkeylength); + send_key_changed(myself, NULL); + keyexpires = time(NULL) + keylifetime; + } } -cp - check_network_activity(&fset); + if(r > 0) + { + check_network_activity(&fset); -cp - /* local tap data */ - if(FD_ISSET(tap_fd, &fset)) - handle_tap_input(); -cp + /* local tap data */ + if(FD_ISSET(tap_fd, &fset)) + handle_tap_input(); + } } +cp }