X-Git-Url: https://git.librecmc.org/?p=oweals%2Ftinc.git;a=blobdiff_plain;f=src%2Fnet.c;h=6e4fa6632219038614d8d9f04ccd271fdf2eb5fc;hp=daa8cf506539b86f073f3921c7c5a53b5b3b149f;hb=5019dd879177b5ab9413e5c0aa72a15d0e585acf;hpb=1243156a5e03a666b36bc4400f1402243a85c9a7 diff --git a/src/net.c b/src/net.c index daa8cf5..6e4fa66 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,1999,2000 Ivo Timmermans , + 2000 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,6 +16,8 @@ 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.65 2000/11/04 17:09:10 guus Exp $ */ #include "config.h" @@ -22,6 +25,8 @@ #include #include #include +#include +#include #include #include #include @@ -33,113 +38,183 @@ #include #include #include +#include +#include +#include +#include + +#ifdef HAVE_TUNTAP +#include LINUX_IF_TUN_H +#endif -#include #include #include #include "conf.h" -#include "encr.h" +#include "connlist.h" +#include "meta.h" #include "net.h" #include "netutl.h" #include "protocol.h" +#include "subnet.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; +config_t *upstreamcfg; +static int seconds_till_retry; -/* 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]; +char *unknown = NULL; +char *interface_name = NULL; /* Contains the name of the interface */ - memcpy(tmp, p->data, p->len); - p->len -= 12; - memcpy(p->data, &tmp[12], p->len); -} +subnet_t mymac; /* - reassemble MAC addresses + Execute the given script. + This function doesn't really belong here. */ -void add_mac_addresses(vpn_packet_t *p) +int execute_script(const char* name) { - 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 *scriptname; + pid_t pid; + char *s; -int xsend(conn_list_t *cl, void *packet) -{ - int r; - real_packet_t rp; + if((pid = fork()) < 0) + { + syslog(LOG_ERR, _("System call `%s' failed: %m"), + "fork"); + return -1; + } - do_encrypt((vpn_packet_t*)packet, &rp, cl->key); - rp.from = myself->vpn_ip; + if(pid) + { + return 0; + } + + /* Child here */ - if(debug_lvl > 3) - syslog(LOG_ERR, "Sent %d bytes to %lx", rp.len, cl->vpn_ip); + asprintf(&scriptname, "%s/%s", confbase, name); + asprintf(&s, "IFNAME=%s", interface_name); + putenv(s); + free(s); - if((r = send(cl->socket, (char*)&rp, rp.len, 0)) < 0) + if(netname) { - syslog(LOG_ERR, "Error sending data: %m"); - return -1; + asprintf(&s, "NETNAME=%s", netname); + putenv(s); + free(s); + } + else + { + unsetenv("NETNAME"); } - total_socket_out += r; + if(chdir(confbase) < 0) + { + syslog(LOG_ERR, _("Couldn't chdir to `%s': %m"), + confbase); + } + + execl(scriptname, NULL); + /* No return on success */ + + if(errno != ENOENT) /* Ignore if the file does not exist */ + syslog(LOG_WARNING, _("Error executing `%s': %m"), scriptname); - return 0; + /* No need to free things */ + exit(0); } -/* - 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 xsend(conn_list_t *cl, vpn_packet_t *inpkt) { - int r, done = 0; + vpn_packet_t outpkt; + int outlen, outpad; + EVP_CIPHER_CTX ctx; +cp + outpkt.len = inpkt->len; - do - { - if((r = write(fd, buf, len)) < 0) - return -1; - len -= r; - buf += r; - done += r; - } while(len > 0); + /* Encrypt the packet */ + + EVP_EncryptInit(&ctx, cl->cipher_pkttype, cl->cipher_pktkey, cl->cipher_pktkey + cl->cipher_pkttype->key_len); + EVP_EncryptUpdate(&ctx, outpkt.data, &outlen, inpkt->data, inpkt->len); + EVP_EncryptFinal(&ctx, outpkt.data + outlen, &outpad); + outlen += outpad + 2; + +/* Bypass + outlen = outpkt.len + 2; + memcpy(&outpkt, inpkt, outlen); +*/ + + if(debug_lvl >= DEBUG_TRAFFIC) + syslog(LOG_ERR, _("Sending packet of %d bytes to %s (%s)"), + outlen, cl->name, cl->hostname); - return done; + total_socket_out += outlen; + + cl->want_ping = 1; + + if((send(cl->socket, (char *) &(outpkt.len), outlen, 0)) < 0) + { + syslog(LOG_ERR, _("Error sending packet to %s (%s): %m"), + cl->name, cl->hostname); + return -1; + } +cp + return 0; } -int xrecv(conn_list_t *cl, void *packet) +int xrecv(vpn_packet_t *inpkt) { - vpn_packet_t vp; - int lenin; + vpn_packet_t outpkt; + int outlen, outpad; + EVP_CIPHER_CTX ctx; +cp + outpkt.len = inpkt->len; - do_decrypt((real_packet_t*)packet, &vp, cl->key); - add_mac_addresses(&vp); + /* Decrypt 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; + EVP_DecryptInit(&ctx, myself->cipher_pkttype, myself->cipher_pktkey, myself->cipher_pktkey + myself->cipher_pkttype->key_len); + EVP_DecryptUpdate(&ctx, outpkt.data, &outlen, inpkt->data, inpkt->len + 8); + EVP_DecryptFinal(&ctx, outpkt.data + outlen, &outpad); + outlen += outpad; + +/* Bypass + outlen = outpkt.len+2; + memcpy(&outpkt, inpkt, outlen); +*/ + + if(debug_lvl >= DEBUG_TRAFFIC) + syslog(LOG_ERR, _("Writing packet of %d bytes to tap device"), + outpkt.len, outlen); + + /* Fix mac address */ + memcpy(outpkt.data, mymac.net.mac.address.x, 6); + + if(taptype == TAP_TYPE_TUNTAP) + { + if(write(tap_fd, outpkt.data, outpkt.len) < 0) + syslog(LOG_ERR, _("Can't write to tun/tap device: %m")); + else + total_tap_out += outpkt.len; + } + else /* ethertap */ + { + if(write(tap_fd, outpkt.data - 2, outpkt.len + 2) < 0) + syslog(LOG_ERR, _("Can't write to ethertap device: %m")); + else + total_tap_out += outpkt.len + 2; + } +cp return 0; } @@ -149,29 +224,70 @@ int xrecv(conn_list_t *cl, void *packet) */ void add_queue(packet_queue_t **q, void *packet, size_t s) { - queue_element_t *e, *p; - - if(debug_lvl > 3) - syslog(LOG_DEBUG, "packet to queue: %d", s); - - e = xmalloc(sizeof(queue_element_t)); + queue_element_t *e; +cp + e = xmalloc(sizeof(*e)); e->packet = xmalloc(s); memcpy(e->packet, packet, s); + if(!*q) { - *q = xmalloc(sizeof(packet_queue_t)); + *q = xmalloc(sizeof(**q)); (*q)->head = (*q)->tail = NULL; } - e->next = NULL; + e->next = NULL; /* We insert at the tail */ - if((*q)->tail != NULL) - (*q)->tail->next = e; + 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; + } (*q)->tail = e; +cp +} - if((*q)->head == NULL) - (*q)->head = e; +/* 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; + } + } + + free(e); +cp } /* @@ -179,38 +295,24 @@ void add_queue(packet_queue_t **q, void *packet, size_t s) each packet, and removing it when that returned a zero exit code */ -void flush_queue(conn_list_t *cl, packet_queue_t *pq, +void flush_queue(conn_list_t *cl, packet_queue_t **pq, int (*function)(conn_list_t*,void*)) { - queue_element_t *p, *prev = NULL, *next = NULL; - - for(p = pq->head; p != NULL; ) + queue_element_t *p, *next = NULL; +cp + for(p = (*pq)->head; p != NULL; ) { next = p->next; -cp if(!function(cl, p->packet)) - { - if(prev) - prev->next = next; - else - pq->head = next; - -cp - free(p->packet); -cp - free(p); -cp - } - else - prev = p; -cp - + del_queue(pq, p); + p = next; } - if(debug_lvl > 3) - syslog(LOG_DEBUG, "queue flushed"); + if(debug_lvl >= DEBUG_TRAFFIC) + syslog(LOG_DEBUG, _("Queue flushed")); +cp } /* @@ -223,19 +325,18 @@ 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); + if(debug_lvl >= DEBUG_TRAFFIC) + syslog(LOG_DEBUG, _("Flushing send queue for %s (%s)"), + cl->name, cl->hostname); + flush_queue(cl, &(cl->sq), xsend); } -cp if(cl->rq) { - 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(debug_lvl >= DEBUG_TRAFFIC) + syslog(LOG_DEBUG, _("Flushing receive queue for %s (%s)"), + cl->name, cl->hostname); + flush_queue(cl, &(cl->rq), xrecv); } cp } @@ -246,46 +347,65 @@ cp int send_packet(ip_t to, vpn_packet_t *packet) { conn_list_t *cl; - - if((cl = lookup_conn(to)) == NULL) + subnet_t *subnet; +cp + if((subnet = lookup_subnet_ipv4(to)) == NULL) { - if(debug_lvl > 2) + if(debug_lvl >= DEBUG_TRAFFIC) { - syslog(LOG_NOTICE, "trying to look up " IP_ADDR_S " in connection list failed.", + syslog(LOG_NOTICE, _("Trying to look up %d.%d.%d.%d in connection list failed!"), IP_ADDR_V(to)); } - for(cl = conn_list; cl != NULL && !cl->status.outgoing; cl = cl->next); - if(!cl) + + return -1; + } + + cl = subnet->owner; + + if(cl == myself) + { + if(debug_lvl >= DEBUG_TRAFFIC) { - syslog(LOG_ERR, "zxnrbl"); - return -1; + syslog(LOG_NOTICE, _("Packet with destination %d.%d.%d.%d is looping back to us!"), + IP_ADDR_V(to)); } + + return -1; } -cp - if(my_key_expiry <= time(NULL)) - regenerate_keys(); + /* If we ourselves have indirectdata flag set, we should send only to our uplink! */ -cp + /* FIXME - check for indirection and reprogram it The Right Way(tm) this time. */ + if(!cl->status.dataopen) if(setup_vpn_connection(cl) < 0) - return -1; -cp - + { + syslog(LOG_ERR, _("Could not open UDP connection to %s (%s)"), + cl->name, cl->hostname); + return -1; + } + if(!cl->status.validkey) { +/* FIXME: Don't queue until everything else is fixed. + if(debug_lvl >= DEBUG_TRAFFIC) + syslog(LOG_INFO, _("No valid key known yet for %s (%s), queueing packet"), + cl->name, cl->hostname); add_queue(&(cl->sq), packet, packet->len + 2); +*/ if(!cl->status.waitingforkey) - send_key_request(to); + send_req_key(myself, cl); /* Keys should be sent to the host running the tincd */ return 0; } -cp if(!cl->status.active) { +/* FIXME: Don't queue until everything else is fixed. + if(debug_lvl >= DEBUG_TRAFFIC) + syslog(LOG_INFO, _("%s (%s) is not ready, queueing packet"), + cl->name, cl->hostname); 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? */ } @@ -294,21 +414,6 @@ cp return xsend(cl, packet); } -int send_broadcast(conn_list_t *cl, vpn_packet_t *packet) -{ - 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. */ - } - - return 0; -} - /* open the local ethertap device */ @@ -317,19 +422,59 @@ 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; + struct ifreq ifr; +cp + if((cfg = get_config_val(config, tapdevice))) + tapfname = cfg->data.ptr; + else +#ifdef HAVE_TUNTAP + tapfname = "/dev/misc/net/tun"; +#else + tapfname = "/dev/tap0"; +#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; + + /* Set default MAC address for ethertap devices */ + + taptype = TAP_TYPE_ETHERTAP; + 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_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 + + /* Add name of network interface to environment (for scripts) */ + + ioctl(tap_fd, SIOCGIFNAME, (void *) &ifr); + interface_name = xmalloc(strlen(ifr.ifr_name)); + strcpy(interface_name, ifr.ifr_name); + +cp return 0; } @@ -342,43 +487,67 @@ int setup_listen_meta_socket(int port) int nfd, flags; struct sockaddr_in a; const int one = 1; - + 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))) { - syslog(LOG_ERR, "setsockopt: %m"); + syslog(LOG_ERR, _("System call `%s' failed: %m"), + "setsockopt"); + return -1; + } + + if(setsockopt(nfd, SOL_SOCKET, SO_KEEPALIVE, &one, sizeof(one))) + { + syslog(LOG_ERR, _("System call `%s' failed: %m"), + "setsockopt"); return -1; } flags = fcntl(nfd, F_GETFL); if(fcntl(nfd, F_SETFL, flags | O_NONBLOCK) < 0) { - syslog(LOG_ERR, "fcntl: %m"); + syslog(LOG_ERR, _("System call `%s' failed: %m"), + "fcntl"); return -1; } + if((cfg = get_config_val(config, interface))) + { + if(setsockopt(nfd, SOL_SOCKET, SO_KEEPALIVE, cfg->data.ptr, strlen(cfg->data.ptr))) + { + syslog(LOG_ERR, _("Unable to bind listen socket to interface %s: %m"), cfg->data.ptr); + return -1; + } + } + 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, 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); + syslog(LOG_ERR, _("Can't bind to port %hd/tcp: %m"), port); return -1; } if(listen(nfd, 3)) { - syslog(LOG_ERR, "listen: %m"); + syslog(LOG_ERR, _("System call `%s' failed: %m"), + "listen"); return -1; } - +cp return nfd; } @@ -391,23 +560,25 @@ 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"); + syslog(LOG_ERR, _("Creating socket failed: %m")); return -1; } if(setsockopt(nfd, SOL_SOCKET, SO_REUSEADDR, &one, sizeof(one))) { - syslog(LOG_ERR, "setsockopt: %m"); + syslog(LOG_ERR, _("System call `%s' failed: %m"), + "setsockopt"); return -1; } flags = fcntl(nfd, F_GETFL); if(fcntl(nfd, F_SETFL, flags | O_NONBLOCK) < 0) { - syslog(LOG_ERR, "fcntl: %m"); + syslog(LOG_ERR, _("System call `%s' failed: %m"), + "fcntl"); return -1; } @@ -418,10 +589,10 @@ 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); + syslog(LOG_ERR, _("Can't bind to port %hd/udp: %m"), port); return -1; } - +cp return nfd; } @@ -433,8 +604,11 @@ int setup_outgoing_meta_socket(conn_list_t *cl) int flags; struct sockaddr_in a; config_t const *cfg; +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, port)) == NULL) cl->port = 655; else cl->port = cfg->data.val; @@ -442,31 +616,35 @@ 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; } 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); + 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"); + 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; } @@ -477,80 +655,241 @@ int setup_outgoing_meta_socket(conn_list_t *cl) 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; + struct hostent *h; + config_t const *cfg; +cp + if(check_id(name)) + { + syslog(LOG_ERR, _("Invalid name for outgoing connection")); + return -1; + } ncn = new_conn_list(); - ncn->real_ip = ip; + asprintf(&ncn->name, "%s", name); + + if(read_host_config(ncn)) + { + syslog(LOG_ERR, _("Error reading host configuration file for %s")); + free_conn_list(ncn); + return -1; + } + + if(!(cfg = get_config_val(ncn->config, address))) + { + syslog(LOG_ERR, _("No address specified for %s")); + free_conn_list(ncn); + return -1; + } + + if(!(h = gethostbyname(cfg->data.ptr))) + { + syslog(LOG_ERR, _("Error looking up `%s': %m"), cfg->data.ptr); + free_conn_list(ncn); + return -1; + } + ncn->address = ntohl(*((ip_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_conn_list(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); + ncn->want_ping = 0; + conn_list_add(ncn); + + send_id(ncn); +cp return 0; } /* - set up the local sockets (listen only) + Configure conn_list_t myself and set up the local sockets (listen only) */ int setup_myself(void) { config_t const *cfg; - + subnet_t *net; +cp myself = new_conn_list(); - if(!(cfg = get_config_val(myvpnip))) + asprintf(&myself->hostname, "MYSELF"); /* FIXME? Do hostlookup on ourselves? */ + myself->flags = 0; + myself->protocol_version = PROT_CURRENT; + + if(!(cfg = get_config_val(config, tincname))) /* Not acceptable */ { - syslog(LOG_ERR, "No value for my VPN IP given"); + syslog(LOG_ERR, _("Name for tinc daemon required!")); return -1; } + else + asprintf(&myself->name, "%s", (char*)cfg->data.val); - myself->vpn_ip = cfg->data.ip->ip; - myself->vpn_mask = cfg->data.ip->mask; + if(check_id(myself->name)) + { + syslog(LOG_ERR, _("Invalid name for myself!")); + return -1; + } +cp + if(!(cfg = get_config_val(config, privatekey))) + { + syslog(LOG_ERR, _("Private key for tinc daemon required!")); + return -1; + } + else + { + myself->rsa_key = RSA_new(); + BN_hex2bn(&myself->rsa_key->d, cfg->data.ptr); + BN_hex2bn(&myself->rsa_key->e, "FFFF"); + } - if(!(cfg = get_config_val(listenport))) + if(read_host_config(myself)) + { + syslog(LOG_ERR, _("Cannot open host configuration file for myself!")); + return -1; + } +cp + if(!(cfg = get_config_val(myself->config, publickey))) + { + syslog(LOG_ERR, _("Public key for tinc daemon required!")); + return -1; + } + else + { + BN_hex2bn(&myself->rsa_key->n, cfg->data.ptr); + } +/* + if(RSA_check_key(myself->rsa_key) != 1) + { + syslog(LOG_ERR, _("Invalid public/private keypair!")); + return -1; + } +*/ + if(!(cfg = get_config_val(myself->config, port))) myself->port = 655; else myself->port = cfg->data.val; + if((cfg = get_config_val(myself->config, indirectdata))) + if(cfg->data.val == stupid_true) + myself->flags |= EXPORTINDIRECTDATA; + + if((cfg = get_config_val(myself->config, tcponly))) + if(cfg->data.val == stupid_true) + myself->flags |= TCPONLY; + +/* Read in all the subnets specified in the host configuration file */ + + for(cfg = myself->config; (cfg = get_config_val(cfg, subnet)); cfg = 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 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"); + syslog(LOG_ERR, _("Unable to set up an incoming vpn data socket!")); close(myself->meta_socket); return -1; } - myself->status.active = 1; + /* Generate packet encryption key */ + + myself->cipher_pkttype = EVP_bf_cfb(); - syslog(LOG_NOTICE, "Ready: listening on port %d.", myself->port); + myself->cipher_pktkeylength = myself->cipher_pkttype->key_len + myself->cipher_pkttype->iv_len; + myself->cipher_pktkey = (char *)xmalloc(myself->cipher_pktkeylength); + RAND_bytes(myself->cipher_pktkey, myself->cipher_pktkeylength); + + if(!(cfg = get_config_val(config, keyexpire))) + keylifetime = 3600; + else + keylifetime = cfg->data.val; + + keyexpires = time(NULL) + keylifetime; + + /* 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, connectto); + + if(!cfg && upstreamcfg == config) + /* No upstream IP given, we're listen only. */ + return; + + 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, 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; - - if((cfg = get_config_val(pingtimeout)) == NULL) - timeout = 10; +cp + if((cfg = get_config_val(config, pingtimeout)) == NULL) + timeout = 5; else timeout = cfg->data.val; @@ -560,37 +899,28 @@ int setup_network_connections(void) if(setup_myself() < 0) return -1; - if((cfg = get_config_val(upstreamip)) == NULL) + /* Run tinc-up script to further initialize the tap interface */ + execute_script("tinc-up"); + + if(!(cfg = get_config_val(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; - } - else - { - 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); + 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, connectto); /* Or else we try the next ConnectTo line */ } + + signal(SIGALRM, sigalrm_handler); + 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); +cp + return 0; } /* @@ -599,20 +929,11 @@ sigalrm_handler(int a) void close_network_connections(void) { conn_list_t *p; - +cp for(p = conn_list; p != NULL; p = p->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->status.active = 0; + terminate_connection(p); } if(myself) @@ -620,12 +941,19 @@ void close_network_connections(void) { close(myself->meta_socket); close(myself->socket); + free_conn_list(myself); + myself = NULL; } close(tap_fd); + + /* Execute tinc-down script right after shutting down the interface */ + execute_script("tinc-down"); + destroy_conn_list(); - syslog(LOG_NOTICE, "Terminating."); + syslog(LOG_NOTICE, _("Terminating")); +cp return; } @@ -636,38 +964,39 @@ 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)); +cp + if(debug_lvl >= DEBUG_TRAFFIC) + syslog(LOG_DEBUG, _("Opening UDP socket to %s"), cl->hostname); nfd = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP); if(nfd == -1) { - syslog(LOG_ERR, "Creating data socket failed: %m"); + syslog(LOG_ERR, _("Creating UDP 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); + a.sin_addr.s_addr = htonl(cl->address); 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); + syslog(LOG_ERR, _("Connecting to %s port %d failed: %m"), + cl->hostname, 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); + syslog(LOG_ERR, _("This is a bug: %s:%d: %d:%m %s (%s)"), __FILE__, __LINE__, nfd, + cl->name, cl->hostname); return -1; } cl->socket = nfd; cl->status.dataopen = 1; - +cp return 0; } @@ -680,28 +1009,32 @@ conn_list_t *create_new_connection(int sfd) conn_list_t *p; struct sockaddr_in ci; int len = sizeof(ci); - +cp p = new_conn_list(); if(getpeername(sfd, &ci, &len) < 0) { - syslog(LOG_ERR, "Error: getpeername: %m"); + syslog(LOG_ERR, _("System call `%s' failed: %m"), + "getpeername"); 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->meta_socket = sfd; p->status.meta = 1; + p->buffer = xmalloc(MAXBUFSIZE); + p->buflen = 0; + p->last_ping_time = time(NULL); + p->want_ping = 0; + + if(debug_lvl >= DEBUG_CONNECTIONS) + syslog(LOG_NOTICE, _("Connection from %s port %d"), + p->hostname, htons(ci.sin_port)); - syslog(LOG_NOTICE, "Connection from %s:%d", p->hostname, htons(ci.sin_port)); - - if(send_basic_info(p) < 0) - { - free(p); - return NULL; - } - + p->allow_request = ID; +cp return p; } @@ -711,7 +1044,7 @@ conn_list_t *create_new_connection(int sfd) void build_fdset(fd_set *fs) { conn_list_t *p; - +cp FD_ZERO(fs); for(p = conn_list; p != NULL; p = p->next) @@ -725,6 +1058,7 @@ void build_fdset(fd_set *fs) FD_SET(myself->meta_socket, fs); FD_SET(myself->socket, fs); FD_SET(tap_fd, fs); +cp } /* @@ -732,59 +1066,39 @@ 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) +int handle_incoming_vpn_data() { - 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 from; + int lenin; + socklen_t fromlen = sizeof(from); +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); + syslog(LOG_ERR, _("This is a bug: %s:%d: %d:%m"), + __FILE__, __LINE__, myself->socket); return -1; } if(x) { - syslog(LOG_ERR, "Incoming data socket error: %s", sys_errlist[x]); + syslog(LOG_ERR, _("Incoming data socket error: %s"), strerror(x)); return -1; } - rp.len = -1; - lenin = recvfrom(cl->socket, &rp, MTU, 0, NULL, NULL); - if(lenin <= 0) + if((lenin = recvfrom(myself->socket, (char *) &(pkt.len), MTU, 0, &from, &fromlen)) <= 0) { - syslog(LOG_ERR, "Receiving data failed: %m"); + syslog(LOG_ERR, _("Receiving packet failed: %m")); return -1; } - 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); - } - - if(my_key_expiry <= time(NULL)) - regenerate_keys(); - } + if(debug_lvl >= DEBUG_TRAFFIC) + { + syslog(LOG_DEBUG, _("Received packet of %d bytes"), lenin); + } - return 0; +cp + return xrecv(&pkt); } /* @@ -793,81 +1107,99 @@ int handle_incoming_vpn_data(conn_list_t *cl) */ void terminate_connection(conn_list_t *cl) { + conn_list_t *p; + subnet_t *s; +cp if(cl->status.remove) return; - 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); + cl->status.remove = 1; - close(cl->socket); + if(debug_lvl >= DEBUG_CONNECTIONS) + syslog(LOG_NOTICE, _("Closing connection with %s (%s)"), + cl->name, cl->hostname); + + if(cl->socket) + close(cl->socket); if(cl->status.meta) close(cl->meta_socket); - if(cl->status.outgoing) - { - alarm(5); - signal(SIGALRM, sigalrm_handler); - syslog(LOG_NOTICE, "Try to re-establish outgoing connection in 5 seconds."); - } - - cl->status.remove = 1; -} +cp + /* Find all connections that were lost because they were behind cl + (the connection that was dropped). */ -/* - send out a ping request to all active - connections -*/ -int send_broadcast_ping(void) -{ - conn_list_t *p; + if(cl->status.meta) + for(p = conn_list; p != NULL; p = p->next) + if((p->nexthop == cl) && (p != cl)) + terminate_connection(p); /* Sounds like recursion, but p does not have a meta connection :) */ - for(p = conn_list; p != NULL; p = p->next) + /* Inform others of termination if it was still active */ + + if(cl->status.active) + for(p = conn_list; p != NULL; p = p->next) + if(p->status.meta && p->status.active && p!=cl) + send_del_host(p, cl); + + /* Remove the associated subnets */ + + for(s = cl->subnets; s; s = s->next) + subnet_del(s); + + /* Check if this was our outgoing connection */ + + if(cl->status.outgoing && cl->status.active) { - 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; - } - } + signal(SIGALRM, sigalrm_handler); + seconds_till_retry = 5; + alarm(seconds_till_retry); + syslog(LOG_NOTICE, _("Trying to re-establish outgoing connection in 5 seconds")); } - last_ping_time = time(NULL); + /* Inactivate */ - return 0; + 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) { conn_list_t *p; - + time_t now; +cp + now = time(NULL); for(p = conn_list; p != NULL; p = p->next) { - if(p->status.remove) - continue; - if(p->status.active && p->status.meta && p->status.pinged && !p->status.got_pong) + if(p->status.active && p->status.meta) { - 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); + if(p->last_ping_time + timeout < now) + { + if(p->status.pinged && !p->status.got_pong) + { + if(debug_lvl >= DEBUG_PROTOCOL) + syslog(LOG_INFO, _("%s (%s) didn't respond to PING"), + p->name, p->hostname); + p->status.timeout = 1; + terminate_connection(p); + } + else if(p->want_ping) + { + send_ping(p); + p->last_ping_time = now; + p->status.pinged = 1; + p->status.got_pong = 0; + } + } } } - +cp return 0; } @@ -875,70 +1207,28 @@ int check_dead_connections(void) 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; 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]); - - 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; - + conn_list_add(ncn); +cp return 0; } @@ -950,13 +1240,13 @@ void check_network_activity(fd_set *f) { conn_list_t *p; int x, l = sizeof(x); - +cp for(p = conn_list; p != NULL; p = p->next) { if(p->status.remove) continue; -cp - if(p->status.active) + + if(p->status.dataopen) if(FD_ISSET(p->socket, f)) { /* @@ -966,27 +1256,26 @@ cp 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]); + syslog(LOG_ERR, _("Outgoing data socket error for %s (%s): %s"), + p->name, p->hostname, strerror(x)); terminate_connection(p); return; } -cp + 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 + handle_incoming_vpn_data(); + if(FD_ISSET(myself->meta_socket, f)) - handle_new_meta_connection(myself); + handle_new_meta_connection(); cp } @@ -997,98 +1286,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; + } + else /* ethertap */ + { + 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 += lenin; - 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(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); + send_packet(ntohl(*((unsigned long*)(&vp.data[30]))), &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 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(0); + } + + 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 }