/*
net.c -- most of the network code
- Copyright (C) 1998,1999,2000 Ivo Timmermans <itimmermans@bigfoot.com>,
- 2000 Guus Sliepen <guus@sliepen.warande.net>
+ Copyright (C) 1998-2001 Ivo Timmermans <itimmermans@bigfoot.com>,
+ 2000,2001 Guus Sliepen <guus@sliepen.warande.net>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- $Id: net.c,v 1.35.4.33 2000/10/11 10:35:16 guus Exp $
+ $Id: net.c,v 1.35.4.92 2001/01/07 20:19:29 guus Exp $
*/
#include "config.h"
-#include <arpa/inet.h>
#include <errno.h>
#include <fcntl.h>
#include <netdb.h>
#include <stdlib.h>
#include <string.h>
#include <sys/signal.h>
-#include <sys/socket.h>
#include <sys/time.h>
#include <sys/types.h>
#include <syslog.h>
#include <unistd.h>
+#include <sys/ioctl.h>
+/* SunOS really wants sys/socket.h BEFORE net/if.h,
+ and FreeBSD wants these lines below the rest. */
+#include <arpa/inet.h>
+#include <sys/socket.h>
+#include <net/if.h>
+
+#ifdef HAVE_OPENSSL_RAND_H
+# include <openssl/rand.h>
+#else
+# include <rand.h>
+#endif
+
+#ifdef HAVE_OPENSSL_EVP_H
+# include <openssl/evp.h>
+#else
+# include <evp.h>
+#endif
+
+#ifdef HAVE_OPENSSL_ERR_H
+# include <openssl/err.h>
+#else
+# include <err.h>
+#endif
+
+#ifdef HAVE_OPENSSL_PEM_H
+# include <openssl/pem.h>
+#else
+# include <pem.h>
+#endif
+
+#ifdef HAVE_TUNTAP
+#include LINUX_IF_TUN_H
+#endif
#include <utils.h>
#include <xalloc.h>
+#include <avl_tree.h>
+#include <list.h>
#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 "meta.h"
+#include "subnet.h"
#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;
-int upstreamindex = 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)
-{
-cp
- memmove(p->data, p->data + 12, p->len -= 12);
-cp
-}
+char *unknown = NULL;
-/*
- reassemble MAC addresses
-*/
-void add_mac_addresses(vpn_packet_t *p)
-{
-cp
- memcpy(p->data + 12, p->data, p->len);
- p->len += 12;
- p->data[0] = p->data[6] = 0xfe;
- p->data[1] = p->data[7] = 0xfd;
- /* Really evil pointer stuff just below! */
- *((ip_t*)(&p->data[2])) = (ip_t)(htonl(myself->real_ip));
- *((ip_t*)(&p->data[8])) = *((ip_t*)(&p->data[26]));
-cp
-}
+subnet_t mymac;
-int xsend(conn_list_t *cl, vpn_packet_t *inpkt)
+int xsend(connection_t *cl, vpn_packet_t *inpkt)
{
vpn_packet_t outpkt;
int outlen, outpad;
+ EVP_CIPHER_CTX ctx;
+ struct sockaddr_in to;
+ socklen_t tolen = sizeof(to);
cp
outpkt.len = inpkt->len;
- EVP_EncryptInit(cl->cipher_pktctx, cl->cipher_pkttype, cl->cipher_pktkey, cl->cipher_pktiv);
- EVP_EncryptUpdate(cl->cipher_pktctx, outpkt.data, &outlen, inpkt->data, inpkt->len);
- EVP_EncryptFinal(cl->cipher_pktctx, outpkt.data + outlen, &outpad);
- outlen += outpad;
- if(debug_lvl > 3)
+ /* Encrypt the packet. FIXME: we should use CBC, not CFB. */
+
+ 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);
total_socket_out += outlen;
- cl->want_ping = 1;
+ to.sin_family = AF_INET;
+ to.sin_addr.s_addr = htonl(cl->address);
+ to.sin_port = htons(cl->port);
- if((send(cl->socket, (char *) &(outpkt.len), outlen + 2, 0)) < 0)
+ if((sendto(myself->socket, (char *) &(outpkt.len), outlen, 0, (const struct sockaddr *)&to, tolen)) < 0)
{
syslog(LOG_ERR, _("Error sending packet to %s (%s): %m"),
cl->name, cl->hostname);
return 0;
}
-int xrecv(vpn_packet_t *inpkt)
+int xrecv(connection_t *cl, vpn_packet_t *inpkt)
{
vpn_packet_t outpkt;
int outlen, outpad;
+ EVP_CIPHER_CTX ctx;
cp
- if(debug_lvl > 3)
- syslog(LOG_ERR, _("Receiving packet of %d bytes"),
- inpkt->len);
-
outpkt.len = inpkt->len;
- EVP_DecryptInit(myself->cipher_pktctx, myself->cipher_pkttype, myself->cipher_pktkey, myself->cipher_pktiv);
- EVP_DecryptUpdate(myself->cipher_pktctx, outpkt.data, &outlen, inpkt->data, inpkt->len);
- /* FIXME: grok DecryptFinal
- EVP_DecryptFinal(myself->cipher_pktctx, outpkt.data + outlen, &outpad);
- */
-
- add_mac_addresses(&outpkt);
-
- if(write(tap_fd, outpkt.data, outpkt.len) < 0)
- syslog(LOG_ERR, _("Can't write to tap device: %m"));
- else
- total_tap_out += outpkt.len;
-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)
-{
- queue_element_t *e;
-cp
- e = xmalloc(sizeof(*e));
- e->packet = xmalloc(s);
- memcpy(e->packet, packet, s);
-
- if(!*q)
- {
- *q = xmalloc(sizeof(**q));
- (*q)->head = (*q)->tail = NULL;
- }
- e->next = NULL; /* We insert at the tail */
+ /* Decrypt the packet */
- 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
-}
-
-/* Remove a queue element */
-void del_queue(packet_queue_t **q, queue_element_t *e)
-{
-cp
- free(e->packet);
+ 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;
- 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);
+/* Bypass
+ outlen = outpkt.len+2;
+ memcpy(&outpkt, inpkt, outlen);
+*/
cp
+ return receive_packet(cl, &outpkt);
}
-/*
- 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*))
+int receive_packet(connection_t *cl, vpn_packet_t *packet)
{
- queue_element_t *p, *next = NULL;
-cp
- for(p = (*pq)->head; p != NULL; )
- {
- next = p->next;
+ if(debug_lvl >= DEBUG_TRAFFIC)
+ syslog(LOG_ERR, _("Writing packet of %d bytes to tap device"),
+ packet->len);
- if(!function(cl, p->packet))
- del_queue(pq, p);
-
- p = next;
- }
+ /* Fix mac address */
- if(debug_lvl > 3)
- syslog(LOG_DEBUG, _("Queue flushed"));
-cp
-}
+ memcpy(packet->data, mymac.net.mac.address.x, 6);
-/*
- 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(taptype == TAP_TYPE_TUNTAP)
{
- if(debug_lvl > 3)
- syslog(LOG_DEBUG, _("Flushing send queue for %s (%s)"),
- cl->name, cl->hostname);
- 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;
}
-
- if(cl->rq)
+ else /* ethertap */
{
- if(debug_lvl > 3)
- syslog(LOG_DEBUG, _("Flushing receive queue for %s (%s)"),
- cl->name, cl->hostname);
- 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 + 2;
}
cp
+ return 0;
}
/*
*/
int send_packet(ip_t to, vpn_packet_t *packet)
{
- conn_list_t *cl;
+ connection_t *cl;
+ subnet_t *subnet;
cp
- if((cl = lookup_conn(to)) == NULL)
+ if((subnet = lookup_subnet_ipv4(&to)) == NULL)
{
- if(debug_lvl > 3)
+ if(debug_lvl >= DEBUG_TRAFFIC)
{
syslog(LOG_NOTICE, _("Trying to look up %d.%d.%d.%d in connection list failed!"),
IP_ADDR_V(to));
}
return -1;
- }
-
- /* If we ourselves have indirectdata flag set, we should send only to our uplink! */
-
- /* The next few lines will be obsoleted, if we are going indirect, matching subnet_t
- should point to only our uplink as the recepient
- */
-
- if(myself->flags & EXPORTINDIRECTDATA)
- {
- for(cl = conn_list; cl != NULL && !cl->status.outgoing; cl = cl->next);
- if(!cl)
- { /* No open outgoing connection has been found. */
- if(debug_lvl > 3)
- syslog(LOG_NOTICE, _("There is no remote host I can send this packet to!"));
- return -1;
- }
}
- else
- /* If indirectdata flag is set for the destination we just looked up,
- * then real_ip is actually the vpn_ip of the gateway tincd
- * it is behind.
- */
-
- if(cl->flags & INDIRECTDATA)
- {
- if(debug_lvl > 3)
- syslog(LOG_NOTICE, _("Indirect packet to %s via %s"),
- cl->name, cl->hostname);
- if((cl = lookup_conn(cl->real_ip)) == NULL)
- {
- if(debug_lvl > 3)
- syslog(LOG_NOTICE, _("Indirect look up %d.%d.%d.%d in connection list failed!"), IP_ADDR_V(to));
-
- /* Gateway tincd dead? Should we kill it? (GS) */
-
- return -1;
- }
- if(cl->flags & INDIRECTDATA) /* This should not happen */
+ cl = subnet->owner;
+
+ if(cl == myself)
+ {
+ if(debug_lvl >= DEBUG_TRAFFIC)
{
- if(debug_lvl > 3)
- syslog(LOG_NOTICE, _("Double indirection for %d.%d.%d.%d"), IP_ADDR_V(to));
- return -1;
+ syslog(LOG_NOTICE, _("Packet with destination %d.%d.%d.%d is looping back to us!"),
+ IP_ADDR_V(to));
}
- }
- if(my_key_expiry <= time(NULL))
- regenerate_keys();
+ return -1;
+ }
- if(!cl->status.dataopen)
- if(setup_vpn_connection(cl) < 0)
- {
- syslog(LOG_ERR, _("Could not open UDP connection to %s (%s)"),
+ if(!cl->status.active)
+ {
+ if(debug_lvl >= DEBUG_TRAFFIC)
+ syslog(LOG_INFO, _("%s (%s) is not active, dropping packet"),
cl->name, cl->hostname);
- return -1;
- }
-
+
+ return 0;
+ }
+
if(!cl->status.validkey)
{
- if(debug_lvl > 3)
+ 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);
+
+ list_insert_tail(cl->queue, packet);
+
if(!cl->status.waitingforkey)
send_req_key(myself, cl); /* Keys should be sent to the host running the tincd */
return 0;
}
- if(!cl->status.active)
+ /* Check if it has to go via UDP or TCP... */
+cp
+ if(cl->options & OPTION_TCPONLY)
+ return send_tcppacket(cl, packet);
+ else
+ return xsend(cl, packet);
+}
+
+void flush_queue(connection_t *cl)
+{
+ list_node_t *node, *next;
+
+ if(debug_lvl >= DEBUG_TRAFFIC)
+ syslog(LOG_INFO, _("Flushing queue for %s (%s)"), cl->name, cl->hostname);
+
+ for(node = cl->queue->head; node; node = next)
{
- if(debug_lvl > 3)
- syslog(LOG_INFO, _("%s (%s) is not ready, queueing packet"),
- cl->name, cl->hostname);
- add_queue(&(cl->sq), packet, packet->len + 2);
- return 0; /* We don't want to mess up, do we? */
+ next = node->next;
+ xsend(cl, (vpn_packet_t *)node->data);
+ list_delete_node(cl->queue, node);
}
-
- /* can we send it? can we? can we? huh? */
-cp
- return xsend(cl, packet);
}
/*
int nfd;
const char *tapfname;
config_t const *cfg;
+#ifdef HAVE_LINUX
+# ifdef HAVE_TUNTAP
+ struct ifreq ifr;
+# endif
+#endif
+
cp
- if((cfg = get_config_val(tapdevice)) == NULL)
- tapfname = "/dev/tap0";
- else
+ if((cfg = get_config_val(config, config_tapdevice)))
tapfname = cfg->data.ptr;
-
+ else
+ {
+#ifdef HAVE_LINUX
+# ifdef HAVE_TUNTAP
+ tapfname = "/dev/misc/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);
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;
}
if(setsockopt(nfd, SOL_SOCKET, SO_REUSEADDR, &one, sizeof(one)))
{
- syslog(LOG_ERR, _("setsockopt: %m"));
+ close(nfd);
+ syslog(LOG_ERR, _("System call `%s' failed: %m"),
+ "setsockopt");
return -1;
}
if(setsockopt(nfd, SOL_SOCKET, SO_KEEPALIVE, &one, sizeof(one)))
{
- syslog(LOG_ERR, _("setsockopt: %m"));
+ close(nfd);
+ 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"));
+ close(nfd);
+ syslog(LOG_ERR, _("System call `%s' failed: %m"),
+ "fcntl");
return -1;
}
- if((cfg = get_config_val(interface)))
+ if((cfg = get_config_val(config, config_interface)))
{
if(setsockopt(nfd, SOL_SOCKET, SO_KEEPALIVE, 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;
}
a.sin_family = AF_INET;
a.sin_port = htons(port);
- if((cfg = get_config_val(interfaceip)))
- a.sin_addr.s_addr = htonl(cfg->data.ip->ip);
+ 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)))
{
+ 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
cp
if((nfd = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP)) < 0)
{
+ 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"));
+ close(nfd);
+ 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"));
+ close(nfd);
+ syslog(LOG_ERR, _("System call `%s' failed: %m"),
+ "fcntl");
return -1;
}
if(bind(nfd, (struct sockaddr *)&a, sizeof(struct sockaddr)))
{
+ close(nfd);
syslog(LOG_ERR, _("Can't bind to port %hd/udp: %m"), port);
return -1;
}
/*
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;
cp
- if(debug_lvl > 0)
+ 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;
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;
+ }
+
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)
{
+ 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)
{
+ close(cl->meta_socket);
syslog(LOG_ERR, _("fcntl for %s port %d: %m"),
cl->hostname, cl->port);
return -1;
}
- if(debug_lvl > 0)
+ 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(char *hostname)
+int setup_outgoing_connection(char *name)
{
- conn_list_t *ncn;
+ connection_t *ncn;
struct hostent *h;
+ config_t const *cfg;
cp
- if(!(h = gethostbyname(hostname)))
+ 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 looking up `%s': %m"), hostname);
+ 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 = ntohl(*((ip_t*)(h->h_addr_list[0])));
- ncn->hostname = hostlookup(htonl(ncn->real_ip));
+ 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 to %s"),
ncn->hostname);
- free_conn_element(ncn);
+ 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;
+ void *result;
+cp
+ if(!cl->rsa_key)
+ cl->rsa_key = RSA_new();
+
+ 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");
+ }
+ else 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;
+ }
+ }
+ else
+ return -1;
+ }
+ else
+ {
+ syslog(LOG_ERR, _("No public key for %s specified!"), cl->name);
+ return -1;
+ }
+cp
+ return 0;
+}
+
+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_conn_list();
+ myself = new_connection();
- myself->hostname = "MYSELF"; /* FIXME? */
+ asprintf(&myself->hostname, "MYSELF");
myself->flags = 0;
+ myself->protocol_version = PROT_CURRENT;
- if(!(cfg = get_config_val(tincname))) /* Not acceptable */
+ if(!(cfg = get_config_val(config, config_name))) /* Not acceptable */
{
syslog(LOG_ERR, _("Name for tinc daemon required!"));
return -1;
}
else
- myself->name = (char*)cfg->data.val;
-
- if(!(cfg = get_config_val(listenport)))
+ 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(read_host_config(myself))
+ {
+ syslog(LOG_ERR, _("Cannot open host configuration file for myself!"));
+ return -1;
+ }
+
+ if(read_rsa_public_key(myself))
+ return -1;
+cp
+
+/*
+ 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(indirectdata)))
+ if((cfg = get_config_val(myself->config, config_indirectdata)))
if(cfg->data.val == stupid_true)
myself->flags |= EXPORTINDIRECTDATA;
- if((cfg = get_config_val(tcponly)))
+ if((cfg = get_config_val(myself->config, config_tcponly)))
if(cfg->data.val == stupid_true)
myself->flags |= 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->cipher_pkttype = EVP_bf_cfb();
+
+ 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, 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;
+ }
+ /* Activate ourselves */
myself->status.active = 1;
{
config_t const *cfg;
cp
- cfg = get_next_config_val(upstreamip, upstreamindex++);
+ cfg = get_config_val(upstreamcfg, config_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_next_config_val(upstreamip, upstreamindex++); /* Or else we try the next ConnectTo line */
+ cfg = get_config_val(upstreamcfg, config_connectto); /* Or else we try the next ConnectTo line */
}
signal(SIGALRM, sigalrm_handler);
- upstreamindex = 0;
+ upstreamcfg = config;
seconds_till_retry += 5;
if(seconds_till_retry > MAXTIMEOUT) /* Don't wait more than MAXTIMEOUT seconds. */
seconds_till_retry = MAXTIMEOUT;
{
config_t const *cfg;
cp
- if((cfg = get_config_val(pingtimeout)) == NULL)
- timeout = 5;
+ init_connections();
+ init_subnets();
+
+ 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_next_config_val(upstreamip, upstreamindex++)) == NULL)
+ if(!(cfg = get_config_val(config, config_connectto)))
/* No upstream IP given, we're listen only. */
return 0;
while(cfg)
{
+ upstreamcfg = cfg->next;
if(!setup_outgoing_connection(cfg->data.ptr)) /* function returns 0 when there are no problems */
return 0;
- cfg = get_next_config_val(upstreamip, upstreamindex++); /* Or else we try the next ConnectTo line */
+ cfg = get_config_val(upstreamcfg, config_connectto); /* Or else we try the next ConnectTo line */
}
signal(SIGALRM, sigalrm_handler);
- upstreamindex = 0;
+ 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);
*/
void close_network_connections(void)
{
- conn_list_t *p;
+ avl_node_t *node;
+ connection_t *p;
cp
- for(p = conn_list; p != NULL; p = p->next)
+ 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.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"));
+ /* Execute tinc-down script right after shutting down the interface */
+ execute_script("tinc-down");
+
+ destroy_connection_tree();
cp
return;
}
/*
create a data (udp) socket
+ OBSOLETED: use only one listening socket for compatibility with non-Linux operating systems
*/
-int setup_vpn_connection(conn_list_t *cl)
+int setup_vpn_connection(connection_t *cl)
{
int nfd, flags;
struct sockaddr_in a;
+ const int one = 1;
cp
- if(debug_lvl > 0)
+ if(debug_lvl >= DEBUG_TRAFFIC)
syslog(LOG_DEBUG, _("Opening UDP socket to %s"), cl->hostname);
nfd = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
return -1;
}
+ if(setsockopt(nfd, SOL_SOCKET, SO_REUSEADDR, &one, sizeof(one)))
+ {
+ close(nfd);
+ 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)
+ {
+ close(nfd);
+ syslog(LOG_ERR, _("System call `%s' failed: %m"),
+ "fcntl");
+ return -1;
+ }
+
+ memset(&a, 0, sizeof(a));
+ a.sin_family = AF_INET;
+ a.sin_port = htons(myself->port);
+ a.sin_addr.s_addr = htonl(INADDR_ANY);
+
+ if(bind(nfd, (struct sockaddr *)&a, sizeof(struct sockaddr)))
+ {
+ close(nfd);
+ syslog(LOG_ERR, _("Can't bind to port %hd/udp: %m"), myself->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(nfd, (struct sockaddr *)&a, sizeof(a)) == -1)
{
+ close(nfd);
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)
{
+ close(nfd);
syslog(LOG_ERR, _("This is a bug: %s:%d: %d:%m %s (%s)"), __FILE__, __LINE__, nfd,
cl->name, cl->hostname);
return -1;
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_conn_list();
+ p = 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");
return NULL;
}
- p->real_ip = ntohl(ci.sin_addr.s_addr);
+ p->name = unknown;
+ p->address = ntohl(ci.sin_addr.s_addr);
p->hostname = hostlookup(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);
- p->want_ping = 0;
- if(debug_lvl > 0)
+ if(debug_lvl >= DEBUG_CONNECTIONS)
syslog(LOG_NOTICE, _("Connection from %s port %d"),
p->hostname, htons(ci.sin_port));
- if(send_basic_info(p) < 0)
- {
- free_conn_element(p);
- return NULL;
- }
+ p->allow_request = ID;
cp
return p;
}
*/
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
}
udp socket and write it to the ethertap
device after being decrypted
*/
-int handle_incoming_vpn_data()
+int handle_incoming_vpn_data(void)
{
vpn_packet_t pkt;
- int lenin;
int x, l = sizeof(x);
+ int lenin;
+ struct sockaddr_in from;
+ socklen_t fromlen = sizeof(from);
+ connection_t *cl;
cp
if(getsockopt(myself->socket, SOL_SOCKET, SO_ERROR, &x, &l) < 0)
{
return -1;
}
- if(recvfrom(myself->socket, (char *) &(pkt.len), MTU, 0, NULL, NULL) <= 0)
+ if((lenin = recvfrom(myself->socket, (char *) &(pkt.len), MTU, 0, (struct sockaddr *)&from, &fromlen)) <= 0)
{
syslog(LOG_ERR, _("Receiving packet failed: %m"));
return -1;
}
+ cl = lookup_connection(ntohl(from.sin_addr.s_addr), ntohs(from.sin_port));
+
+ 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 0;
+ }
+
+ if(debug_lvl >= DEBUG_TRAFFIC)
+ {
+ syslog(LOG_DEBUG, _("Received packet of %d bytes from %s (%s)"), lenin,
+ cl->name, cl->hostname);
+ }
+
cp
- return xrecv(&pkt);
+ return xrecv(cl, &pkt);
}
/*
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)
{
- conn_list_t *p;
-
+ connection_t *p;
+ subnet_t *subnet;
+ avl_node_t *node, *next;
cp
if(cl->status.remove)
return;
- if(debug_lvl > 0)
+ cl->status.remove = 1;
+
+ 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);
- */
if(cl->socket)
close(cl->socket);
if(cl->status.meta)
close(cl->meta_socket);
- cl->status.remove = 1;
-
- /* If this cl isn't active, don't send any DEL_HOSTs. */
- if(cl->status.active)
- notify_others(cl,NULL,send_del_host);
-
-cp
/* Find all connections that were lost because they were behind cl
(the connection that was dropped). */
+
if(cl->status.meta)
- for(p = conn_list; p != NULL; p = p->next)
+ for(node = connection_tree->head; node; node = node->next)
{
- if((p->nexthop == cl) && (p != cl))
- {
- if(cl->status.active && p->status.active)
- notify_others(p,cl,send_del_host);
- if(cl->socket)
- close(cl->socket);
- p->status.active = 0;
- p->status.remove = 1;
- }
+ 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 :) */
+ }
+
+ /* Remove the associated subnets */
+
+ for(node = cl->subnet_tree->head; node; node = next)
+ {
+ next = node->next;
+ subnet = (subnet_t *)node->data;
+ subnet_del(subnet);
+ }
+
+ /* Check if this was our outgoing connection */
- cl->status.active = 0;
-
- if(cl->status.outgoing)
+ if(cl->status.outgoing && cl->status.active)
{
signal(SIGALRM, sigalrm_handler);
seconds_till_retry = 5;
alarm(seconds_till_retry);
syslog(LOG_NOTICE, _("Trying to re-establish outgoing connection in 5 seconds"));
}
+
+ /* Inactivate */
+
+ cl->status.active = 0;
cp
}
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)
- {
- if(p->last_ping_time + timeout < now)
+ cl = (connection_t *)node->data;
+ if(cl->status.active && cl->status.meta)
+ {
+ if(cl->last_ping_time + timeout < now)
{
- if(p->status.pinged && !p->status.got_pong)
+ if(cl->status.pinged)
{
- if(debug_lvl > 1)
+ 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);
+ cl->name, cl->hostname);
+ cl->status.timeout = 1;
+ terminate_connection(cl);
}
- else if(p->want_ping)
+ else
{
- send_ping(p);
- p->last_ping_time = now;
- p->status.pinged = 1;
- p->status.got_pong = 0;
+ send_ping(cl);
}
}
- }
+ }
}
cp
- return 0;
}
/*
*/
int handle_new_meta_connection()
{
- conn_list_t *ncn;
+ connection_t *ncn;
struct sockaddr client;
int nfd, len = sizeof(client);
cp
return 0;
}
- ncn->status.meta = 1;
- ncn->next = conn_list;
- conn_list = ncn;
+ connection_add(ncn);
cp
return 0;
}
*/
void check_network_activity(fd_set *f)
{
- conn_list_t *p;
- int x, l = sizeof(x);
+ connection_t *p;
+ avl_node_t *node;
cp
- for(p = conn_list; p != NULL; p = p->next)
+ if(FD_ISSET(myself->socket, f))
+ handle_incoming_vpn_data();
+
+ for(node = connection_tree->head; node; node = node->next)
{
+ p = (connection_t *)node->data;
+
if(p->status.remove)
- continue;
-
- if(p->status.dataopen)
- 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 for %s (%s): %s"),
- p->name, p->hostname, strerror(x));
- terminate_connection(p);
- return;
- }
+ return;
if(p->status.meta)
if(FD_ISSET(p->meta_socket, f))
return;
}
}
-
- if(FD_ISSET(myself->socket, f))
- handle_incoming_vpn_data();
-
+
if(FD_ISSET(myself->meta_socket, f))
handle_new_meta_connection();
cp
void handle_tap_input(void)
{
vpn_packet_t vp;
- ip_t from, to;
- int ether_type, lenin;
+ int lenin;
cp
- memset(&vp, 0, sizeof(vp));
- if((lenin = read(tap_fd, &vp, MTU)) <= 0)
+ 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 > 3)
- syslog(LOG_INFO, _("Non-IP ethernet frame %04x from %02x:%02x:%02x:%02x:%02x:%02x"), ether_type, MAC_ADDR_V(vp.data[6]));
- return;
- }
-
if(lenin < 32)
{
- if(debug_lvl > 3)
- syslog(LOG_INFO, _("Dropping short packet from %02x:%02x:%02x:%02x:%02x:%02x"), MAC_ADDR_V(vp.data[6]));
+ 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])));
-
- vp.len = (length_t)lenin - 2;
-
- strip_mac_addresses(&vp);
+ if(debug_lvl >= DEBUG_TRAFFIC)
+ {
+ syslog(LOG_DEBUG, _("Read packet of length %d from tap device"), vp.len);
+ }
- send_packet(to, &vp);
+ send_packet(ntohl(*((unsigned long*)(&vp.data[30]))), &vp);
cp
}
struct timeval tv;
int r;
time_t last_ping_check;
+ int t;
cp
last_ping_check = time(NULL);
tv.tv_sec = timeout;
tv.tv_usec = 0;
- prune_conn_list();
+ prune_connection_tree();
build_fdset(&fset);
if((r = select(FD_SETSIZE, &fset, NULL, NULL, &tv)) < 0)
if(sighup)
{
+ syslog(LOG_INFO, _("Rereading configuration file and restarting in 5 seconds"));
sighup = 0;
- if(debug_lvl > 1)
- syslog(LOG_INFO, _("Rereading configuration file"));
close_network_connections();
- clear_config();
- if(read_config_file(configfilename))
+ clear_config(&config);
+
+ if(read_server_config())
{
syslog(LOG_ERR, _("Unable to reread configuration file, exiting"));
exit(0);
}
+
sleep(5);
- setup_network_connections();
+
+ if(setup_network_connections())
+ return;
+
continue;
}
- if(last_ping_check + timeout < time(NULL))
- /* Let's check if everybody is still alive */
+ t = time(NULL);
+
+ /* Let's check if everybody is still alive */
+
+ if(last_ping_check + timeout < t)
{
check_dead_connections();
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;
+ }
}
if(r > 0)
projects / tinc / blobdiff