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.59 2000/11/04 10:37:27 guus Exp $
+ $Id: net.c,v 1.35.4.85 2000/11/30 22:48:48 zarq 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>
#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>
-#include <openssl/rand.h>
-#include <openssl/evp.h>
-#include <openssl/err.h>
+/* SunOS really wants sys/socket.h BEFORE net/if.h,
+ and FreeBSD wants these lines below the rest. */
+#include <arpa/inet.h>
+#include <sys/socket.h>
+#include <net/if.h>
+
+#ifdef HAVE_OPENSSL_RAND_H
+# include <openssl/rand.h>
+#else
+# include <rand.h>
+#endif
+
+#ifdef HAVE_OPENSSL_EVP_H
+# include <openssl/evp.h>
+#else
+# include <evp.h>
+#endif
+
+#ifdef HAVE_OPENSSL_ERR_H
+# include <openssl/err.h>
+#else
+# include <err.h>
+#endif
+
+#ifdef HAVE_OPENSSL_PEM_H
+# include <openssl/pem.h>
+#else
+# include <pem.h>
+#endif
#ifdef HAVE_TUNTAP
#include LINUX_IF_TUN_H
#include <xalloc.h>
#include "conf.h"
-#include "connlist.h"
+#include "connection.h"
+#include "list.h"
#include "meta.h"
#include "net.h"
#include "netutl.h"
+#include "process.h"
#include "protocol.h"
#include "subnet.h"
int keyexpires = 0;
char *unknown = NULL;
-char *interface_name = NULL; /* Contains the name of the interface */
subnet_t mymac;
-/*
- Execute the given script.
- This function doesn't really belong here.
-*/
-int execute_script(const char* name)
-{
- char *scriptname;
- pid_t pid;
- char **env;
- extern char **environment; /* From tincd.c; contains our env */
-
- asprintf(&scriptname, "%s/%s", confbase, name);
-
- if((pid = fork()) < 0)
- {
- syslog(LOG_ERR, _("System call `%s' failed: %m"),
- "fork");
- return -1;
- }
-
- if(pid)
- {
- free(scriptname);
- return 0;
- }
-
- /* Child here */
-
- env = xmalloc(sizeof(environment) + 1 * sizeof(char*));
- memcpy(&(env[1]), environment, sizeof(environment));
- asprintf(&(env[0]), "IFNAME=%s", interface_name);
- execle(scriptname, NULL, env);
- /* No return on success */
-
- if(errno != ENOENT) /* Ignore if the file does not exist */
- syslog(LOG_WARNING, _("Error executing `%s': %m"), scriptname);
-
- /* No need to free things */
- exit(0);
-}
-
-int xsend(conn_list_t *cl, vpn_packet_t *inpkt)
+int xsend(connection_t *cl, vpn_packet_t *inpkt)
{
vpn_packet_t outpkt;
int outlen, outpad;
EVP_CIPHER_CTX ctx;
+ struct sockaddr_in to;
+ socklen_t tolen = sizeof(to);
cp
outpkt.len = inpkt->len;
total_socket_out += outlen;
- cl->want_ping = 1;
+ to.sin_family = AF_INET;
+ to.sin_addr.s_addr = htonl(cl->address);
+ to.sin_port = htons(cl->port);
- if((send(cl->socket, (char *) &(outpkt.len), outlen, 0)) < 0)
+ if((sendto(myself->socket, (char *) &(outpkt.len), outlen, 0, (const struct sockaddr *)&to, tolen)) < 0)
{
syslog(LOG_ERR, _("Error sending packet to %s (%s): %m"),
cl->name, cl->hostname);
return 0;
}
-int xrecv(vpn_packet_t *inpkt)
+int xrecv(connection_t *cl, vpn_packet_t *inpkt)
{
vpn_packet_t outpkt;
int outlen, outpad;
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*))
+void flush_queue(connection_t *cl, packet_queue_t **pq,
+ int (*function)(connection_t*,vpn_packet_t*))
{
queue_element_t *p, *next = NULL;
cp
void because nothing goes wrong here, packets
remain in the queue if something goes wrong
*/
-void flush_queues(conn_list_t *cl)
+void flush_queues(connection_t *cl)
{
cp
if(cl->sq)
*/
int send_packet(ip_t to, vpn_packet_t *packet)
{
- conn_list_t *cl;
+ connection_t *cl;
subnet_t *subnet;
cp
if((subnet = lookup_subnet_ipv4(to)) == NULL)
}
return -1;
- }
+ }
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));
+ }
+
+ return -1;
+ }
+
/* 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)
{
/* FIXME: Don't queue until everything else is fixed.
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, tapdevice)))
+ 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/misc/net/tun";
+ #else
+ tapfname = "/dev/tap0";
+ #endif
#endif
+#ifdef HAVE_FREEBSD
+ tapfname = "/dev/tap0";
+#endif
+#ifdef HAVE_SOLARIS
+ tapfname = "/dev/tun";
+#endif
+ }
cp
if((nfd = open(tapfname, O_RDWR | O_NONBLOCK)) < 0)
{
cp
tap_fd = nfd;
+ taptype = TAP_TYPE_ETHERTAP;
+
/* Set default MAC address for ethertap devices */
- taptype = TAP_TYPE_ETHERTAP;
mymac.type = SUBNET_MAC;
mymac.net.mac.address.x[0] = 0xfe;
mymac.net.mac.address.x[1] = 0xfd;
mymac.net.mac.address.x[4] = 0x00;
mymac.net.mac.address.x[5] = 0x00;
-#ifdef HAVE_TUNTAP
+#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);
taptype = TAP_TYPE_TUNTAP;
}
+ #endif
+#endif
+#ifdef HAVE_FREEBSD
+ taptype = TAP_TYPE_TUNTAP;
#endif
-
- /* Add name of network interface to environment (for scripts) */
-
- ioctl(tap_fd, SIOCGIFNAME, (void *) &ifr);
- interface_name = xmalloc(strlen(ifr.ifr_name));
- strcpy(interface_name, ifr.ifr_name);
-
cp
return 0;
}
if(setsockopt(nfd, SOL_SOCKET, SO_REUSEADDR, &one, sizeof(one)))
{
+ close(nfd);
syslog(LOG_ERR, _("System call `%s' failed: %m"),
"setsockopt");
return -1;
if(setsockopt(nfd, SOL_SOCKET, SO_KEEPALIVE, &one, sizeof(one)))
{
+ close(nfd);
syslog(LOG_ERR, _("System call `%s' failed: %m"),
"setsockopt");
return -1;
flags = fcntl(nfd, F_GETFL);
if(fcntl(nfd, F_SETFL, flags | O_NONBLOCK) < 0)
{
+ close(nfd);
syslog(LOG_ERR, _("System call `%s' failed: %m"),
"fcntl");
return -1;
}
- if((cfg = get_config_val(config, interface)))
+ if((cfg = get_config_val(config, config_interface)))
{
if(setsockopt(nfd, SOL_SOCKET, SO_KEEPALIVE, cfg->data.ptr, strlen(cfg->data.ptr)))
{
+ close(nfd);
syslog(LOG_ERR, _("Unable to bind listen socket to interface %s: %m"), cfg->data.ptr);
return -1;
}
a.sin_family = AF_INET;
a.sin_port = htons(port);
- if((cfg = get_config_val(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))
{
+ close(nfd);
syslog(LOG_ERR, _("System call `%s' failed: %m"),
"listen");
return -1;
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)))
{
+ close(nfd);
syslog(LOG_ERR, _("System call `%s' failed: %m"),
"setsockopt");
return -1;
flags = fcntl(nfd, F_GETFL);
if(fcntl(nfd, F_SETFL, flags | O_NONBLOCK) < 0)
{
+ close(nfd);
syslog(LOG_ERR, _("System call `%s' failed: %m"),
"fcntl");
return -1;
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;
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;
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;
struct hostent *h;
config_t const *cfg;
cp
return -1;
}
- ncn = new_conn_list();
+ 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);
+ 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"));
- free_conn_list(ncn);
+ free_connection(ncn);
return -1;
}
if(!(h = gethostbyname(cfg->data.ptr)))
{
syslog(LOG_ERR, _("Error looking up `%s': %m"), cfg->data.ptr);
- free_conn_list(ncn);
+ free_connection(ncn);
return -1;
}
{
syslog(LOG_ERR, _("Could not set up a meta connection to %s"),
ncn->hostname);
- free_conn_list(ncn);
+ free_connection(ncn);
return -1;
}
ncn->buffer = xmalloc(MAXBUFSIZE);
ncn->buflen = 0;
ncn->last_ping_time = time(NULL);
- ncn->want_ping = 0;
- conn_list_add(ncn);
+ connection_add(ncn);
send_id(ncn);
cp
return 0;
}
+int read_rsa_private_key(RSA **key, const char *file)
+{
+ FILE *fp;
+
+ if((fp = fopen(file, "r")) == NULL)
+ {
+ syslog(LOG_ERR, _("Error reading RSA key file `%s': %m"),
+ file);
+ return -1;
+ }
+ if(PEM_read_RSAPrivateKey(fp, key, NULL, NULL) == NULL)
+ {
+ syslog(LOG_ERR, _("Reading RSA private key file `%s' failed: %m"),
+ cfg->data.ptr);
+ return -1;
+ }
+
+ return 0;
+}
+
+int read_rsa_keys(void)
+{
+ config_t const *cfg;
+
+ if(!(cfg = get_config_val(config, config_privatekey)))
+ {
+ syslog(LOG_ERR, _("Private key for tinc daemon required!"));
+ return -1;
+ }
+
+ myself->rsa_key = RSA_new();
+
+ return read_rsa_private_key(&(myself->rsa_key), cfg->data.ptr);
+}
+
/*
- 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;
cp
- myself = new_conn_list();
+ myself = new_connection();
asprintf(&myself->hostname, "MYSELF"); /* FIXME? Do hostlookup on ourselves? */
myself->flags = 0;
myself->protocol_version = PROT_CURRENT;
- if(!(cfg = get_config_val(config, tincname))) /* Not acceptable */
+ 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_keys())
+ return -1;
if(read_host_config(myself))
{
return -1;
}
cp
- if(!(cfg = get_config_val(myself->config, publickey)))
+ if(!(cfg = get_config_val(myself->config, config_publickey)))
{
syslog(LOG_ERR, _("Public key for tinc daemon required!"));
return -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 = get_config_val(myself->config, config_indirectdata)))
if(cfg->data.val == stupid_true)
myself->flags |= EXPORTINDIRECTDATA;
- if((cfg = get_config_val(myself->config, tcponly)))
+ if((cfg = get_config_val(myself->config, config_tcponly)))
if(cfg->data.val == stupid_true)
myself->flags |= TCPONLY;
/* Read in all the subnets specified in the host configuration file */
- for(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;
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;
}
myself->cipher_pktkey = (char *)xmalloc(myself->cipher_pktkeylength);
RAND_bytes(myself->cipher_pktkey, myself->cipher_pktkeylength);
- if(!(cfg = get_config_val(config, keyexpire)))
+ if(!(cfg = get_config_val(config, config_keyexpire)))
keylifetime = 3600;
else
keylifetime = cfg->data.val;
{
config_t const *cfg;
cp
- cfg = get_config_val(upstreamcfg, connectto);
+ cfg = get_config_val(upstreamcfg, config_connectto);
if(!cfg && upstreamcfg == config)
/* No upstream IP given, we're listen only. */
signal(SIGALRM, SIG_IGN);
return;
}
- cfg = get_config_val(upstreamcfg, connectto); /* Or else we try the next ConnectTo line */
+ cfg = get_config_val(upstreamcfg, config_connectto); /* Or else we try the next ConnectTo line */
}
signal(SIGALRM, sigalrm_handler);
{
config_t const *cfg;
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");
- if(!(cfg = get_config_val(config, connectto)))
+ if(setup_myself() < 0)
+ return -1;
+
+ if(!(cfg = get_config_val(config, config_connectto)))
/* No upstream IP given, we're listen only. */
return 0;
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 */
+ cfg = get_config_val(upstreamcfg, config_connectto); /* Or else we try the next ConnectTo line */
}
signal(SIGALRM, sigalrm_handler);
*/
void close_network_connections(void)
{
- conn_list_t *p;
- char *scriptname;
+ rbl_t *rbl;
+ connection_t *p;
cp
- for(p = conn_list; p != NULL; p = p->next)
+ RBL_FOREACH(connection_tree, rbl)
{
+ p = (connection_t *)rbl->data;
p->status.active = 0;
terminate_connection(p);
}
if(myself->status.active)
{
close(myself->meta_socket);
- close(myself->socket);
- free_conn_list(myself);
+ free_connection(myself);
myself = NULL;
}
- /* Execute tinc-down script right before shutting down the interface */
- execute_script("tinc-down");
-
close(tap_fd);
- destroy_conn_list();
- syslog(LOG_NOTICE, _("Terminating"));
+ /* Execute tinc-down script right after shutting down the interface */
+ execute_script("tinc-down");
+
+ destroy_connection_tree();
cp
return;
}
/*
create a data (udp) socket
+ OBSOLETED: use only one listening socket for compatibility with non-Linux operating systems
*/
-int setup_vpn_connection(conn_list_t *cl)
+int setup_vpn_connection(connection_t *cl)
{
int nfd, flags;
struct sockaddr_in a;
+ const int one = 1;
cp
if(debug_lvl >= DEBUG_TRAFFIC)
syslog(LOG_DEBUG, _("Opening UDP socket to %s"), cl->hostname);
return -1;
}
+ if(setsockopt(nfd, SOL_SOCKET, SO_REUSEADDR, &one, sizeof(one)))
+ {
+ close(nfd);
+ syslog(LOG_ERR, _("System call `%s' failed: %m"),
+ "setsockopt");
+ return -1;
+ }
+
+ flags = fcntl(nfd, F_GETFL);
+ if(fcntl(nfd, F_SETFL, flags | O_NONBLOCK) < 0)
+ {
+ close(nfd);
+ syslog(LOG_ERR, _("System call `%s' failed: %m"),
+ "fcntl");
+ return -1;
+ }
+
+ memset(&a, 0, sizeof(a));
+ a.sin_family = AF_INET;
+ a.sin_port = htons(myself->port);
+ a.sin_addr.s_addr = htonl(INADDR_ANY);
+
+ if(bind(nfd, (struct sockaddr *)&a, sizeof(struct sockaddr)))
+ {
+ close(nfd);
+ syslog(LOG_ERR, _("Can't bind to port %hd/udp: %m"), myself->port);
+ return -1;
+ }
+
a.sin_family = AF_INET;
a.sin_port = htons(cl->port);
a.sin_addr.s_addr = htonl(cl->address);
if(connect(nfd, (struct sockaddr *)&a, sizeof(a)) == -1)
{
+ close(nfd);
syslog(LOG_ERR, _("Connecting to %s port %d failed: %m"),
cl->hostname, cl->port);
return -1;
flags = fcntl(nfd, F_GETFL);
if(fcntl(nfd, F_SETFL, flags | O_NONBLOCK) < 0)
{
+ close(nfd);
syslog(LOG_ERR, _("This is a bug: %s:%d: %d:%m %s (%s)"), __FILE__, __LINE__, nfd,
cl->name, cl->hostname);
return -1;
handle an incoming tcp connect call and open
a connection to it.
*/
-conn_list_t *create_new_connection(int sfd)
+connection_t *create_new_connection(int sfd)
{
- conn_list_t *p;
+ connection_t *p;
struct sockaddr_in ci;
int len = sizeof(ci);
cp
- p = new_conn_list();
+ p = new_connection();
- if(getpeername(sfd, &ci, &len) < 0)
+ if(getpeername(sfd, (struct sockaddr *) &ci, (socklen_t *) &len) < 0)
{
syslog(LOG_ERR, _("System call `%s' failed: %m"),
"getpeername");
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"),
*/
void build_fdset(fd_set *fs)
{
- conn_list_t *p;
+ rbl_t *rbl;
+ connection_t *p;
cp
FD_ZERO(fs);
- for(p = conn_list; p != NULL; p = p->next)
+ FD_SET(myself->socket, fs);
+
+ RBL_FOREACH(connection_tree, rbl)
{
+ p = (connection_t *)rbl->data;
if(p->status.meta)
- FD_SET(p->meta_socket, fs);
- if(p->status.dataopen)
- FD_SET(p->socket, fs);
+ FD_SET(p->meta_socket, fs);
}
FD_SET(myself->meta_socket, fs);
- FD_SET(myself->socket, fs);
FD_SET(tap_fd, fs);
cp
}
udp socket and write it to the ethertap
device after being decrypted
*/
-int handle_incoming_vpn_data()
+int handle_incoming_vpn_data(void)
{
vpn_packet_t pkt;
int x, l = sizeof(x);
- struct sockaddr from;
int lenin;
+ struct sockaddr_in from;
socklen_t fromlen = sizeof(from);
+ connection_t *cl;
cp
if(getsockopt(myself->socket, SOL_SOCKET, SO_ERROR, &x, &l) < 0)
{
return -1;
}
- if((lenin = recvfrom(myself->socket, (char *) &(pkt.len), MTU, 0, &from, &fromlen)) <= 0)
+ if((lenin = recvfrom(myself->socket, (char *) &(pkt.len), MTU, 0, (struct sockaddr *)&from, &fromlen)) <= 0)
{
syslog(LOG_ERR, _("Receiving packet failed: %m"));
return -1;
}
+ cl = lookup_connection(ntohl(from.sin_addr.s_addr), ntohs(from.sin_port));
+
+ if(!cl)
+ {
+ syslog(LOG_WARNING, _("Received UDP packets on port %d from unknown source %lx:%d"), ntohl(from.sin_addr.s_addr), ntohs(from.sin_port));
+ return 0;
+ }
+
if(debug_lvl >= DEBUG_TRAFFIC)
{
- syslog(LOG_DEBUG, _("Received packet of %d bytes"), lenin);
- }
+ syslog(LOG_DEBUG, _("Received packet of %d bytes from %s (%s)"), lenin,
+ cl->name, cl->hostname);
+ }
cp
- return xrecv(&pkt);
+ return xrecv(cl, &pkt);
}
/*
terminate a connection and notify the other
end before closing the sockets
*/
-void terminate_connection(conn_list_t *cl)
+void terminate_connection(connection_t *cl)
{
- conn_list_t *p;
- subnet_t *s;
+ connection_t *p;
+ subnet_t *subnet;
+ rbl_t *rbl;
cp
if(cl->status.remove)
return;
if(cl->status.meta)
close(cl->meta_socket);
-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((p->nexthop == cl) && (p != cl))
- terminate_connection(p); /* Sounds like recursion, but p does not have a meta connection :) */
+ RBL_FOREACH(connection_tree, rbl)
+ {
+ p = (connection_t *)rbl->data;
+ if(p->nexthop == cl && p != cl)
+ terminate_connection(p);
+ }
/* Inform others of termination if it was still active */
if(cl->status.active)
- for(p = conn_list; p != NULL; p = p->next)
- if(p->status.meta && p->status.active && p!=cl)
- send_del_host(p, cl);
+ RBL_FOREACH(connection_tree, rbl)
+ {
+ p = (connection_t *)rbl->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(s = cl->subnets; s; s = s->next)
- subnet_del(s);
+ RBL_FOREACH(cl->subnet_tree, rbl)
+ {
+ subnet = (subnet_t *)rbl->data;
+ subnet_del(subnet);
+ }
/* Check if this was our outgoing connection */
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;
+ rbl_t *rbl;
+ connection_t *cl;
cp
now = time(NULL);
- for(p = conn_list; p != NULL; p = p->next)
+
+ RBL_FOREACH(connection_tree, rbl)
{
- if(p->status.active && p->status.meta)
- {
- if(p->last_ping_time + timeout < now)
+ cl = (connection_t *)rbl->data;
+ if(cl->status.active && cl->status.meta)
+ {
+ if(cl->last_ping_time + timeout < now)
{
- if(p->status.pinged && !p->status.got_pong)
+ if(cl->status.pinged)
{
if(debug_lvl >= DEBUG_PROTOCOL)
syslog(LOG_INFO, _("%s (%s) didn't respond to PING"),
- p->name, p->hostname);
- p->status.timeout = 1;
- terminate_connection(p);
+ cl->name, cl->hostname);
+ cl->status.timeout = 1;
+ terminate_connection(cl);
}
- else if(p->want_ping)
+ else
{
- send_ping(p);
- p->last_ping_time = now;
- p->status.pinged = 1;
- p->status.got_pong = 0;
+ send_ping(cl);
}
}
- }
+ }
}
cp
- return 0;
}
/*
*/
int handle_new_meta_connection()
{
- conn_list_t *ncn;
+ connection_t *ncn;
struct sockaddr client;
int nfd, len = sizeof(client);
cp
return 0;
}
- conn_list_add(ncn);
+ connection_add(ncn);
cp
return 0;
}
*/
void check_network_activity(fd_set *f)
{
- conn_list_t *p;
- int x, l = sizeof(x);
+ connection_t *p;
+ rbl_t *rbl;
cp
- for(p = conn_list; p != NULL; p = p->next)
+ if(FD_ISSET(myself->socket, f))
+ handle_incoming_vpn_data();
+
+ RBL_FOREACH(connection_tree, rbl)
{
+ p = (connection_t *)rbl->data;
+
if(p->status.remove)
- continue;
-
- if(p->status.dataopen)
- if(FD_ISSET(p->socket, f))
- {
- /*
- The only thing that can happen to get us here is apparently an
- error on this outgoing(!) UDP socket that isn't immediate (i.e.
- something that will not trigger an error directly on send()).
- I've once got here when it said `No route to host'.
- */
- getsockopt(p->socket, SOL_SOCKET, SO_ERROR, &x, &l);
- syslog(LOG_ERR, _("Outgoing data socket error for %s (%s): %s"),
- p->name, p->hostname, strerror(x));
- terminate_connection(p);
- return;
- }
+ return;
if(p->status.meta)
if(FD_ISSET(p->meta_socket, f))
return;
}
}
-
- if(FD_ISSET(myself->socket, f))
- handle_incoming_vpn_data();
-
+
if(FD_ISSET(myself->meta_socket, f))
handle_new_meta_connection();
cp
tv.tv_sec = timeout;
tv.tv_usec = 0;
- prune_conn_list();
+ prune_connection_tree();
build_fdset(&fset);
if((r = select(FD_SETSIZE, &fset, NULL, NULL, &tv)) < 0)
projects / tinc / blobdiff