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.105 2001/05/07 19:08:43 guus Exp $
+ $Id: net.c,v 1.35.4.145 2001/10/31 20:22:52 guus Exp $
*/
#include "config.h"
#include <fcntl.h>
#include <netdb.h>
#include <netinet/in.h>
-#include <netinet/ip.h>
-#include <netinet/tcp.h>
+#ifdef HAVE_LINUX
+ #include <netinet/ip.h>
+ #include <netinet/tcp.h>
+#endif
#include <stdio.h>
#include <stdlib.h>
#include <string.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
+#include <openssl/rand.h>
+#include <openssl/evp.h>
+#include <openssl/pem.h>
-#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
+#ifndef HAVE_RAND_PSEUDO_BYTES
+#define RAND_pseudo_bytes RAND_bytes
#endif
#include <utils.h>
#include "subnet.h"
#include "process.h"
#include "route.h"
+#include "device.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 maxtimeout = 900;
+int seconds_till_retry = 5;
-config_t *upstreamcfg;
-static int seconds_till_retry;
+int tcp_socket = -1;
+int udp_socket = -1;
int keylifetime = 0;
int keyexpires = 0;
-char *unknown = NULL;
+int do_prune = 0;
-void send_udppacket(connection_t *cl, vpn_packet_t *inpkt)
+/* VPN packet I/O */
+
+void receive_udppacket(node_t *n, vpn_packet_t *inpkt)
+{
+ vpn_packet_t outpkt;
+ int outlen, outpad;
+ EVP_CIPHER_CTX ctx;
+cp
+ /* Decrypt the packet */
+
+ EVP_DecryptInit(&ctx, myself->cipher, myself->key, myself->key + myself->cipher->key_len);
+ EVP_DecryptUpdate(&ctx, outpkt.salt, &outlen, inpkt->salt, inpkt->len);
+ EVP_DecryptFinal(&ctx, outpkt.salt + outlen, &outpad);
+ outlen += outpad;
+ outpkt.len = outlen - sizeof(outpkt.salt);
+
+ receive_packet(n, &outpkt);
+cp
+}
+
+void receive_tcppacket(connection_t *c, char *buffer, int len)
+{
+ vpn_packet_t outpkt;
+cp
+ outpkt.len = len;
+ memcpy(outpkt.data, buffer, len);
+
+ receive_packet(c->node, &outpkt);
+cp
+}
+
+void receive_packet(node_t *n, vpn_packet_t *packet)
+{
+cp
+ if(debug_lvl >= DEBUG_TRAFFIC)
+ syslog(LOG_DEBUG, _("Received packet of %d bytes from %s (%s)"), packet->len, n->name, n->hostname);
+
+ route_incoming(n, packet);
+cp
+}
+
+void send_udppacket(node_t *n, vpn_packet_t *inpkt)
{
vpn_packet_t outpkt;
int outlen, outpad;
socklen_t tolen = sizeof(to);
vpn_packet_t *copy;
cp
- if(!cl->status.validkey)
+ if(!n->status.validkey)
{
if(debug_lvl >= DEBUG_TRAFFIC)
syslog(LOG_INFO, _("No valid key known yet for %s (%s), queueing packet"),
- cl->name, cl->hostname);
+ n->name, n->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);
+ list_insert_tail(n->queue, copy);
- if(!cl->status.waitingforkey)
- send_req_key(myself, cl);
+ if(!n->status.waitingforkey)
+ send_req_key(n->nexthop->connection, myself, n);
return;
}
/* Encrypt the packet. */
- RAND_bytes(inpkt->salt, sizeof(inpkt->salt));
+ 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_EncryptInit(&ctx, n->cipher, n->key, n->key + n->cipher->key_len);
EVP_EncryptUpdate(&ctx, outpkt.salt, &outlen, inpkt->salt, inpkt->len + sizeof(inpkt->salt));
EVP_EncryptFinal(&ctx, outpkt.salt + outlen, &outpad);
outlen += outpad;
- total_socket_out += outlen;
-
to.sin_family = AF_INET;
- to.sin_addr.s_addr = htonl(cl->address);
- to.sin_port = htons(cl->port);
+ to.sin_addr.s_addr = htonl(n->address);
+ to.sin_port = htons(n->port);
- if((sendto(myself->socket, (char *) outpkt.salt, outlen, 0, (const struct sockaddr *)&to, tolen)) < 0)
+ if((sendto(udp_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);
+ n->name, n->hostname);
return;
}
cp
}
-void receive_packet(connection_t *cl, vpn_packet_t *packet)
-{
-cp
- if(debug_lvl >= DEBUG_TRAFFIC)
- syslog(LOG_DEBUG, _("Received packet of %d bytes from %s (%s)"), packet->len, cl->name, cl->hostname);
-
- route_incoming(cl, packet);
-cp
-}
-
-void receive_udppacket(connection_t *cl, vpn_packet_t *inpkt)
-{
- vpn_packet_t outpkt;
- int outlen, outpad;
- EVP_CIPHER_CTX ctx;
-cp
- /* Decrypt the packet */
-
- EVP_DecryptInit(&ctx, myself->cipher_pkttype, myself->cipher_pktkey, myself->cipher_pktkey + myself->cipher_pkttype->key_len);
- EVP_DecryptUpdate(&ctx, outpkt.salt, &outlen, inpkt->salt, inpkt->len);
- EVP_DecryptFinal(&ctx, outpkt.salt + outlen, &outpad);
- outlen += outpad;
- outpkt.len = outlen - sizeof(outpkt.salt);
-
- receive_packet(cl, &outpkt);
-cp
-}
-
-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);
-
- if(taptype == TAP_TYPE_TUNTAP)
- {
- 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;
- }
- else /* ethertap */
- {
- 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
-}
-
/*
send a packet to the given vpn ip.
*/
-void send_packet(connection_t *cl, vpn_packet_t *packet)
+void send_packet(node_t *n, vpn_packet_t *packet)
{
cp
if(debug_lvl >= DEBUG_TRAFFIC)
syslog(LOG_ERR, _("Sending packet of %d bytes to %s (%s)"),
- packet->len, cl->name, cl->hostname);
+ packet->len, n->name, n->hostname);
- if(cl == myself)
+ if(n == myself)
{
if(debug_lvl >= DEBUG_TRAFFIC)
{
return;
}
- if(!cl->status.active)
- {
- if(debug_lvl >= DEBUG_TRAFFIC)
- syslog(LOG_INFO, _("%s (%s) is not active, dropping packet"),
- cl->name, cl->hostname);
-
- return;
- }
+ if(n->via != n && debug_lvl >= DEBUG_TRAFFIC)
+ syslog(LOG_ERR, _("Sending packet to %s via %s (%s)"),
+ n->name, n->via->name, n->via->hostname);
- /* Check if it has to go via TCP or UDP... */
-cp
- if((cl->options | myself->options) & OPTION_TCPONLY)
+ if((myself->options | n->via->options) & OPTION_TCPONLY)
{
- if(send_tcppacket(cl, packet))
- terminate_connection(cl);
+ if(send_tcppacket(n->via->connection, packet))
+ terminate_connection(n->via->connection, 1);
}
else
- send_udppacket(cl, packet);
+ send_udppacket(n->via, packet);
}
-void flush_queue(connection_t *cl)
+/* Broadcast a packet to all active direct connections */
+
+void broadcast_packet(node_t *from, vpn_packet_t *packet)
{
- list_node_t *node, *next;
+ avl_node_t *node;
+ connection_t *c;
cp
if(debug_lvl >= DEBUG_TRAFFIC)
- syslog(LOG_INFO, _("Flushing queue for %s (%s)"), cl->name, cl->hostname);
+ syslog(LOG_INFO, _("Broadcasting packet of %d bytes from %s (%s)"),
+ packet->len, from->name, from->hostname);
- for(node = cl->queue->head; node; node = next)
+ for(node = connection_tree->head; node; node = node->next)
{
- next = node->next;
- send_udppacket(cl, (vpn_packet_t *)node->data);
- list_delete_node(cl->queue, node);
+ c = (connection_t *)node->data;
+ if(c->status.active && c != from->nexthop->connection)
+ send_packet(c->node, packet);
}
cp
}
-/*
- open the local ethertap device
-*/
-int setup_tap_fd(void)
+void flush_queue(node_t *n)
{
- int nfd;
- const char *tapfname;
- config_t const *cfg;
-#ifdef HAVE_LINUX
-# ifdef HAVE_TUNTAP
- struct ifreq ifr;
-# endif
-#endif
-
-cp
- if((cfg = get_config_val(config, config_tapdevice)))
- tapfname = cfg->data.ptr;
- else
- {
-#ifdef HAVE_LINUX
-# ifdef HAVE_TUNTAP
- tapfname = "/dev/misc/net/tun";
-# else
- tapfname = "/dev/tap0";
-# endif
-#endif
-#ifdef HAVE_FREEBSD
- tapfname = "/dev/tap0";
-#endif
-#ifdef HAVE_SOLARIS
- tapfname = "/dev/tun";
-#endif
- }
+ list_node_t *node, *next;
cp
- if((nfd = open(tapfname, O_RDWR | O_NONBLOCK)) < 0)
+ if(debug_lvl >= DEBUG_TRAFFIC)
+ syslog(LOG_INFO, _("Flushing queue for %s (%s)"), n->name, n->hostname);
+
+ for(node = n->queue->head; node; node = next)
{
- syslog(LOG_ERR, _("Could not open %s: %m"), tapfname);
- return -1;
+ next = node->next;
+ send_udppacket(n, (vpn_packet_t *)node->data);
+ list_delete_node(n->queue, node);
}
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;
}
-/*
- set up the socket that we listen on for incoming
- (tcp) connections
-*/
-int setup_listen_meta_socket(int port)
+/* Setup sockets */
+
+int setup_listen_socket(int port)
{
int nfd, flags;
struct sockaddr_in a;
int option;
- config_t const *cfg;
+ char *interface;
+ char *address;
+ ip_mask_t *ipmask;
cp
if((nfd = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP)) < 0)
{
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_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;
- }
- }
+ if(get_config_string(lookup_config(config_tree, "BindToInterface"), &interface))
+ if(setsockopt(nfd, SOL_SOCKET, SO_BINDTODEVICE, interface, strlen(interface)))
+ {
+ close(nfd);
+ syslog(LOG_ERR, _("Can't bind to interface %s: %m"), interface);
+ return -1;
+ }
+#endif
memset(&a, 0, sizeof(a));
a.sin_family = AF_INET;
+ a.sin_addr.s_addr = htonl(INADDR_ANY);
a.sin_port = htons(port);
- 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(get_config_string(lookup_config(config_tree, "BindToAddress"), &address))
+ {
+ ipmask = strtoip(address);
+ if(ipmask)
+ {
+ a.sin_addr.s_addr = htonl(ipmask->address);
+ free(ipmask);
+ }
+ }
if(bind(nfd, (struct sockaddr *)&a, sizeof(struct sockaddr)))
{
return nfd;
}
-/*
- setup the socket for incoming encrypted
- data (the udp part)
-*/
int setup_vpn_in_socket(int port)
{
int nfd, flags;
return nfd;
}
-/*
- setup an outgoing meta (tcp) socket
-*/
-int setup_outgoing_meta_socket(connection_t *cl)
+int setup_outgoing_socket(connection_t *c)
{
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);
+ syslog(LOG_INFO, _("Trying to connect to %s (%s)"), c->name, c->hostname);
- if((cfg = get_config_val(cl->config, config_port)) == NULL)
- cl->port = 655;
- else
- cl->port = cfg->data.val;
+ c->socket = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
- cl->meta_socket = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
- if(cl->meta_socket == -1)
+ if(c->socket == -1)
{
syslog(LOG_ERR, _("Creating socket for %s port %d failed: %m"),
- cl->hostname, cl->port);
+ c->hostname, c->port);
return -1;
}
- /* Bind first to get a fix on our source port */
+ /* 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)))
+ if(bind(c->socket, (struct sockaddr *)&a, sizeof(struct sockaddr)))
{
- close(cl->meta_socket);
+ close(c->socket);
syslog(LOG_ERR, _("System call `%s' failed: %m"), "bind");
return -1;
}
- /* Optimize TCP settings */
+ */
+
+ /* Optimize TCP settings?
option = 1;
- setsockopt(cl->meta_socket, SOL_SOCKET, SO_KEEPALIVE, &option, sizeof(option));
- setsockopt(cl->meta_socket, SOL_TCP, TCP_NODELAY, &option, sizeof(option));
+ setsockopt(c->socket, SOL_SOCKET, SO_KEEPALIVE, &option, sizeof(option));
+#ifdef HAVE_LINUX
+ setsockopt(c->socket, SOL_TCP, TCP_NODELAY, &option, sizeof(option));
option = IPTOS_LOWDELAY;
- setsockopt(cl->meta_socket, SOL_IP, IP_TOS, &option, sizeof(option));
+ setsockopt(c->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);
+ a.sin_port = htons(c->port);
+ a.sin_addr.s_addr = htonl(c->address);
- if(connect(cl->meta_socket, (struct sockaddr *)&a, sizeof(a)) == -1)
+ if(connect(c->socket, (struct sockaddr *)&a, sizeof(a)) == -1)
{
- close(cl->meta_socket);
- syslog(LOG_ERR, _("%s port %hd: %m"), cl->hostname, cl->port);
+ close(c->socket);
+ syslog(LOG_ERR, _("%s port %hd: %m"), c->hostname, c->port);
return -1;
}
- flags = fcntl(cl->meta_socket, F_GETFL);
- if(fcntl(cl->meta_socket, F_SETFL, flags | O_NONBLOCK) < 0)
+ flags = fcntl(c->socket, F_GETFL);
+
+ if(fcntl(c->socket, F_SETFL, flags | O_NONBLOCK) < 0)
{
- close(cl->meta_socket);
+ close(c->socket);
syslog(LOG_ERR, _("fcntl for %s port %d: %m"),
- cl->hostname, cl->port);
+ c->hostname, c->port);
return -1;
}
if(debug_lvl >= DEBUG_CONNECTIONS)
syslog(LOG_INFO, _("Connected to %s port %hd"),
- cl->hostname, cl->port);
-
- cl->status.meta = 1;
+ c->hostname, c->port);
cp
return 0;
}
-/*
- Setup an outgoing meta connection.
-*/
int setup_outgoing_connection(char *name)
{
- connection_t *ncn;
+ connection_t *c;
+ node_t *n;
struct hostent *h;
- config_t const *cfg;
cp
- if(check_id(name))
- {
- syslog(LOG_ERR, _("Invalid name for outgoing connection"));
- return -1;
- }
+ n = lookup_node(name);
+
+ if(n)
+ if(n->connection)
+ {
+ if(debug_lvl >= DEBUG_CONNECTIONS)
+ syslog(LOG_INFO, _("Already connected to %s"), name);
+ return 0;
+ }
- ncn = new_connection();
- asprintf(&ncn->name, "%s", name);
+ c = new_connection();
+ c->name = xstrdup(name);
- if(read_host_config(ncn))
+ init_configuration(&c->config_tree);
+ read_connection_config(c);
+
+ if(!get_config_string(lookup_config(c->config_tree, "Address"), &c->hostname))
{
- syslog(LOG_ERR, _("Error reading host configuration file for %s"), ncn->name);
- free_connection(ncn);
+ syslog(LOG_ERR, _("No address specified for %s"), c->name);
+ free_connection(c);
return -1;
}
- if(!(cfg = get_config_val(ncn->config, config_address)))
+ if(!get_config_port(lookup_config(c->config_tree, "Port"), &c->port))
{
- syslog(LOG_ERR, _("No address specified for %s"), ncn->name);
- free_connection(ncn);
+ syslog(LOG_ERR, _("No port specified for %s"), c->name);
+ free_connection(c);
return -1;
}
- if(!(h = gethostbyname(cfg->data.ptr)))
+ if(!(h = gethostbyname(c->hostname)))
{
- syslog(LOG_ERR, _("Error looking up `%s': %m"), cfg->data.ptr);
- free_connection(ncn);
+ syslog(LOG_ERR, _("Error looking up `%s': %m"), c->hostname);
+ free_connection(c);
return -1;
}
- ncn->address = ntohl(*((ipv4_t*)(h->h_addr_list[0])));
- ncn->hostname = hostlookup(htonl(ncn->address));
+ c->address = ntohl(*((ipv4_t*)(h->h_addr_list[0])));
+ c->hostname = hostlookup(htonl(c->address));
- if(setup_outgoing_meta_socket(ncn) < 0)
+ if(setup_outgoing_socket(c) < 0)
{
- syslog(LOG_ERR, _("Could not set up a meta connection to %s"),
- ncn->hostname);
- free_connection(ncn);
+ syslog(LOG_ERR, _("Could not set up a meta connection to %s (%s)"),
+ c->name, c->hostname);
+ free_connection(c);
return -1;
}
- ncn->status.outgoing = 1;
- ncn->buffer = xmalloc(MAXBUFSIZE);
- ncn->buflen = 0;
- ncn->last_ping_time = time(NULL);
+ c->status.outgoing = 1;
+ c->last_ping_time = time(NULL);
- connection_add(ncn);
+ connection_add(c);
- send_id(ncn);
+ send_id(c);
cp
return 0;
}
-int read_rsa_public_key(connection_t *cl)
+int read_rsa_public_key(connection_t *c)
{
- config_t const *cfg;
FILE *fp;
char *fname;
+ char *key;
void *result;
cp
- if(!cl->rsa_key)
- cl->rsa_key = RSA_new();
+ if(!c->rsa_key)
+ c->rsa_key = RSA_new();
/* First, check for simple PublicKey statement */
- if((cfg = get_config_val(cl->config, config_publickey)))
+ if(get_config_string(lookup_config(c->config_tree, "PublicKey"), &key))
{
- BN_hex2bn(&cl->rsa_key->n, cfg->data.ptr);
- BN_hex2bn(&cl->rsa_key->e, "FFFF");
+ BN_hex2bn(&c->rsa_key->n, key);
+ BN_hex2bn(&c->rsa_key->e, "FFFF");
return 0;
}
/* Else, check for PublicKeyFile statement and read it */
- if((cfg = get_config_val(cl->config, config_publickeyfile)))
+ if(get_config_string(lookup_config(c->config_tree, "PublicKeyFile"), &fname))
{
- if(is_safe_path(cfg->data.ptr))
+ if(is_safe_path(fname))
{
- if((fp = fopen(cfg->data.ptr, "r")) == NULL)
+ if((fp = fopen(fname, "r")) == NULL)
{
syslog(LOG_ERR, _("Error reading RSA public key file `%s': %m"),
- cfg->data.ptr);
+ fname);
return -1;
}
- result = PEM_read_RSAPublicKey(fp, &cl->rsa_key, NULL, NULL);
+ result = PEM_read_RSAPublicKey(fp, &c->rsa_key, NULL, NULL);
fclose(fp);
if(!result)
{
syslog(LOG_ERR, _("Reading RSA public key file `%s' failed: %m"),
- cfg->data.ptr);
+ fname);
return -1;
}
return 0;
/* Else, check if a harnessed public key is in the config file */
- asprintf(&fname, "%s/hosts/%s", confbase, cl->name);
+ result = NULL;
+
+ asprintf(&fname, "%s/hosts/%s", confbase, c->name);
if((fp = fopen(fname, "r")))
{
- result = PEM_read_RSAPublicKey(fp, &cl->rsa_key, NULL, NULL);
+ result = PEM_read_RSAPublicKey(fp, &c->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;
+ if(result)
+ return 0;
+ else
+ {
+ syslog(LOG_ERR, _("No public key for %s specified!"), c->name);
+ return -1;
+ }
}
int read_rsa_private_key(void)
{
- config_t const *cfg;
FILE *fp;
void *result;
+ char *fname, *key;
cp
- if(!myself->rsa_key)
- myself->rsa_key = RSA_new();
+ if(!myself->connection->rsa_key)
+ myself->connection->rsa_key = RSA_new();
- if((cfg = get_config_val(config, config_privatekey)))
+ if(get_config_string(lookup_config(config_tree, "PrivateKey"), &key))
{
- BN_hex2bn(&myself->rsa_key->d, cfg->data.ptr);
- BN_hex2bn(&myself->rsa_key->e, "FFFF");
+ BN_hex2bn(&myself->connection->rsa_key->d, key);
+ BN_hex2bn(&myself->connection->rsa_key->e, "FFFF");
}
- else if((cfg = get_config_val(config, config_privatekeyfile)))
+ else if(get_config_string(lookup_config(config_tree, "PrivateKeyFile"), &fname))
{
- if((fp = fopen(cfg->data.ptr, "r")) == NULL)
+ if((fp = fopen(fname, "r")) == NULL)
{
syslog(LOG_ERR, _("Error reading RSA private key file `%s': %m"),
- cfg->data.ptr);
+ fname);
return -1;
}
- result = PEM_read_RSAPrivateKey(fp, &myself->rsa_key, NULL, NULL);
+ result = PEM_read_RSAPrivateKey(fp, &myself->connection->rsa_key, NULL, NULL);
fclose(fp);
if(!result)
{
syslog(LOG_ERR, _("Reading RSA private key file `%s' failed: %m"),
- cfg->data.ptr);
+ fname);
return -1;
}
}
}
/*
- Configure connection_t myself and set up the local sockets (listen only)
+ Configure node_t myself and set up the local sockets (listen only)
*/
int setup_myself(void)
{
- config_t const *cfg;
- config_t *next;
- subnet_t *net;
+ config_t *cfg;
+ subnet_t *subnet;
+ char *name, *mode;
+ int choice;
cp
- myself = new_connection();
+ myself = new_node();
+ myself->connection = new_connection();
+ init_configuration(&myself->connection->config_tree);
+
+ asprintf(&myself->hostname, _("MYSELF"));
+ asprintf(&myself->connection->hostname, _("MYSELF"));
- asprintf(&myself->hostname, "MYSELF");
- myself->options = 0;
- myself->protocol_version = PROT_CURRENT;
+ myself->connection->options = 0;
+ myself->connection->protocol_version = PROT_CURRENT;
- if(!(cfg = get_config_val(config, config_name))) /* Not acceptable */
+ if(!get_config_string(lookup_config(config_tree, "Name"), &name)) /* Not acceptable */
{
syslog(LOG_ERR, _("Name for tinc daemon required!"));
return -1;
}
- else
- asprintf(&myself->name, "%s", (char*)cfg->data.val);
- if(check_id(myself->name))
+ if(check_id(name))
{
syslog(LOG_ERR, _("Invalid name for myself!"));
+ free(name);
return -1;
}
+
+ myself->name = name;
+ myself->connection->name = xstrdup(name);
+
cp
if(read_rsa_private_key())
return -1;
- if(read_host_config(myself))
+ if(read_connection_config(myself->connection))
{
syslog(LOG_ERR, _("Cannot open host configuration file for myself!"));
return -1;
}
- if(read_rsa_public_key(myself))
+ if(read_rsa_public_key(myself->connection))
return -1;
cp
/*
- if(RSA_check_key(myself->rsa_key) != 1)
+ if(RSA_check_key(rsa_key) != 1)
{
syslog(LOG_ERR, _("Invalid public/private keypair!"));
return -1;
}
*/
- if(!(cfg = get_config_val(myself->config, config_port)))
+ if(!get_config_port(lookup_config(myself->connection->config_tree, "Port"), &myself->port))
myself->port = 655;
- else
- myself->port = cfg->data.val;
- if((cfg = get_config_val(myself->config, config_indirectdata)))
- if(cfg->data.val == stupid_true)
+ myself->connection->port = myself->port;
+
+/* Read in all the subnets specified in the host configuration file */
+
+ cfg = lookup_config(myself->connection->config_tree, "Subnet");
+
+ while(cfg)
+ {
+ if(!get_config_subnet(cfg, &subnet))
+ return -1;
+
+ subnet_add(myself, subnet);
+
+ cfg = lookup_config_next(myself->connection->config_tree, cfg);
+ }
+
+cp
+ /* Check some options */
+
+ if(get_config_bool(lookup_config(config_tree, "IndirectData"), &choice))
+ if(choice)
myself->options |= OPTION_INDIRECT;
- if((cfg = get_config_val(myself->config, config_tcponly)))
- if(cfg->data.val == stupid_true)
+ if(get_config_bool(lookup_config(config_tree, "TCPOnly"), &choice))
+ if(choice)
myself->options |= OPTION_TCPONLY;
-/* Read in all the subnets specified in the host configuration file */
+ if(get_config_bool(lookup_config(myself->connection->config_tree, "IndirectData"), &choice))
+ if(choice)
+ myself->options |= OPTION_INDIRECT;
- 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;
+ if(get_config_bool(lookup_config(myself->connection->config_tree, "TCPOnly"), &choice))
+ if(choice)
+ myself->options |= OPTION_TCPONLY;
- /* Teach newbies what subnets are... */
+ if(myself->options & OPTION_TCPONLY)
+ myself->options |= OPTION_INDIRECT;
- if((net->net.ipv4.address & net->net.ipv4.mask) != net->net.ipv4.address)
+ if(get_config_string(lookup_config(config_tree, "Mode"), &mode))
+ {
+ if(!strcasecmp(mode, "router"))
+ routing_mode = RMODE_ROUTER;
+ else if (!strcasecmp(mode, "switch"))
+ routing_mode = RMODE_SWITCH;
+ else if (!strcasecmp(mode, "hub"))
+ routing_mode = RMODE_HUB;
+ else
{
- syslog(LOG_ERR, _("Network address and subnet mask do not match!"));
+ syslog(LOG_ERR, _("Invalid routing mode!"));
return -1;
}
-
- subnet_add(myself, net);
}
+ else
+ routing_mode = RMODE_ROUTER;
- if((myself->meta_socket = setup_listen_meta_socket(myself->port)) < 0)
+cp
+ /* Open sockets */
+
+ if((tcp_socket = setup_listen_socket(myself->port)) < 0)
{
syslog(LOG_ERR, _("Unable to set up a listening TCP socket!"));
return -1;
}
- if((myself->socket = setup_vpn_in_socket(myself->port)) < 0)
+ if((udp_socket = setup_vpn_in_socket(myself->port)) < 0)
{
syslog(LOG_ERR, _("Unable to set up a listening UDP socket!"));
return -1;
cp
/* Generate packet encryption key */
- myself->cipher_pkttype = EVP_bf_cbc();
+ myself->cipher = EVP_bf_cbc();
- myself->cipher_pktkeylength = myself->cipher_pkttype->key_len + myself->cipher_pkttype->iv_len;
+ myself->keylength = myself->cipher->key_len + myself->cipher->iv_len;
- myself->cipher_pktkey = (char *)xmalloc(myself->cipher_pktkeylength);
- RAND_pseudo_bytes(myself->cipher_pktkey, myself->cipher_pktkeylength);
+ myself->key = (char *)xmalloc(myself->keylength);
+ RAND_pseudo_bytes(myself->key, myself->keylength);
- if(!(cfg = get_config_val(config, config_keyexpire)))
+ if(!get_config_int(lookup_config(config_tree, "KeyExpire"), &keylifetime))
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;
- }
-
- if(myself->options & OPTION_TCPONLY)
- myself->options |= OPTION_INDIRECT;
-
- /* Activate ourselves */
+ /* Done */
+ myself->nexthop = myself;
+ myself->via = myself;
myself->status.active = 1;
+ node_add(myself);
syslog(LOG_NOTICE, _("Ready: listening on port %hd"), myself->port);
cp
return 0;
}
-RETSIGTYPE
-sigalrm_handler(int a)
-{
- config_t const *cfg;
-cp
- cfg = get_config_val(upstreamcfg, config_connectto);
-
- if(!cfg)
- if(upstreamcfg == config)
- {
- /* No upstream IP given, we're listen only. */
- signal(SIGALRM, SIG_IGN);
- return;
- }
- else
- {
- /* We previously tried all the ConnectTo lines. Now wrap back to the first. */
- cfg = get_config_val(config, config_connectto);
- }
-
- while(cfg)
- {
- upstreamcfg = cfg->next;
- if(!setup_outgoing_connection(cfg->data.ptr)) /* function returns 0 when there are no problems */
- {
- signal(SIGALRM, SIG_IGN);
- return;
- }
- cfg = get_config_val(upstreamcfg, config_connectto); /* Or else we try the next ConnectTo line */
- }
-
- signal(SIGALRM, sigalrm_handler);
- upstreamcfg = config;
- seconds_till_retry += 5;
- if(seconds_till_retry > MAXTIMEOUT) /* Don't wait more than MAXTIMEOUT seconds. */
- seconds_till_retry = MAXTIMEOUT;
- syslog(LOG_ERR, _("Still failed to connect to other, will retry in %d seconds"),
- seconds_till_retry);
- alarm(seconds_till_retry);
-cp
-}
-
/*
setup all initial network connections
*/
int setup_network_connections(void)
{
- config_t const *cfg;
cp
init_connections();
init_subnets();
+ init_nodes();
+ init_edges();
- if((cfg = get_config_val(config, config_pingtimeout)) == NULL)
- timeout = 60;
- else
+ if(get_config_int(lookup_config(config_tree, "PingTimeout"), &timeout))
{
- timeout = cfg->data.val;
if(timeout < 1)
{
timeout = 86400;
}
- }
+ }
+ else
+ timeout = 60;
- if(setup_tap_fd() < 0)
+ if(setup_device() < 0)
return -1;
/* Run tinc-up script to further initialize the tap interface */
if(setup_myself() < 0)
return -1;
- 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_config_val(upstreamcfg, config_connectto); /* Or else we try the next ConnectTo line */
- }
-
- if(do_detach)
- {
- 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);
- }
- else
- return -1;
-
+ signal(SIGALRM, try_outgoing_connections);
+ alarm(5);
cp
return 0;
}
*/
void close_network_connections(void)
{
- avl_node_t *node;
- connection_t *p;
+ avl_node_t *node, *next;
+ connection_t *c;
cp
- for(node = connection_tree->head; node; node = node->next)
+ for(node = connection_tree->head; node; node = next)
{
- p = (connection_t *)node->data;
- p->status.outgoing = 0;
- p->status.active = 0;
- terminate_connection(p);
+ next = node->next;
+ c = (connection_t *)node->data;
+ c->status.outgoing = 0;
+ terminate_connection(c, 0);
}
- if(myself)
- if(myself->status.active)
- {
- close(myself->meta_socket);
- free_connection(myself);
- myself = NULL;
- }
+ terminate_connection(myself->connection, 0);
- close(tap_fd);
+// destroy_trees();
+ exit_edges();
+ exit_subnets();
+ exit_nodes();
+ exit_connections();
- /* Execute tinc-down script right after shutting down the interface */
execute_script("tinc-down");
- destroy_connection_tree();
+ close_device();
cp
return;
}
*/
connection_t *create_new_connection(int sfd)
{
- connection_t *p;
+ connection_t *c;
struct sockaddr_in ci;
int len = sizeof(ci);
cp
- p = new_connection();
+ c = new_connection();
if(getpeername(sfd, (struct sockaddr *) &ci, (socklen_t *) &len) < 0)
{
return NULL;
}
- 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);
+ c->address = ntohl(ci.sin_addr.s_addr);
+ c->hostname = hostlookup(ci.sin_addr.s_addr);
+ c->port = htons(ci.sin_port); /* This one will be overwritten later */
+ c->socket = sfd;
+ c->last_ping_time = time(NULL);
if(debug_lvl >= DEBUG_CONNECTIONS)
syslog(LOG_NOTICE, _("Connection from %s port %d"),
- p->hostname, htons(ci.sin_port));
+ c->hostname, htons(ci.sin_port));
- p->allow_request = ID;
+ c->allow_request = ID;
cp
- return p;
+ return c;
}
/*
void build_fdset(fd_set *fs)
{
avl_node_t *node;
- connection_t *p;
+ connection_t *c;
cp
FD_ZERO(fs);
- 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);
+ c = (connection_t *)node->data;
+ FD_SET(c->socket, fs);
}
- FD_SET(myself->meta_socket, fs);
- FD_SET(tap_fd, fs);
+ FD_SET(tcp_socket, fs);
+ FD_SET(udp_socket, fs);
+ FD_SET(device_fd, fs);
cp
}
int x, l = sizeof(x);
struct sockaddr_in from;
socklen_t fromlen = sizeof(from);
- connection_t *cl;
+ node_t *n;
cp
- if(getsockopt(myself->socket, SOL_SOCKET, SO_ERROR, &x, &l) < 0)
+ if(getsockopt(udp_socket, SOL_SOCKET, SO_ERROR, &x, &l) < 0)
{
syslog(LOG_ERR, _("This is a bug: %s:%d: %d:%m"),
- __FILE__, __LINE__, myself->socket);
+ __FILE__, __LINE__, udp_socket);
return;
}
if(x)
return;
}
- if((pkt.len = recvfrom(myself->socket, (char *) pkt.salt, MTU, 0, (struct sockaddr *)&from, &fromlen)) <= 0)
+ if((pkt.len = recvfrom(udp_socket, (char *) pkt.salt, MTU, 0, (struct sockaddr *)&from, &fromlen)) <= 0)
{
syslog(LOG_ERR, _("Receiving packet failed: %m"));
return;
}
- cl = lookup_connection(ntohl(from.sin_addr.s_addr), ntohs(from.sin_port));
+ n = lookup_node_udp(ntohl(from.sin_addr.s_addr), ntohs(from.sin_port));
- if(!cl)
+ if(!n)
{
- 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));
+ syslog(LOG_WARNING, _("Received UDP packet on port %hd from unknown source %x:%hd"), myself->port, ntohl(from.sin_addr.s_addr), ntohs(from.sin_port));
return;
}
-
- receive_udppacket(cl, &pkt);
+/*
+ if(n->connection)
+ n->connection->last_ping_time = time(NULL);
+*/
+ receive_udppacket(n, &pkt);
cp
}
/*
- terminate a connection and notify the other
- end before closing the sockets
+ Terminate a connection:
+ - Close the socket
+ - Remove associated edge and tell other connections about it if report = 1
+ - Check if we need to retry making an outgoing connection
+ - Deactivate the host
*/
-void terminate_connection(connection_t *cl)
+void terminate_connection(connection_t *c, int report)
{
- connection_t *p;
- subnet_t *subnet;
- avl_node_t *node, *next;
+ avl_node_t *node;
+ connection_t *other;
cp
- if(cl->status.remove)
+ if(c->status.remove)
return;
-
+
if(debug_lvl >= DEBUG_CONNECTIONS)
syslog(LOG_NOTICE, _("Closing connection with %s (%s)"),
- cl->name, cl->hostname);
-
- cl->status.remove = 1;
+ c->name, c->hostname);
- if(cl->socket)
- close(cl->socket);
- if(cl->status.meta)
- close(cl->meta_socket);
+ c->status.remove = 1;
+
+ if(c->socket)
+ close(c->socket);
- if(cl->status.meta)
+ if(c->edge)
{
+ if(report)
+ {
+ for(node = connection_tree->head; node; node = node->next)
+ {
+ other = (connection_t *)node->data;
+ if(other->status.active && other != c)
+ send_del_edge(other, c->edge);
+ }
+ }
- /* Find all connections that were lost because they were behind cl
- (the connection that was dropped). */
-
- for(node = connection_tree->head; node; node = node->next)
- {
- p = (connection_t *)node->data;
- if(p->nexthop == cl && p != cl)
- terminate_connection(p);
- }
-
- /* Inform others of termination if it was still active */
-
- if(cl->status.active)
- for(node = connection_tree->head; node; node = node->next)
- {
- p = (connection_t *)node->data;
- if(p->status.meta && p->status.active && p != cl)
- send_del_host(p, cl); /* Sounds like recursion, but p does not have a meta connection :) */
- }
- }
-
- /* Remove the associated subnets */
-
- for(node = cl->subnet_tree->head; node; node = next)
- {
- next = node->next;
- subnet = (subnet_t *)node->data;
- subnet_del(subnet);
+ edge_del(c->edge);
}
/* Check if this was our outgoing connection */
- if(cl->status.outgoing)
+ if(c->status.outgoing)
{
- cl->status.outgoing = 0;
- signal(SIGALRM, sigalrm_handler);
- seconds_till_retry = 5;
+ c->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);
}
- /* Inactivate */
+ /* Deactivate */
- cl->status.active = 0;
+ c->status.active = 0;
+ if(c->node)
+ c->node->connection = NULL;
+ do_prune = 1;
cp
}
void check_dead_connections(void)
{
time_t now;
- avl_node_t *node;
- connection_t *cl;
+ avl_node_t *node, *next;
+ connection_t *c;
cp
now = time(NULL);
- for(node = connection_tree->head; node; node = node->next)
+ for(node = connection_tree->head; node; node = next)
{
- cl = (connection_t *)node->data;
- if(cl->status.active && cl->status.meta)
+ next = node->next;
+ c = (connection_t *)node->data;
+ if(c->last_ping_time + timeout < now)
{
- if(cl->last_ping_time + timeout < now)
+ if(c->status.active)
{
- if(cl->status.pinged)
+ if(c->status.pinged)
{
if(debug_lvl >= DEBUG_PROTOCOL)
syslog(LOG_INFO, _("%s (%s) didn't respond to PING"),
- cl->name, cl->hostname);
- cl->status.timeout = 1;
- terminate_connection(cl);
+ c->name, c->hostname);
+ c->status.timeout = 1;
+ terminate_connection(c, 1);
}
else
{
- send_ping(cl);
+ send_ping(c);
}
}
+ else
+ {
+ if(debug_lvl >= DEBUG_CONNECTIONS)
+ syslog(LOG_WARNING, _("Timeout from %s (%s) during authentication"),
+ c->name, c->hostname);
+ terminate_connection(c, 0);
+ }
}
}
cp
*/
int handle_new_meta_connection()
{
- connection_t *ncn;
+ connection_t *new;
struct sockaddr client;
- int nfd, len = sizeof(client);
+ int fd, len = sizeof(client);
cp
- if((nfd = accept(myself->meta_socket, &client, &len)) < 0)
+ if((fd = accept(tcp_socket, &client, &len)) < 0)
{
syslog(LOG_ERR, _("Accepting a new connection failed: %m"));
return -1;
}
- if(!(ncn = create_new_connection(nfd)))
+ if(!(new = create_new_connection(fd)))
{
- shutdown(nfd, 2);
- close(nfd);
+ shutdown(fd, 2);
+ close(fd);
syslog(LOG_NOTICE, _("Closed attempted connection"));
return 0;
}
- connection_add(ncn);
+ connection_add(new);
- send_id(ncn);
+ send_id(new);
cp
return 0;
}
+void randomized_alarm(int seconds)
+{
+ unsigned char r;
+ RAND_pseudo_bytes(&r, 1);
+ alarm((seconds * (int)r) / 128 + 1);
+}
+
+/* This function is severely fucked up.
+ We want to redesign it so the following rules apply:
+
+ - Try all ConnectTo's in a row:
+ - if a connect() fails, try next one immediately,
+ - if it works, wait 5 seconds or so.
+ - If none of them were succesful, increase delay and retry.
+ - If all were succesful, don't try anymore.
+*/
+
+RETSIGTYPE
+try_outgoing_connections(int a)
+{
+ static config_t *cfg = NULL;
+ static int retry = 0;
+ char *name;
+cp
+ if(!cfg)
+ cfg = lookup_config(config_tree, "ConnectTo");
+
+ if(!cfg)
+ return;
+
+ while(cfg)
+ {
+ get_config_string(cfg, &name);
+ cfg = lookup_config_next(config_tree, cfg); /* Next time skip to next ConnectTo line */
+
+ if(check_id(name))
+ {
+ syslog(LOG_ERR, _("Invalid name for outgoing connection in %s line %d"), cfg->file, cfg->line);
+ continue;
+ }
+
+ if(setup_outgoing_connection(name)) /* function returns 0 when there are no problems */
+ retry = 1;
+
+ }
+
+ get_config_int(lookup_config(config_tree, "MaxTimeout"), &maxtimeout);
+
+ 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
+}
+
/*
check all connections to see if anything
happened on their sockets
*/
void check_network_activity(fd_set *f)
{
- connection_t *p;
+ connection_t *c;
avl_node_t *node;
cp
- if(FD_ISSET(myself->socket, f))
+ if(FD_ISSET(udp_socket, f))
handle_incoming_vpn_data();
for(node = connection_tree->head; node; node = node->next)
{
- p = (connection_t *)node->data;
+ c = (connection_t *)node->data;
- if(p->status.remove)
+ if(c->status.remove)
return;
- if(p->status.meta)
- if(FD_ISSET(p->meta_socket, f))
- if(receive_meta(p) < 0)
- {
- terminate_connection(p);
- return;
- }
+ if(FD_ISSET(c->socket, f))
+ if(receive_meta(c) < 0)
+ {
+ terminate_connection(c, c->status.active);
+ return;
+ }
}
- if(FD_ISSET(myself->meta_socket, f))
+ if(FD_ISSET(tcp_socket, f))
handle_new_meta_connection();
cp
}
-/*
- read, encrypt and send data that is
- available through the ethertap device
-*/
-void handle_tap_input(void)
+void prune_connections(void)
{
- vpn_packet_t vp;
- int lenin;
+ connection_t *c;
+ avl_node_t *node, *next;
cp
- if(taptype == TAP_TYPE_TUNTAP)
- {
- 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 */
+ for(node = connection_tree->head; node; node = next)
{
- 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;
-
- if(lenin < 32)
- {
- if(debug_lvl >= DEBUG_TRAFFIC)
- syslog(LOG_WARNING, _("Received short packet from tap device"));
- return;
- }
+ next = node->next;
+ c = (connection_t *)node->data;
- if(debug_lvl >= DEBUG_TRAFFIC)
- {
- syslog(LOG_DEBUG, _("Read packet of length %d from tap device"), vp.len);
+ if(c->status.remove)
+ connection_del(c);
}
-
- route_outgoing(&vp);
cp
}
int r;
time_t last_ping_check;
int t;
+ vpn_packet_t packet;
cp
last_ping_check = time(NULL);
tv.tv_sec = timeout;
tv.tv_usec = 0;
- prune_connection_tree();
+ if(do_prune)
+ {
+ prune_connections();
+ do_prune = 0;
+ }
+
build_fdset(&fset);
if((r = select(FD_SETSIZE, &fset, NULL, NULL, &tv)) < 0)
syslog(LOG_INFO, _("Rereading configuration file and restarting in 5 seconds"));
sighup = 0;
close_network_connections();
- clear_config(&config);
+ exit_configuration(&config_tree);
if(read_server_config())
{
if(debug_lvl >= DEBUG_STATUS)
syslog(LOG_INFO, _("Regenerating symmetric key"));
- RAND_bytes(myself->cipher_pktkey, myself->cipher_pktkeylength);
- send_key_changed(myself, NULL);
+ RAND_pseudo_bytes(myself->key, myself->keylength);
+ send_key_changed(myself->connection, myself);
keyexpires = time(NULL) + keylifetime;
}
}
check_network_activity(&fset);
/* local tap data */
- if(FD_ISSET(tap_fd, &fset))
- handle_tap_input();
+ if(FD_ISSET(device_fd, &fset))
+ {
+ if(read_packet(&packet))
+ return;
+ else
+ route_outgoing(&packet);
+ }
}
}
cp
projects / tinc / blobdiff