/*
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.48 2000/10/28 21:25:20 guus Exp $
+ $Id: net.c,v 1.35.4.136 2001/10/08 13:37:30 guus Exp $
*/
#include "config.h"
-#include <arpa/inet.h>
#include <errno.h>
#include <fcntl.h>
-#include <linux/sockios.h>
-#include <net/if.h>
#include <netdb.h>
#include <netinet/in.h>
+#ifdef HAVE_LINUX
+ #include <netinet/ip.h>
+ #include <netinet/tcp.h>
+#endif
#include <stdio.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>
+
+#include <openssl/rand.h>
+#include <openssl/evp.h>
+#include <openssl/pem.h>
+
+#ifndef HAVE_RAND_PSEUDO_BYTES
+#define RAND_pseudo_bytes RAND_bytes
+#endif
#ifdef HAVE_TUNTAP
-#include LINUX_IF_TUN_H
+ #ifdef HAVE_LINUX
+ #ifdef LINUX_IF_TUN_H
+ #include LINUX_IF_TUN_H
+ #else
+ #include <linux/if_tun.h>
+ #endif
+ #else
+ #include <net/if_tun.h>
+ #endif
+#endif
+
+#ifdef HAVE_SOLARIS
+ #include <sys/sockio.h>
+ #include <sys/stropts.h>
+ #include <net/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 "process.h"
+#include "route.h"
#include "system.h"
int total_socket_in = 0;
int total_socket_out = 0;
-config_t *upstreamcfg;
-static int seconds_till_retry;
+int seconds_till_retry = 5;
-char *unknown = NULL;
+int keylifetime = 0;
+int keyexpires = 0;
-/*
- strip off the MAC adresses of an ethernet frame
-*/
-void strip_mac_addresses(vpn_packet_t *p)
+void send_udppacket(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);
+ vpn_packet_t *copy;
cp
- memmove(p->data, p->data + 12, p->len -= 12);
+ if(!cl->status.validkey)
+ {
+ if(debug_lvl >= DEBUG_TRAFFIC)
+ syslog(LOG_INFO, _("No valid key known yet for %s (%s), queueing packet"),
+ cl->name, cl->hostname);
+
+ /* Since packet is on the stack of handle_tap_input(),
+ we have to make a copy of it first. */
+
+ copy = xmalloc(sizeof(vpn_packet_t));
+ memcpy(copy, inpkt, sizeof(vpn_packet_t));
+
+ list_insert_tail(cl->queue, copy);
+
+ if(!cl->status.waitingforkey)
+ send_req_key(myself, cl);
+ return;
+ }
+
+ /* Encrypt the packet. */
+
+ RAND_pseudo_bytes(inpkt->salt, sizeof(inpkt->salt));
+
+ 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;
+
+ total_socket_out += outlen;
+
+ to.sin_family = AF_INET;
+ to.sin_addr.s_addr = htonl(cl->address);
+ to.sin_port = htons(cl->port);
+
+ if((sendto(myself->socket, (char *) outpkt.salt, outlen, 0, (const struct sockaddr *)&to, tolen)) < 0)
+ {
+ syslog(LOG_ERR, _("Error sending packet to %s (%s): %m"),
+ cl->name, cl->hostname);
+ return;
+ }
cp
}
-/*
- reassemble MAC addresses
-*/
-void add_mac_addresses(vpn_packet_t *p)
+void receive_packet(connection_t *cl, vpn_packet_t *packet)
{
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->address));
- *((ip_t*)(&p->data[8])) = *((ip_t*)(&p->data[26]));
+ if(debug_lvl >= DEBUG_TRAFFIC)
+ syslog(LOG_DEBUG, _("Received packet of %d bytes from %s (%s)"), packet->len, cl->name, cl->hostname);
+
+ route_incoming(cl, packet);
cp
}
-int xsend(conn_list_t *cl, vpn_packet_t *inpkt)
+void receive_udppacket(connection_t *cl, vpn_packet_t *inpkt)
{
vpn_packet_t outpkt;
int outlen, outpad;
+ EVP_CIPHER_CTX ctx;
cp
- outpkt.len = inpkt->len;
-/*
- EVP_EncryptInit(cl->cipher_pktctx, cl->cipher_pkttype, cl->cipher_pktkey, NULL);
- EVP_EncryptUpdate(cl->cipher_pktctx, outpkt.data, &outlen, inpkt->data, inpkt->len);
- EVP_EncryptFinal(cl->cipher_pktctx, outpkt.data + outlen, &outpad);
- outlen += outpad + 2;
-
- Do encryption when everything else is fixed...
-*/
- 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);
+ /* Decrypt the packet */
- total_socket_out += outlen;
+ 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);
- cl->want_ping = 1;
+ total_socket_in += outlen;
- 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;
- }
+ receive_packet(cl, &outpkt);
cp
- return 0;
}
-int xrecv(vpn_packet_t *inpkt)
+void receive_tcppacket(connection_t *cl, char *buffer, int len)
{
vpn_packet_t outpkt;
- int outlen, outpad;
cp
- outpkt.len = inpkt->len;
-/*
- EVP_DecryptInit(myself->cipher_pktctx, myself->cipher_pkttype, myself->cipher_pktkey, NULL);
- EVP_DecryptUpdate(myself->cipher_pktctx, outpkt.data, &outlen, inpkt->data, inpkt->len);
- EVP_DecryptFinal(myself->cipher_pktctx, outpkt.data + outlen, &outpad);
- outlen += outpad;
+ outpkt.len = len;
+ memcpy(outpkt.data, buffer, len);
- Do decryption is everything else is fixed...
-*/
- outlen = outpkt.len+2;
- memcpy(&outpkt, inpkt, outlen);
-
- /* FIXME sometime
- add_mac_addresses(&outpkt);
- */
+ receive_packet(cl, &outpkt);
+cp
+}
+void accept_packet(vpn_packet_t *packet)
+{
+cp
+ if(debug_lvl >= DEBUG_TRAFFIC)
+ syslog(LOG_DEBUG, _("Writing packet of %d bytes to tap device"),
+ packet->len);
+
+#ifdef HAVE_SOLARIS
+ if(write(tap_fd, packet->data + 14, packet->len - 14) < 0)
+ syslog(LOG_ERR, _("Can't write to tun/tap device: %m"));
+ else
+ total_tap_out += packet->len;
+#else
if(taptype == TAP_TYPE_TUNTAP)
{
- if(write(tap_fd, outpkt.data, outpkt.len) < 0)
+ if(write(tap_fd, packet->data, packet->len) < 0)
syslog(LOG_ERR, _("Can't write to tun/tap device: %m"));
else
- total_tap_out += outpkt.len;
+ total_tap_out += packet->len;
}
else /* ethertap */
{
- if(write(tap_fd, outpkt.data - 2, outpkt.len + 2) < 0)
+ 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 += outpkt.len + 2;
+ total_tap_out += packet->len;
}
+#endif
cp
- return 0;
}
/*
- add the given packet of size s to the
- queue q, be it the send or receive queue
+ send a packet to the given vpn ip.
*/
-void add_queue(packet_queue_t **q, void *packet, size_t s)
+void send_packet(connection_t *cl, vpn_packet_t *packet)
{
- queue_element_t *e;
+ connection_t *via;
cp
- e = xmalloc(sizeof(*e));
- e->packet = xmalloc(s);
- memcpy(e->packet, packet, s);
+ if(debug_lvl >= DEBUG_TRAFFIC)
+ syslog(LOG_ERR, _("Sending packet of %d bytes to %s (%s)"),
+ packet->len, cl->name, cl->hostname);
- if(!*q)
+ if(cl == myself)
{
- *q = xmalloc(sizeof(**q));
- (*q)->head = (*q)->tail = NULL;
- }
-
- e->next = NULL; /* We insert at the tail */
+ if(debug_lvl >= DEBUG_TRAFFIC)
+ {
+ syslog(LOG_NOTICE, _("Packet is looping back to us!"));
+ }
- if((*q)->tail) /* Do we have a tail? */
- {
- (*q)->tail->next = e;
- e->prev = (*q)->tail;
+ return;
}
- else /* No tail -> no head too */
+
+ if(!cl->status.active)
{
- (*q)->head = e;
- e->prev = NULL;
+ if(debug_lvl >= DEBUG_TRAFFIC)
+ syslog(LOG_INFO, _("%s (%s) is not active, dropping packet"),
+ cl->name, cl->hostname);
+
+ return;
}
- (*q)->tail = e;
-cp
-}
+ if(cl->via == myself)
+ via = cl->nexthop;
+ else
+ via = cl->via;
-/* Remove a queue element */
-void del_queue(packet_queue_t **q, queue_element_t *e)
-{
-cp
- free(e->packet);
+ if(via != cl && debug_lvl >= DEBUG_TRAFFIC)
+ syslog(LOG_ERR, _("Sending packet to %s via %s (%s)"),
+ cl->name, via->name, via->hostname);
- if(e->next) /* There is a successor, so we are not tail */
+ if((myself->options | via->options) & OPTION_TCPONLY)
{
- if(e->prev) /* There is a predecessor, so we are not head */
- {
- e->next->prev = e->prev;
- e->prev->next = e->next;
- }
- else /* We are head */
- {
- e->next->prev = NULL;
- (*q)->head = e->next;
- }
- }
- else /* We are tail (or all alone!) */
- {
- if(e->prev) /* We are not alone :) */
- {
- e->prev->next = NULL;
- (*q)->tail = e->prev;
- }
- else /* Adieu */
- {
- free(*q);
- *q = NULL;
- }
+ if(send_tcppacket(via, packet))
+ terminate_connection(via, 1);
}
-
- free(e);
-cp
+ else
+ send_udppacket(via, packet);
}
-/*
- flush a queue by calling function for
- each packet, and removing it when that
- returned a zero exit code
-*/
-void flush_queue(conn_list_t *cl, packet_queue_t **pq,
- int (*function)(conn_list_t*,void*))
-{
- queue_element_t *p, *next = NULL;
-cp
- for(p = (*pq)->head; p != NULL; )
- {
- next = p->next;
+/* Broadcast a packet to all active direct connections */
- if(!function(cl, p->packet))
- del_queue(pq, p);
-
- p = next;
- }
-
- if(debug_lvl >= DEBUG_TRAFFIC)
- syslog(LOG_DEBUG, _("Queue flushed"));
-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 broadcast_packet(connection_t *from, vpn_packet_t *packet)
{
+ avl_node_t *node;
+ connection_t *cl;
cp
- if(cl->sq)
- {
- if(debug_lvl >= DEBUG_TRAFFIC)
- syslog(LOG_DEBUG, _("Flushing send queue for %s (%s)"),
- cl->name, cl->hostname);
- flush_queue(cl, &(cl->sq), xsend);
- }
+ if(debug_lvl >= DEBUG_TRAFFIC)
+ syslog(LOG_INFO, _("Broadcasting packet of %d bytes from %s (%s)"),
+ packet->len, from->name, from->hostname);
- if(cl->rq)
+ for(node = connection_tree->head; node; node = node->next)
{
- if(debug_lvl >= DEBUG_TRAFFIC)
- syslog(LOG_DEBUG, _("Flushing receive queue for %s (%s)"),
- cl->name, cl->hostname);
- flush_queue(cl, &(cl->rq), xrecv);
+ cl = (connection_t *)node->data;
+ if(cl->status.active && cl != from)
+ send_packet(cl, packet);
}
cp
}
-/*
- send a packet to the given vpn ip.
-*/
-int send_packet(ip_t to, vpn_packet_t *packet)
+void flush_queue(connection_t *cl)
{
- conn_list_t *cl;
- subnet_t *subnet;
+ list_node_t *node, *next;
cp
- if((subnet = lookup_subnet_ipv4(to)) == NULL)
- {
- 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;
- }
-
- cl = subnet->owner;
-
- /* If we ourselves have indirectdata flag set, we should send only to our uplink! */
-
- /* FIXME - check for indirection and reprogram it The Right Way(tm) this time. */
-
- if(!cl->status.dataopen)
- if(setup_vpn_connection(cl) < 0)
- {
- syslog(LOG_ERR, _("Could not open UDP connection to %s (%s)"),
- cl->name, cl->hostname);
- return -1;
- }
-
- if(!cl->status.validkey)
- {
-/* 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_req_key(myself, cl); /* Keys should be sent to the host running the tincd */
- return 0;
- }
+ if(debug_lvl >= DEBUG_TRAFFIC)
+ syslog(LOG_INFO, _("Flushing queue for %s (%s)"), cl->name, cl->hostname);
- if(!cl->status.active)
+ for(node = cl->queue->head; node; node = next)
{
-/* 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);
-*/
- return 0; /* We don't want to mess up, do we? */
+ next = node->next;
+ send_udppacket(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;
- char *envvar;
+#ifdef HAVE_LINUX
+# ifdef HAVE_TUNTAP
struct ifreq ifr;
+# endif
+#endif
+#ifdef HAVE_SOLARIS
+ int ip_fd = -1, if_fd = -1;
+ int ppa;
+ char *ptr;
+#endif
-cp
- if((cfg = get_config_val(config, tapdevice)))
+cp
+ if((cfg = get_config_val(config, config_tapdevice)))
tapfname = cfg->data.ptr;
else
-#ifdef HAVE_TUNTAP
- tapfname = "/dev/misc/net/tun";
-#else
- tapfname = "/dev/tap0";
+ {
+#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)
{
cp
tap_fd = nfd;
- taptype = TAP_TYPE_ETHERTAP;
+ /* Set default MAC address for ethertap devices */
-#ifdef HAVE_TUNTAP
+ 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
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);
+ {
+ syslog(LOG_INFO, _("%s is a Linux tun/tap device"), tapfname);
taptype = TAP_TYPE_TUNTAP;
-
- if((cfg = get_config_val(config, tapsubnet)) == NULL)
- syslog(LOG_INFO, _("tun/tap device will be left unconfigured"));
- else
- /* Setup inetaddr/netmask etc */;
}
+ else
+ if (!ioctl(tap_fd, (('T'<< 8) | 202), (void *) &ifr))
+ {
+ syslog(LOG_INFO, _("%s is a Linux tun/tap device"), tapfname);
+ syslog(LOG_WARNING, _("Old ioctl() request used"));
+ taptype = TAP_TYPE_TUNTAP;
+ }
+ else
+ #endif
+ {
+ syslog(LOG_INFO, _("%s is a Linux ethertap device"), tapfname);
+ taptype = TAP_TYPE_ETHERTAP;
+ }
+#endif
+#ifdef HAVE_FREEBSD
+ syslog(LOG_INFO, _("%s is a FreeBSD tap device"), tapfname);
+ taptype = TAP_TYPE_TUNTAP;
#endif
+#ifdef HAVE_SOLARIS
+ ppa = 0;
- /* Add name of network interface to environment (for scripts) */
+ ptr = tapfname;
+ while(*ptr && !isdigit((int)*ptr)) ptr++;
+ ppa = atoi(ptr);
+
+ if( (ip_fd = open("/dev/ip", O_RDWR, 0)) < 0){
+ syslog(LOG_ERR, _("Could not open /dev/ip: %m"));
+ return -1;
+ }
+
+ /* Assign a new PPA and get its unit number. */
+ if( (ppa = ioctl(nfd, TUNNEWPPA, ppa)) < 0){
+ syslog(LOG_ERR, _("Can't assign new interface: %m"));
+ return -1;
+ }
+
+ if( (if_fd = open(tapfname, O_RDWR, 0)) < 0){
+ syslog(LOG_ERR, _("Could not open %s twice: %m"), tapfname);
+ return -1;
+ }
+
+ if(ioctl(if_fd, I_PUSH, "ip") < 0){
+ syslog(LOG_ERR, _("Can't push IP module: %m"));
+ return -1;
+ }
+
+ /* Assign ppa according to the unit number returned by tun device */
+ if(ioctl(if_fd, IF_UNITSEL, (char *)&ppa) < 0){
+ syslog(LOG_ERR, _("Can't set PPA %d: %m"), ppa);
+ return -1;
+ }
+
+ if(ioctl(ip_fd, I_LINK, if_fd) < 0){
+ syslog(LOG_ERR, _("Can't link TUN device to IP: %m"));
+ return -1;
+ }
+
+ syslog(LOG_INFO, _("%s is a Solaris tun device"), tapfname);
+#endif
- ioctl(tap_fd, SIOCGIFNAME, (void *) &ifr);
- asprintf(&envvar, "IFNAME=%s", ifr.ifr_name);
- putenv(envvar);
- free(envvar);
-
cp
return 0;
}
{
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)
return -1;
}
- if(setsockopt(nfd, SOL_SOCKET, SO_REUSEADDR, &one, sizeof(one)))
- {
- syslog(LOG_ERR, _("setsockopt: %m"));
- return -1;
- }
-
- if(setsockopt(nfd, SOL_SOCKET, SO_KEEPALIVE, &one, sizeof(one)))
- {
- syslog(LOG_ERR, _("setsockopt: %m"));
- return -1;
- }
-
flags = fcntl(nfd, F_GETFL);
if(fcntl(nfd, F_SETFL, flags | O_NONBLOCK) < 0)
{
- syslog(LOG_ERR, _("fcntl: %m"));
+ close(nfd);
+ syslog(LOG_ERR, _("System call `%s' failed: %m"),
+ "fcntl");
return -1;
}
- if((cfg = get_config_val(config, interface)))
+ /* Optimize TCP settings */
+
+ option = 1;
+ setsockopt(nfd, SOL_SOCKET, SO_REUSEADDR, &option, sizeof(option));
+ setsockopt(nfd, SOL_SOCKET, SO_KEEPALIVE, &option, sizeof(option));
+#ifdef HAVE_LINUX
+ setsockopt(nfd, SOL_TCP, TCP_NODELAY, &option, sizeof(option));
+
+ option = IPTOS_LOWDELAY;
+ setsockopt(nfd, SOL_IP, IP_TOS, &option, sizeof(option));
+
+ if((cfg = get_config_val(config, config_interface)))
{
- if(setsockopt(nfd, SOL_SOCKET, SO_KEEPALIVE, cfg->data.ptr, strlen(cfg->data.ptr)))
+ 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);
-
- if((cfg = get_config_val(config, interfaceip)))
+
+ 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"));
- 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;
}
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;
+ int option;
cp
if(debug_lvl >= DEBUG_CONNECTIONS)
syslog(LOG_INFO, _("Trying to connect to %s"), cl->hostname);
- if((cfg = get_config_val(cl->config, port)) == 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;
+ }
+
+ /* Optimize TCP settings */
+
+ option = 1;
+ setsockopt(cl->meta_socket, SOL_SOCKET, SO_KEEPALIVE, &option, sizeof(option));
+#ifdef HAVE_LINUX
+ 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->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;
}
/*
- 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 *name)
{
- conn_list_t *ncn;
+ connection_t *ncn, *old;
struct hostent *h;
- config_t *cfg;
+ config_t const *cfg;
cp
if(check_id(name))
{
return -1;
}
- ncn = new_conn_list();
- asprintf(&ncn->name, "%s", name);
+ /* Make sure we don't make an outgoing connection to a host that is already in our connection list */
+
+ if((old = lookup_id(name)))
+ {
+ if(!old->status.outgoing)
+ {
+ if(debug_lvl >= DEBUG_CONNECTIONS)
+ syslog(LOG_NOTICE, _("We are already connected to %s."), name);
+
+ old->status.outgoing = 1;
+ }
+ return 0;
+ }
+ ncn = new_connection();
+ asprintf(&ncn->name, "%s", name);
+
if(read_host_config(ncn))
{
- syslog(LOG_ERR, _("Error reading host configuration file for %s"));
- free_conn_list(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, address)))
+
+ 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, _("No address specified for %s"));
- free_conn_list(ncn);
+ syslog(LOG_ERR, _("Error looking up `%s': %m"), cfg->data.ptr);
+ free_connection(ncn);
return -1;
}
-
- if(!(h = gethostbyname(cfg->data.ptr)))
+
+ 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 to %s"),
+ ncn->hostname);
+ free_connection(ncn);
+ return -1;
+ }
+
+ ncn->status.outgoing = 1;
+ 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)))
{
- syslog(LOG_ERR, _("Error looking up `%s': %m"), cfg->data.ptr);
- free_conn_list(ncn);
- return -1;
+ 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;
+ }
}
-
- ncn->address = ntohl(*((ip_t*)(h->h_addr_list[0])));
- ncn->hostname = hostlookup(htonl(ncn->address));
-
- if(setup_outgoing_meta_socket(ncn) < 0)
+ else
{
- syslog(LOG_ERR, _("Could not set up a meta connection to %s"),
- ncn->hostname);
- free_conn_list(ncn);
+ syslog(LOG_ERR, _("No private key for tinc daemon specified!"));
return -1;
}
-
- ncn->status.outgoing = 1;
- 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;
}
/*
- Configure conn_list_t myself and 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;
- int i;
cp
- myself = new_conn_list();
+ myself = new_connection();
- asprintf(&myself->hostname, "MYSELF"); /* FIXME? Do hostlookup on ourselves? */
- myself->flags = 0;
+ asprintf(&myself->hostname, _("MYSELF"));
+ myself->options = 0;
myself->protocol_version = PROT_CURRENT;
- if(!(cfg = get_config_val(config, tincname))) /* Not acceptable */
+ if(!(cfg = get_config_val(config, config_name))) /* Not acceptable */
{
syslog(LOG_ERR, _("Name for tinc daemon required!"));
return -1;
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(read_rsa_private_key())
+ return -1;
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(read_rsa_public_key(myself))
+ return -1;
+cp
+
/*
if(RSA_check_key(myself->rsa_key) != 1)
{
return -1;
}
*/
- if(!(cfg = get_config_val(myself->config, port)))
+ 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, 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)
+ 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);
}
-
+
+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;
+
+ 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;
+
+ if(myself->options & OPTION_TCPONLY)
+ myself->options |= OPTION_INDIRECT;
+
+ if((cfg = get_config_val(config, config_mode)))
+ {
+ if(!strcasecmp(cfg->data.ptr, "router"))
+ routing_mode = RMODE_ROUTER;
+ else if (!strcasecmp(cfg->data.ptr, "switch"))
+ routing_mode = RMODE_SWITCH;
+ else if (!strcasecmp(cfg->data.ptr, "hub"))
+ routing_mode = RMODE_HUB;
+ else
+ {
+ syslog(LOG_ERR, _("Invalid routing mode!"));
+ return -1;
+ }
+ }
+ else
+ routing_mode = RMODE_ROUTER;
+
+cp
+ /* Open sockets */
+
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_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
+ /* Done */
+
+ myself->nexthop = myself;
+ myself->prevhop = myself;
+ myself->via = myself;
myself->status.active = 1;
+ id_add(myself);
syslog(LOG_NOTICE, _("Ready: listening on port %hd"), myself->port);
cp
return 0;
}
+void randomized_alarm(int seconds)
+{
+ unsigned char r;
+ RAND_pseudo_bytes(&r, 1);
+ alarm((seconds * (int)r) / 128 + 1);
+}
+
RETSIGTYPE
-sigalrm_handler(int a)
+try_outgoing_connections(int a)
{
config_t const *cfg;
+ int retry = 0;
cp
- cfg = get_config_val(upstreamcfg, connectto);
-
- if(!cfg && upstreamcfg == config)
- /* No upstream IP given, we're listen only. */
- return;
+ 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, connectto); /* Or else we try the next ConnectTo line */
+ if(setup_outgoing_connection(cfg->data.ptr)) /* function returns 0 when there are no problems */
+ retry = 1;
+ cfg = get_config_val(cfg->next, 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);
+ if(retry)
+ {
+ seconds_till_retry += 5;
+ if(seconds_till_retry > MAXTIMEOUT) /* Don't wait more than MAXTIMEOUT seconds. */
+ seconds_till_retry = MAXTIMEOUT;
+
+ syslog(LOG_ERR, _("Failed to setup all outgoing connections, will retry in %d seconds"),
+ seconds_till_retry);
+
+ /* Randomize timeout to avoid global synchronisation effects */
+ randomized_alarm(seconds_till_retry);
+ }
+ else
+ {
+ seconds_till_retry = 5;
+ }
cp
}
int setup_network_connections(void)
{
config_t const *cfg;
- char *scriptname;
cp
- if((cfg = get_config_val(config, 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;
- if(setup_myself() < 0)
- return -1;
-
/* Run tinc-up script to further initialize the tap interface */
+ execute_script("tinc-up");
- asprintf(&scriptname, "%s/tinc-up", confbase);
-
- if(!fork())
- {
-
- execl(scriptname, NULL);
-
- if(errno != ENOENT)
- syslog(LOG_WARNING, _("Error while executing %s: %m"), scriptname);
-
- exit(0);
- }
-
- free(scriptname);
-
- if(!(cfg = get_config_val(config, connectto)))
- /* No upstream IP given, we're listen only. */
- return 0;
+ if(setup_myself() < 0)
+ return -1;
- while(cfg)
- {
- 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);
+ signal(SIGALRM, try_outgoing_connections);
+ alarm(5);
cp
return 0;
}
*/
void close_network_connections(void)
{
- conn_list_t *p;
- char *scriptname;
+ avl_node_t *node, *next;
+ connection_t *p;
cp
- for(p = conn_list; p != NULL; p = p->next)
+ for(node = connection_tree->head; 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);
- }
+ next = node->next;
+ p = (connection_t *)node->data;
+ p->status.outgoing = 0;
+ terminate_connection(p, 0);
}
- if(myself)
- if(myself->status.active)
- {
- close(myself->meta_socket);
- close(myself->socket);
- }
-
- /* Execute tinc-down script right before shutting down the interface */
-
- asprintf(&scriptname, "%s/tinc-down", confbase);
+ terminate_connection(myself, 0);
- if(!fork())
- {
- execl(scriptname, NULL);
-
- if(errno != ENOENT)
- syslog(LOG_WARNING, _("Error while executing %s: %m"), scriptname);
+ destroy_trees();
- exit(0);
- }
-
- free(scriptname);
+ execute_script("tinc-down");
close(tap_fd);
- destroy_conn_list();
-
- syslog(LOG_NOTICE, _("Terminating"));
cp
return;
}
-/*
- create a data (udp) socket
-*/
-int setup_vpn_connection(conn_list_t *cl)
-{
- int nfd, flags;
- struct sockaddr_in a;
-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 UDP socket failed: %m"));
- return -1;
- }
-
- a.sin_family = AF_INET;
- a.sin_port = htons(cl->port);
- a.sin_addr.s_addr = htonl(cl->address);
-
- if(connect(nfd, (struct sockaddr *)&a, sizeof(a)) == -1)
- {
- 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 %s (%s)"), __FILE__, __LINE__, nfd,
- cl->name, cl->hostname);
- return -1;
- }
-
- cl->socket = nfd;
- cl->status.dataopen = 1;
-cp
- return 0;
-}
-
/*
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");
+ close(sfd);
return NULL;
}
- p->name = unknown;
+ asprintf(&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 >= DEBUG_CONNECTIONS)
syslog(LOG_NOTICE, _("Connection from %s port %d"),
p->hostname, htons(ci.sin_port));
*/
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)
{
- if(p->status.meta)
- FD_SET(p->meta_socket, fs);
- if(p->status.dataopen)
- FD_SET(p->socket, fs);
+ p = (connection_t *)node->data;
+ 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()
+void handle_incoming_vpn_data(void)
{
vpn_packet_t pkt;
- int lenin;
int x, l = sizeof(x);
- struct sockaddr from;
+ 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__, myself->socket);
- return -1;
+ return;
}
if(x)
{
syslog(LOG_ERR, _("Incoming data socket error: %s"), strerror(x));
- return -1;
+ return;
}
- if(recvfrom(myself->socket, (char *) &(pkt.len), MTU, 0, &from, &fromlen) <= 0)
+ if((pkt.len = recvfrom(myself->socket, (char *) pkt.salt, MTU, 0, (struct sockaddr *)&from, &fromlen)) <= 0)
{
syslog(LOG_ERR, _("Receiving packet failed: %m"));
- return -1;
+ return;
}
-/*
- if(debug_lvl >= DEBUG_TRAFFIC)
+
+ cl = lookup_active(ntohl(from.sin_addr.s_addr), ntohs(from.sin_port));
+
+ if(!cl)
{
- syslog(LOG_DEBUG, _("Received packet of %d bytes from %d.%d.%d.%d"), pkt.len,
- from.sa_addr[0], from.sa_addr[1], from.sa_addr[2], from.sa_addr[3]);
- }
-*/
+ 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;
+ }
+
+ cl->last_ping_time = time(NULL);
+
+ receive_udppacket(cl, &pkt);
cp
- return xrecv(&pkt);
}
/*
- terminate a connection and notify the other
- end before closing the sockets
+ Terminate a connection:
+ - Close the sockets
+ - Remove associated hosts and subnets
+ - Deactivate the host
+ - Since it might still be referenced, put it on the prune list.
+ - If report == 1, then send DEL_HOST messages to the other tinc daemons.
*/
-void terminate_connection(conn_list_t *cl)
+void terminate_connection(connection_t *cl, int report)
{
- conn_list_t *p;
-
+ connection_t *p;
+ subnet_t *subnet;
+ avl_node_t *node, *next;
cp
if(cl->status.remove)
return;
+ else
+ cl->status.remove = 1;
- 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)
+ if(cl->meta_socket)
close(cl->meta_socket);
- cl->status.remove = 1;
-
- /* If this cl isn't active, don't send any DEL_HOSTs. */
+ connection_del(cl);
-/* FIXME: reprogram this.
- 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)
+ {
+ if(debug_lvl >= DEBUG_CONNECTIONS)
+ syslog(LOG_NOTICE, _("Closing connection with %s (%s)"),
+ cl->name, cl->hostname);
+
+ if(cl->status.active)
+ {
+ /* Find all connections that were lost because they were behind cl
+ (the connection that was dropped). */
+
+ for(node = active_tree->head; node; node = next)
+ {
+ next = node->next;
+ p = (connection_t *)node->data;
+ if(p->nexthop == cl)
+ terminate_connection(p, report);
+ }
+ }
+ }
+
+ /* Inform others of termination if needed */
+
+ if(report)
+ for(node = connection_tree->head; node; node = node->next)
{
- if((p->nexthop == cl) && (p != cl))
- {
- if(cl->status.active && p->status.active)
-/* FIXME: reprogram this
- 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->status.active)
+ send_del_host(p, cl); /* Sounds like recursion, but p does not have a meta connection :) */
}
-
- cl->status.active = 0;
-
+
+ /* 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 */
+
if(cl->status.outgoing)
{
- signal(SIGALRM, sigalrm_handler);
- seconds_till_retry = 5;
+ cl->status.outgoing = 0;
+ signal(SIGALRM, try_outgoing_connections);
alarm(seconds_till_retry);
- syslog(LOG_NOTICE, _("Trying to re-establish outgoing connection in 5 seconds"));
+ syslog(LOG_NOTICE, _("Trying to re-establish outgoing connection in %d seconds"), seconds_till_retry);
}
cp
+ /* Schedule it for pruning */
+
+ prune_add(cl);
}
/*
end does not reply in time, we consider them dead
and close the connection.
*/
-int check_dead_connections(void)
+void check_dead_connections(void)
{
- conn_list_t *p;
time_t now;
+ avl_node_t *node, *next;
+ connection_t *cl;
cp
now = time(NULL);
- for(p = conn_list; p != NULL; p = p->next)
+
+ for(node = connection_tree->head; node; node = next)
{
- if(p->status.remove)
- continue;
- if(p->status.active && p->status.meta)
- {
- if(p->last_ping_time + timeout < now)
+ next = node->next;
+ cl = (connection_t *)node->data;
+ if(cl->last_ping_time + timeout < now)
+ {
+ if(cl->status.active)
{
- if(p->status.pinged && !p->status.got_pong)
+ if(cl->status.pinged)
{
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, 1);
}
- 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);
}
}
- }
+ else
+ {
+ if(debug_lvl >= DEBUG_CONNECTIONS)
+ syslog(LOG_WARNING, _("Timeout from %s (%s) during authentication"),
+ cl->name, cl->hostname);
+ terminate_connection(cl, 0);
+ }
+ }
}
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);
+
+ send_id(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;
+ return;
- if(p->status.dataopen)
- if(FD_ISSET(p->socket, f))
+ if(FD_ISSET(p->meta_socket, f))
+ if(receive_meta(p) < 0)
{
- /*
- The only thing that can happen to get us here is apparently an
- error on this outgoing(!) UDP socket that isn't immediate (i.e.
- something that will not trigger an error directly on send()).
- I've once got here when it said `No route to host'.
- */
- getsockopt(p->socket, SOL_SOCKET, SO_ERROR, &x, &l);
- syslog(LOG_ERR, _("Outgoing data socket error for %s (%s): %s"),
- p->name, p->hostname, strerror(x));
- terminate_connection(p);
+ terminate_connection(p, p->status.active);
return;
- }
-
- if(p->status.meta)
- if(FD_ISSET(p->meta_socket, f))
- if(receive_meta(p) < 0)
- {
- terminate_connection(p);
- return;
- }
+ }
}
-
- if(FD_ISSET(myself->socket, f))
- handle_incoming_vpn_data();
if(FD_ISSET(myself->meta_socket, f))
handle_new_meta_connection();
void handle_tap_input(void)
{
vpn_packet_t vp;
- subnet_t *subnet;
- ipv4_t dest;
int lenin;
-cp
+cp
+#ifdef HAVE_SOLARIS
+ if((lenin = read(tap_fd, vp.data + 14, MTU)) <= 0)
+ {
+ syslog(LOG_ERR, _("Error while reading from tun device: %m"));
+ return;
+ }
+ memcpy(vp.data, mymac.net.mac.address.x, 6);
+ memcpy(vp.data + 6, mymac.net.mac.address.x, 6);
+ vp.data[12] = 0x08;
+ vp.data[13] = 0x00;
+ vp.len = lenin + 14;
+#else
if(taptype == TAP_TYPE_TUNTAP)
{
if((lenin = read(tap_fd, vp.data, MTU)) <= 0)
}
vp.len = lenin - 2;
}
+#endif
- total_tap_in += lenin;
+ total_tap_in += vp.len;
if(lenin < 32)
{
syslog(LOG_DEBUG, _("Read packet of length %d from tap device"), vp.len);
}
- send_packet(ntohl(*((unsigned long*)(&vp.data[30]))), &vp);
+ route_outgoing(&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_flush();
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;
-/* FIXME: reprogram this.
- if(debug_lvl > 1)
- syslog(LOG_INFO, _("Rereading configuration file"));
close_network_connections();
- clear_config();
- if(read_config_file(&config, configfilename))
+ clear_config(&config);
+
+ if(read_server_config())
{
syslog(LOG_ERR, _("Unable to reread configuration file, exiting"));
- exit(0);
+ exit(1);
}
+
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_pseudo_bytes(myself->cipher_pktkey, myself->cipher_pktkeylength);
+ send_key_changed(myself, NULL);
+ keyexpires = time(NULL) + keylifetime;
+ }
}
if(r > 0)