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.100 2001/02/27 16:37:25 guus Exp $
+ $Id: net.c,v 1.35.4.127 2001/07/24 20:14:30 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>
+#ifndef HAVE_RAND_PSEUDO_BYTES
+#define RAND_pseudo_bytes RAND_bytes
#endif
-#ifdef HAVE_OPENSSL_PEM_H
-# include <openssl/pem.h>
-#else
-# include <pem.h>
+#ifdef HAVE_TUNTAP
+ #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_TUNTAP
-#include LINUX_IF_TUN_H
+#ifdef HAVE_SOLARIS
+ #include <sys/sockio.h>
+ #include <sys/stropts.h>
+ #include <net/if_tun.h>
#endif
#include <utils.h>
#include "process.h"
#include "protocol.h"
#include "subnet.h"
+#include "process.h"
+#include "route.h"
#include "system.h"
int total_socket_out = 0;
config_t *upstreamcfg;
-static int seconds_till_retry;
+int seconds_till_retry = 5;
int keylifetime = 0;
int keyexpires = 0;
-char *unknown = NULL;
-
-subnet_t mymac;
-
-int xsend(connection_t *cl, vpn_packet_t *inpkt)
+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
- outpkt.len = inpkt->len;
-
+ 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. */
-
- 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);
-*/
+ RAND_pseudo_bytes(inpkt->salt, sizeof(inpkt->salt));
- if(debug_lvl >= DEBUG_TRAFFIC)
- syslog(LOG_ERR, _("Sending packet of %d bytes to %s (%s)"),
- outlen, cl->name, cl->hostname);
+ 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_addr.s_addr = htonl(cl->address);
to.sin_port = htons(cl->port);
- if((sendto(myself->socket, (char *) &(outpkt.len), outlen, 0, (const struct sockaddr *)&to, tolen)) < 0)
+ 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 -1;
+ return;
}
cp
- return 0;
}
-int xrecv(connection_t *cl, vpn_packet_t *inpkt)
+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
- outpkt.len = inpkt->len;
-
/* Decrypt the 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);
+ 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);
-/* Bypass
- outlen = outpkt.len+2;
- memcpy(&outpkt, inpkt, outlen);
-*/
+ total_socket_in += outlen;
+
+ receive_packet(cl, &outpkt);
cp
- return receive_packet(cl, &outpkt);
}
-int receive_packet(connection_t *cl, vpn_packet_t *packet)
+void receive_tcppacket(connection_t *cl, char *buffer, int len)
{
- if(debug_lvl >= DEBUG_TRAFFIC)
- syslog(LOG_ERR, _("Writing packet of %d bytes to tap device"),
- packet->len);
+ vpn_packet_t outpkt;
+cp
+ outpkt.len = len;
+ memcpy(outpkt.data, buffer, len);
- /* Fix mac address */
+ receive_packet(cl, &outpkt);
+cp
+}
- memcpy(packet->data, mymac.net.mac.address.x, 6);
+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, packet->data, packet->len) < 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 += packet->len + 2;
+ total_tap_out += packet->len;
}
+#endif
cp
- return 0;
}
/*
send a packet to the given vpn ip.
*/
-int send_packet(ip_t to, vpn_packet_t *packet)
+void send_packet(connection_t *cl, vpn_packet_t *packet)
{
- connection_t *cl;
- subnet_t *subnet;
- vpn_packet_t *copy;
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;
- }
+ if(debug_lvl >= DEBUG_TRAFFIC)
+ syslog(LOG_ERR, _("Sending packet of %d bytes to %s (%s)"),
+ packet->len, cl->name, cl->hostname);
- cl = subnet->owner;
-
if(cl == myself)
{
if(debug_lvl >= DEBUG_TRAFFIC)
{
- syslog(LOG_NOTICE, _("Packet with destination %d.%d.%d.%d is looping back to us!"),
- IP_ADDR_V(to));
+ syslog(LOG_NOTICE, _("Packet is looping back to us!"));
}
- return -1;
+ return;
}
if(!cl->status.active)
syslog(LOG_INFO, _("%s (%s) is not active, dropping packet"),
cl->name, cl->hostname);
- return 0;
+ return;
}
- if(!cl->status.validkey)
+ /* Check if it has to go via TCP or UDP... */
+cp
+ if((cl->options | myself->options) & OPTION_TCPONLY)
{
- if(debug_lvl >= DEBUG_TRAFFIC)
- syslog(LOG_INFO, _("No valid key known yet for %s (%s), queueing packet"),
- cl->name, cl->hostname);
+ if(send_tcppacket(cl, packet))
+ terminate_connection(cl, 1);
+ }
+ else
+ send_udppacket(cl, packet);
+}
- /* Since packet is on the stack of handle_tap_input(),
- we have to make a copy of it first. */
+/* Broadcast a packet to all active direct connections */
- copy = xmalloc(sizeof(vpn_packet_t));
- memcpy(copy, packet, sizeof(vpn_packet_t));
-
- list_insert_tail(cl->queue, copy);
+void broadcast_packet(connection_t *from, vpn_packet_t *packet)
+{
+ avl_node_t *node;
+ connection_t *cl;
+cp
+ if(debug_lvl >= DEBUG_TRAFFIC)
+ syslog(LOG_INFO, _("Broadcasting packet of %d bytes from %s (%s)"),
+ packet->len, from->name, from->hostname);
- if(!cl->status.waitingforkey)
- send_req_key(myself, cl); /* Keys should be sent to the host running the tincd */
- return 0;
+ for(node = connection_tree->head; node; node = node->next)
+ {
+ cl = (connection_t *)node->data;
+ if(cl->status.active && cl != from)
+ send_packet(cl, packet);
}
-
- /* 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)
cp
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)
{
next = node->next;
- xsend(cl, (vpn_packet_t *)node->data);
+ send_udppacket(cl, (vpn_packet_t *)node->data);
list_delete_node(cl->queue, node);
}
cp
struct ifreq ifr;
# endif
#endif
+#ifdef HAVE_SOLARIS
+ int ip_fd = -1, if_fd = -1;
+ int ppa;
+ char *ptr;
+#endif
-cp
+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";
+ tapfname = "/dev/net/tun";
# else
tapfname = "/dev/tap0";
# endif
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;
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 tun/tap device"), tapfname);
taptype = TAP_TYPE_TUNTAP;
}
+ else
#endif
+ {
+ syslog(LOG_INFO, _("%s is an ethertap device"), tapfname);
+ taptype = TAP_TYPE_ETHERTAP;
+ }
#endif
#ifdef HAVE_FREEBSD
+ syslog(LOG_INFO, _("%s is a tun/tap device"), tapfname);
taptype = TAP_TYPE_TUNTAP;
#endif
+#ifdef HAVE_SOLARIS
+ ppa = 0;
+
+ 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 tun/tap device"), tapfname);
+#endif
+
cp
return 0;
}
}
/* 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_BINDTODEVICE, cfg->data.ptr, strlen(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, config_interfaceip)))
a.sin_addr.s_addr = htonl(cfg->data.ip->address);
else
}
/* 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);
*/
int setup_outgoing_connection(char *name)
{
- connection_t *ncn;
+ connection_t *ncn, *old;
struct hostent *h;
config_t const *cfg;
cp
return -1;
}
+ /* 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(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"), 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);
return -1;
}
- ncn->address = ntohl(*((ip_t*)(h->h_addr_list[0])));
+ 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"),
}
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")))
{
cfg->data.ptr);
return -1;
}
- }
+ }
else
{
syslog(LOG_ERR, _("No private key for tinc daemon specified!"));
cp
myself = new_connection();
- asprintf(&myself->hostname, "MYSELF");
- myself->flags = 0;
+ asprintf(&myself->hostname, _("MYSELF"));
+ myself->options = 0;
myself->protocol_version = PROT_CURRENT;
if(!(cfg = get_config_val(config, config_name))) /* Not acceptable */
if(read_rsa_public_key(myself))
return -1;
-cp
+cp
/*
if(RSA_check_key(myself->rsa_key) != 1)
else
myself->port = cfg->data.val;
- if((cfg = get_config_val(myself->config, config_indirectdata)))
- if(cfg->data.val == stupid_true)
- myself->flags |= EXPORTINDIRECTDATA;
-
- 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->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 TCP socket!"));
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);
+ RAND_pseudo_bytes(myself->cipher_pktkey, myself->cipher_pktkeylength);
if(!(cfg = get_config_val(config, config_keyexpire)))
keylifetime = 3600;
else
keylifetime = cfg->data.val;
-
+
keyexpires = time(NULL) + keylifetime;
cp
- /* Check some options */
-
- if((cfg = get_config_val(config, config_indirectdata)))
- {
- if(cfg->data.val == stupid_true)
- myself->options |= OPTION_INDIRECT;
- }
-
- if((cfg = get_config_val(config, config_tcponly)))
- {
- if(cfg->data.val == stupid_true)
- myself->options |= OPTION_TCPONLY;
- }
- /* Activate ourselves */
+ /* Done */
myself->status.active = 1;
+ id_add(myself);
syslog(LOG_NOTICE, _("Ready: listening on port %hd"), myself->port);
cp
cp
cfg = get_config_val(upstreamcfg, config_connectto);
- if(!cfg && upstreamcfg == config)
- /* No upstream IP given, we're listen only. */
- return;
-
+ 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;
/* Run tinc-up script to further initialize the tap interface */
execute_script("tinc-up");
-
+
if(setup_myself() < 0)
return -1;
return 0;
cfg = get_config_val(upstreamcfg, config_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);
+
+ 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;
+
cp
return 0;
}
*/
void close_network_connections(void)
{
- avl_node_t *node;
+ avl_node_t *node, *next;
connection_t *p;
cp
- for(node = connection_tree->head; node; node = node->next)
+ for(node = connection_tree->head; node; node = next)
{
+ next = node->next;
p = (connection_t *)node->data;
- p->status.active = 0;
- terminate_connection(p);
+ p->status.outgoing = 0;
+ terminate_connection(p, 0);
}
- if(myself)
- if(myself->status.active)
- {
- close(myself->meta_socket);
- free_connection(myself);
- myself = NULL;
- }
+ terminate_connection(myself, 0);
- close(tap_fd);
+ destroy_trees();
- /* Execute tinc-down script right after shutting down the interface */
execute_script("tinc-down");
- destroy_connection_tree();
+ close(tap_fd);
cp
return;
}
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->buffer = xmalloc(MAXBUFSIZE);
p->buflen = 0;
p->last_ping_time = time(NULL);
-
+
if(debug_lvl >= DEBUG_CONNECTIONS)
syslog(LOG_NOTICE, _("Connection from %s port %d"),
p->hostname, htons(ci.sin_port));
for(node = connection_tree->head; node; node = node->next)
{
p = (connection_t *)node->data;
- if(p->status.meta)
- FD_SET(p->meta_socket, fs);
+ FD_SET(p->meta_socket, fs);
}
FD_SET(myself->meta_socket, fs);
udp socket and write it to the ethertap
device after being decrypted
*/
-int handle_incoming_vpn_data(void)
+void handle_incoming_vpn_data(void)
{
vpn_packet_t pkt;
int x, l = sizeof(x);
- int lenin;
struct sockaddr_in from;
socklen_t fromlen = sizeof(from);
connection_t *cl;
{
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((lenin = recvfrom(myself->socket, (char *) &(pkt.len), MTU, 0, (struct sockaddr *)&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;
}
- cl = lookup_connection(ntohl(from.sin_addr.s_addr), ntohs(from.sin_port));
-
+ cl = lookup_active(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;
+ return;
}
- if(debug_lvl >= DEBUG_TRAFFIC)
- {
- syslog(LOG_DEBUG, _("Received packet of %d bytes from %s (%s)"), lenin,
- cl->name, cl->hostname);
- }
+ cl->last_ping_time = time(NULL);
+ receive_udppacket(cl, &pkt);
cp
- return xrecv(cl, &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(connection_t *cl)
+void terminate_connection(connection_t *cl, int report)
{
connection_t *p;
subnet_t *subnet;
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);
-
- cl->status.remove = 1;
-
if(cl->socket)
close(cl->socket);
- if(cl->status.meta)
+ if(cl->meta_socket)
close(cl->meta_socket);
+ connection_del(cl);
+
if(cl->status.meta)
{
-
- /* 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(debug_lvl >= DEBUG_CONNECTIONS)
+ syslog(LOG_NOTICE, _("Closing connection with %s (%s)"),
+ cl->name, cl->hostname);
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 :) */
- }
+ {
+ /* 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)
+ {
+ 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 :) */
+ }
+
/* Remove the associated subnets */
for(node = cl->subnet_tree->head; node; node = next)
}
/* Check if this was our outgoing connection */
-
+
if(cl->status.outgoing)
{
cl->status.outgoing = 0;
signal(SIGALRM, sigalrm_handler);
- seconds_till_retry = 5;
alarm(seconds_till_retry);
- syslog(LOG_NOTICE, _("Trying to re-establish outgoing connection in 5 seconds"));
+ syslog(LOG_NOTICE, _("Trying to re-establish outgoing connection in %d seconds"), seconds_till_retry);
}
-
- /* Inactivate */
-
- cl->status.active = 0;
cp
+ /* Schedule it for pruning */
+
+ prune_add(cl);
}
/*
for(node = connection_tree->head; node; node = node->next)
{
cl = (connection_t *)node->data;
- if(cl->status.active && cl->status.meta)
+ if(cl->status.active)
{
if(cl->last_ping_time + timeout < now)
{
syslog(LOG_INFO, _("%s (%s) didn't respond to PING"),
cl->name, cl->hostname);
cl->status.timeout = 1;
- terminate_connection(cl);
+ terminate_connection(cl, 1);
}
else
{
}
connection_add(ncn);
-
+
send_id(ncn);
cp
return 0;
if(p->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(p->meta_socket, f))
+ if(receive_meta(p) < 0)
+ {
+ terminate_connection(p, 1);
+ return;
+ }
}
-
+
if(FD_ISSET(myself->meta_socket, f))
handle_new_meta_connection();
cp
{
vpn_packet_t vp;
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
}
tv.tv_sec = timeout;
tv.tv_usec = 0;
- prune_connection_tree();
+ prune_flush();
build_fdset(&fset);
if((r = select(FD_SETSIZE, &fset, NULL, NULL, &tv)) < 0)
if(read_server_config())
{
syslog(LOG_ERR, _("Unable to reread configuration file, exiting"));
- exit(0);
+ exit(1);
}
sleep(5);
-
+
if(setup_network_connections())
return;
-
+
continue;
}
{
if(debug_lvl >= DEBUG_STATUS)
syslog(LOG_INFO, _("Regenerating symmetric key"));
-
- RAND_bytes(myself->cipher_pktkey, myself->cipher_pktkeylength);
+
+ RAND_pseudo_bytes(myself->cipher_pktkey, myself->cipher_pktkeylength);
send_key_changed(myself, NULL);
keyexpires = time(NULL) + keylifetime;
}
projects / tinc / blobdiff