X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnet.c;h=47c185d4485e60db8ce000c6741389bc56cd3c76;hp=90bb88f160086525812438a9b93c518cf192cebf;hb=56d8e862409ae91c63a27968b01a48a94aafb205;hpb=643d8712eb2f82bde21f206306cdb6491eee7e08 diff --git a/src/net.c b/src/net.c index 90bb88f1..47c185d4 100644 --- a/src/net.c +++ b/src/net.c @@ -1,6 +1,7 @@ /* net.c -- most of the network code - Copyright (C) 1998,99 Ivo Timmermans + Copyright (C) 1998,1999,2000 Ivo Timmermans , + 2000 Guus Sliepen 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 @@ -15,6 +16,8 @@ You should have received a copy of the GNU General Public License 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.44 2000/10/22 13:37:15 zarq Exp $ */ #include "config.h" @@ -22,6 +25,8 @@ #include #include #include +#include +#include #include #include #include @@ -34,7 +39,10 @@ #include #include -#include +#ifdef HAVE_TUNTAP +#include LINUX_IF_TUN_H +#endif + #include #include @@ -43,30 +51,29 @@ #include "net.h" #include "netutl.h" #include "protocol.h" +#include "meta.h" -int tap_fd = -1; +#include "system.h" +int tap_fd = -1; +int taptype = 0; int total_tap_in = 0; int total_tap_out = 0; int total_socket_in = 0; int total_socket_out = 0; -time_t last_ping_time = 0; +int upstreamindex = 0; +static int seconds_till_retry; -/* The global list of existing connections */ -conn_list_t *conn_list = NULL; -conn_list_t *myself = NULL; +char *unknown = NULL; /* strip off the MAC adresses of an ethernet frame */ void strip_mac_addresses(vpn_packet_t *p) { - unsigned char tmp[MAXSIZE]; cp - memcpy(tmp, p->data, p->len); - p->len -= 12; - memcpy(p->data, &tmp[12], p->len); + memmove(p->data, p->data + 12, p->len -= 12); cp } @@ -75,73 +82,68 @@ cp */ void add_mac_addresses(vpn_packet_t *p) { - unsigned char tmp[MAXSIZE]; cp - memcpy(&tmp[12], p->data, p->len); + memcpy(p->data + 12, p->data, p->len); p->len += 12; - tmp[0] = tmp[6] = 0xfe; - tmp[1] = tmp[7] = 0xfd; - *((ip_t*)(&tmp[2])) = (ip_t)(htonl(myself->vpn_ip)); - *((ip_t*)(&tmp[8])) = *((ip_t*)(&tmp[26])); - memcpy(p->data, &tmp[0], p->len); + 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])); cp } -int xsend(conn_list_t *cl, void *packet) +int xsend(conn_list_t *cl, vpn_packet_t *inpkt) { - int r; - real_packet_t rp; + vpn_packet_t outpkt; + int outlen, outpad; cp - do_encrypt((vpn_packet_t*)packet, &rp, cl->key); - rp.from = myself->vpn_ip; + 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; + + if(debug_lvl >= DEBUG_TRAFFIC) + syslog(LOG_ERR, _("Sending packet of %d bytes to %s (%s)"), + outlen, cl->name, cl->hostname); + + total_socket_out += outlen; - if(debug_lvl > 3) - syslog(LOG_ERR, "Sent %d bytes to %lx", rp.len, cl->vpn_ip); + cl->want_ping = 1; - if((r = send(cl->socket, (char*)&rp, rp.len, 0)) < 0) + if((send(cl->socket, (char *) &(outpkt.len), outlen + 2, 0)) < 0) { - syslog(LOG_ERR, "Error sending data: %m"); + syslog(LOG_ERR, _("Error sending packet to %s (%s): %m"), + cl->name, cl->hostname); return -1; } - - total_socket_out += r; cp return 0; } -/* - write as many bytes as possible to the tap - device, possibly in multiple turns. -*/ -int write_n(int fd, void *buf, size_t len) -{ - int r, done = 0; -cp - do - { - if((r = write(fd, buf, len)) < 0) - return -1; - len -= r; - buf += r; - done += r; - } while(len > 0); - - return done; -cp -} - -int xrecv(conn_list_t *cl, void *packet) +int xrecv(vpn_packet_t *inpkt) { - vpn_packet_t vp; - int lenin; + vpn_packet_t outpkt; + int outlen, outpad; cp - do_decrypt((real_packet_t*)packet, &vp, cl->key); - add_mac_addresses(&vp); - - if((lenin = write_n(tap_fd, &vp, vp.len + 2)) < 0) - syslog(LOG_ERR, "Can't write to tap device: %m"); + if(debug_lvl > DEBUG_TRAFFIC) + syslog(LOG_ERR, _("Receiving packet of %d bytes"), + inpkt->len); + + outpkt.len = inpkt->len; + EVP_DecryptInit(myself->cipher_pktctx, myself->cipher_pkttype, myself->cipher_pktkey, NULL); + EVP_DecryptUpdate(myself->cipher_pktctx, outpkt.data, &outlen, inpkt->data, inpkt->len); + /* FIXME: grok DecryptFinal + EVP_DecryptFinal(myself->cipher_pktctx, outpkt.data + outlen, &outpad); + */ + + add_mac_addresses(&outpkt); + + if(write(tap_fd, outpkt.data, outpkt.len) < 0) + syslog(LOG_ERR, _("Can't write to tap device: %m")); else - total_tap_out += lenin; + total_tap_out += outpkt.len; cp return 0; } @@ -154,16 +156,13 @@ void add_queue(packet_queue_t **q, void *packet, size_t s) { queue_element_t *e; cp - if(debug_lvl > 3) - syslog(LOG_DEBUG, "packet to queue: %d", s); - - e = xmalloc(sizeof(queue_element_t)); + e = xmalloc(sizeof(*e)); e->packet = xmalloc(s); memcpy(e->packet, packet, s); if(!*q) { - *q = xmalloc(sizeof(packet_queue_t)); + *q = xmalloc(sizeof(**q)); (*q)->head = (*q)->tail = NULL; } @@ -241,8 +240,8 @@ cp p = next; } - if(debug_lvl > 3) - syslog(LOG_DEBUG, "queue flushed"); + if(debug_lvl >= DEBUG_TRAFFIC) + syslog(LOG_DEBUG, _("Queue flushed")); cp } @@ -256,17 +255,17 @@ void flush_queues(conn_list_t *cl) cp if(cl->sq) { - if(debug_lvl > 1) - syslog(LOG_DEBUG, "Flushing send queue for " IP_ADDR_S, - IP_ADDR_V(cl->vpn_ip)); + 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(cl->rq) { - if(debug_lvl > 1) - syslog(LOG_DEBUG, "Flushing receive queue for " IP_ADDR_S, - IP_ADDR_V(cl->vpn_ip)); + if(debug_lvl >= DEBUG_TRAFFIC) + syslog(LOG_DEBUG, _("Flushing receive queue for %s (%s)"), + cl->name, cl->hostname); flush_queue(cl, &(cl->rq), xrecv); } cp @@ -279,42 +278,46 @@ int send_packet(ip_t to, vpn_packet_t *packet) { conn_list_t *cl; cp - if((cl = lookup_conn(to)) == NULL) + if((cl = lookup_conn_list_ipv4(to)) == NULL) { - if(debug_lvl > 2) + if(debug_lvl >= DEBUG_TRAFFIC) { - syslog(LOG_NOTICE, "trying to look up " IP_ADDR_S " in connection list failed.", + syslog(LOG_NOTICE, _("Trying to look up %d.%d.%d.%d in connection list failed!"), IP_ADDR_V(to)); } - for(cl = conn_list; cl != NULL && !cl->status.outgoing; cl = cl->next); - if(!cl) - { /* No open outgoing connection has been found. */ - if(debug_lvl > 2) - syslog(LOG_NOTICE, "There is no remote host I can send this packet to."); - return -1; - } - } - if(my_key_expiry <= time(NULL)) - regenerate_keys(); + 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) - return -1; - + { + syslog(LOG_ERR, _("Could not open UDP connection to %s (%s)"), + cl->name, cl->hostname); + return -1; + } + 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); add_queue(&(cl->sq), packet, packet->len + 2); if(!cl->status.waitingforkey) - send_key_request(cl->vpn_ip); /* Keys should be sent to the host running the tincd */ + send_req_key(myself, cl); /* Keys should be sent to the host running the tincd */ return 0; } if(!cl->status.active) { + 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); - if(debug_lvl > 1) - syslog(LOG_INFO, IP_ADDR_S " is not ready, queueing packet.", IP_ADDR_V(cl->vpn_ip)); return 0; /* We don't want to mess up, do we? */ } @@ -323,21 +326,6 @@ cp return xsend(cl, packet); } -int send_broadcast(conn_list_t *cl, vpn_packet_t *packet) -{ - conn_list_t *p; -cp - for(p = cl; p != NULL; p = p->next) - if(send_packet(p->real_ip, packet) < 0) - { - syslog(LOG_ERR, "Could not send a broadcast packet to %08lx (%08lx): %m", - p->vpn_ip, p->real_ip); - break; /* FIXME: should retry later, and send a ping over the metaconnection. */ - } -cp - return 0; -} - /* open the local ethertap device */ @@ -346,19 +334,56 @@ int setup_tap_fd(void) int nfd; const char *tapfname; config_t const *cfg; + char *envvar; + struct ifreq ifr; + cp - if((cfg = get_config_val(tapdevice)) == NULL) - tapfname = "/dev/tap0"; - else + if((cfg = get_config_val(config, tapdevice))) tapfname = cfg->data.ptr; - + else +#ifdef HAVE_TUNTAP + tapfname = "/dev/misc/net/tun"; +#else + tapfname = "/dev/tap0"; +#endif +cp if((nfd = open(tapfname, O_RDWR | O_NONBLOCK)) < 0) { - syslog(LOG_ERR, "Could not open %s: %m", tapfname); + syslog(LOG_ERR, _("Could not open %s: %m"), tapfname); return -1; } - +cp tap_fd = nfd; + + taptype = 0; + +#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 = 1; + + if((cfg = get_config_val(config, tapsubnet)) == NULL) + syslog(LOG_INFO, _("tun/tap device will be left unconfigured")); + else + /* Setup inetaddr/netmask etc */; + } +#endif + + /* Add name of network interface to environment (for scripts) */ + + ioctl(tap_fd, SIOCGIFNAME, (void *) &ifr); + asprintf(&envvar, "IFNAME=%s", ifr.ifr_name); + putenv(envvar); + free(envvar); + cp return 0; } @@ -372,40 +397,60 @@ int setup_listen_meta_socket(int port) int nfd, flags; struct sockaddr_in a; const int one = 1; + config_t const *cfg; cp if((nfd = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP)) < 0) { - syslog(LOG_ERR, "Creating metasocket failed: %m"); + syslog(LOG_ERR, _("Creating metasocket failed: %m")); return -1; } if(setsockopt(nfd, SOL_SOCKET, SO_REUSEADDR, &one, sizeof(one))) { - syslog(LOG_ERR, "setsockopt: %m"); + 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"); + syslog(LOG_ERR, _("fcntl: %m")); return -1; } + if((cfg = get_config_val(config, interface))) + { + if(setsockopt(nfd, SOL_SOCKET, SO_KEEPALIVE, cfg->data.ptr, strlen(cfg->data.ptr))) + { + syslog(LOG_ERR, _("Unable to bind listen socket to interface %s: %m"), cfg->data.ptr); + return -1; + } + } + memset(&a, 0, sizeof(a)); a.sin_family = AF_INET; a.sin_port = htons(port); - a.sin_addr.s_addr = htonl(INADDR_ANY); + + if((cfg = get_config_val(config, interfaceip))) + a.sin_addr.s_addr = htonl(cfg->data.ip->ip); + else + a.sin_addr.s_addr = htonl(INADDR_ANY); if(bind(nfd, (struct sockaddr *)&a, sizeof(struct sockaddr))) { - syslog(LOG_ERR, "Can't bind to port %hd/tcp: %m", port); + syslog(LOG_ERR, _("Can't bind to port %hd/tcp: %m"), port); return -1; } if(listen(nfd, 3)) { - syslog(LOG_ERR, "listen: %m"); + syslog(LOG_ERR, _("listen: %m")); return -1; } cp @@ -424,20 +469,20 @@ int setup_vpn_in_socket(int port) cp if((nfd = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP)) < 0) { - syslog(LOG_ERR, "Creating socket failed: %m"); + syslog(LOG_ERR, _("Creating socket failed: %m")); return -1; } if(setsockopt(nfd, SOL_SOCKET, SO_REUSEADDR, &one, sizeof(one))) { - syslog(LOG_ERR, "setsockopt: %m"); + 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"); + syslog(LOG_ERR, _("fcntl: %m")); return -1; } @@ -448,7 +493,7 @@ cp if(bind(nfd, (struct sockaddr *)&a, sizeof(struct sockaddr))) { - syslog(LOG_ERR, "Can't bind to port %hd/udp: %m", port); + syslog(LOG_ERR, _("Can't bind to port %hd/udp: %m"), port); return -1; } cp @@ -464,7 +509,10 @@ int setup_outgoing_meta_socket(conn_list_t *cl) struct sockaddr_in a; config_t const *cfg; cp - if((cfg = get_config_val(upstreamport)) == NULL) + if(debug_lvl >= DEBUG_CONNECTIONS) + syslog(LOG_INFO, _("Trying to connect to %s"), cl->hostname); + + if((cfg = get_config_val(cl->config, port)) == NULL) cl->port = 655; else cl->port = cfg->data.val; @@ -472,30 +520,34 @@ cp cl->meta_socket = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); if(cl->meta_socket == -1) { - syslog(LOG_ERR, "Creating socket failed: %m"); + syslog(LOG_ERR, _("Creating socket for %s port %d failed: %m"), + cl->hostname, cl->port); return -1; } a.sin_family = AF_INET; a.sin_port = htons(cl->port); - a.sin_addr.s_addr = htonl(cl->real_ip); + a.sin_addr.s_addr = htonl(cl->address); if(connect(cl->meta_socket, (struct sockaddr *)&a, sizeof(a)) == -1) { - syslog(LOG_ERR, IP_ADDR_S ":%d: %m", IP_ADDR_V(cl->real_ip), cl->port); + 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) { - syslog(LOG_ERR, "fcntl: %m"); + syslog(LOG_ERR, _("fcntl for %s port %d: %m"), + cl->hostname, cl->port); return -1; } - cl->hostname = hostlookup(htonl(cl->real_ip)); + if(debug_lvl >= DEBUG_CONNECTIONS) + syslog(LOG_INFO, _("Connected to %s port %hd"), + cl->hostname, cl->port); - syslog(LOG_INFO, "Connected to %s:%hd" , cl->hostname, cl->port); + cl->status.meta = 1; cp return 0; } @@ -507,24 +559,62 @@ cp an authentication sequence during which we will do just that. */ -int setup_outgoing_connection(ip_t ip) +int setup_outgoing_connection(char *name) { conn_list_t *ncn; + struct hostent *h; + config_t *cfg; cp + if(check_id(name)) + { + syslog(LOG_ERR, _("Invalid name for outgoing connection")); + return -1; + } + ncn = new_conn_list(); - ncn->real_ip = ip; + asprintf(&ncn->name, "%s", name); + + if(read_host_config(ncn)) + { + syslog(LOG_ERR, _("Error reading host configuration file for %s")); + free_conn_list(ncn); + return -1; + } + + if(!(cfg = get_config_val(ncn->config, address))) + { + syslog(LOG_ERR, _("No address specified for %s")); + free_conn_list(ncn); + return -1; + } + + if(!(h = gethostbyname(cfg->data.ptr))) + { + syslog(LOG_ERR, _("Error looking up `%s': %m"), cfg->data.ptr); + free_conn_list(ncn); + 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) { - syslog(LOG_ERR, "Could not set up a meta connection."); - free_conn_element(ncn); + syslog(LOG_ERR, _("Could not set up a meta connection to %s"), + ncn->hostname); + free_conn_list(ncn); return -1; } - ncn->status.meta = 1; ncn->status.outgoing = 1; - ncn->next = conn_list; - conn_list = ncn; + ncn->buffer = xmalloc(MAXBUFSIZE); + ncn->buflen = 0; + ncn->last_ping_time = time(NULL); + ncn->want_ping = 0; + + conn_list_add(ncn); + + send_id(ncn); cp return 0; } @@ -538,49 +628,133 @@ int setup_myself(void) cp myself = new_conn_list(); - if(!(cfg = get_config_val(myvpnip))) + 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 */ { - syslog(LOG_ERR, "No value for my VPN IP given"); + syslog(LOG_ERR, _("Name for tinc daemon required!")); return -1; } + else + asprintf(&myself->name, "%s", (char*)cfg->data.val); - myself->vpn_ip = cfg->data.ip->ip; - myself->vpn_mask = cfg->data.ip->mask; + if(check_id(myself->name)) + { + syslog(LOG_ERR, _("Invalid name for myself!")); + 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(!(cfg = get_config_val(listenport))) + 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(RSA_check_key(myself->rsa_key) != 1) + { + syslog(LOG_ERR, _("Invalid public/private keypair!")); + return -1; + } +*/ + if(!(cfg = get_config_val(myself->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; + 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 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"); + syslog(LOG_ERR, _("Unable to set up an incoming vpn data socket!")); close(myself->meta_socket); return -1; } myself->status.active = 1; - syslog(LOG_NOTICE, "Ready: listening on port %d.", myself->port); + 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_next_config_val(config, connectto, upstreamindex++); + + if(!upstreamindex && !cfg) + /* No upstream IP given, we're listen only. */ + return; + + while(cfg) + { + if(!setup_outgoing_connection(cfg->data.ptr)) /* function returns 0 when there are no problems */ + { + signal(SIGALRM, SIG_IGN); + return; + } + cfg = get_next_config_val(config, connectto, upstreamindex++); /* Or else we try the next ConnectTo line */ + } + + signal(SIGALRM, sigalrm_handler); + upstreamindex = 0; + 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; + char *scriptname; cp - if((cfg = get_config_val(pingtimeout)) == NULL) - timeout = 10; + if((cfg = get_config_val(config, pingtimeout)) == NULL) + timeout = 5; else timeout = cfg->data.val; @@ -590,38 +764,41 @@ cp if(setup_myself() < 0) return -1; - if((cfg = get_config_val(upstreamip)) == NULL) - /* No upstream IP given, we're listen only. */ - return 0; + /* Run tinc-up script to further initialize the tap interface */ - if(setup_outgoing_connection(cfg->data.ip->ip)) - return -1; -cp - return 0; -} - -RETSIGTYPE -sigalrm_handler(int a) -{ - config_t const *cfg; - static int seconds_till_retry; -cp - cfg = get_config_val(upstreamip); + asprintf(&scriptname, "%s/tinc-up", confbase); - if(!setup_outgoing_connection(cfg->data.ip->ip)) + if(!fork()) { - signal(SIGALRM, SIG_IGN); - seconds_till_retry = 5; + + execl(scriptname, NULL); + + if(errno != ENOENT) + syslog(LOG_WARNING, _("Error while executing %s: %m"), scriptname); + + exit(0); } - else + + free(scriptname); + + if((cfg = get_next_config_val(config, connectto, upstreamindex++)) == NULL) + /* No upstream IP given, we're listen only. */ + return 0; + + while(cfg) { - signal(SIGALRM, sigalrm_handler); - seconds_till_retry += 5; - alarm(seconds_till_retry); - syslog(LOG_ERR, "Still failed to connect to other. Will retry in %d seconds.", - seconds_till_retry); + if(!setup_outgoing_connection(cfg->data.ptr)) /* function returns 0 when there are no problems */ + return 0; + cfg = get_next_config_val(config, connectto, upstreamindex++); /* Or else we try the next ConnectTo line */ } + + signal(SIGALRM, sigalrm_handler); + upstreamindex = 0; + seconds_till_retry = MAXTIMEOUT; + syslog(LOG_NOTICE, _("Trying to re-establish outgoing connection in %d seconds"), seconds_till_retry); + alarm(seconds_till_retry); cp + return 0; } /* @@ -630,6 +807,7 @@ cp void close_network_connections(void) { conn_list_t *p; + char *scriptname; cp for(p = conn_list; p != NULL; p = p->next) { @@ -653,10 +831,26 @@ cp close(myself->socket); } + /* Execute tinc-down script right before shutting down the interface */ + + asprintf(&scriptname, "%s/tinc-down", confbase); + + if(!fork()) + { + execl(scriptname, NULL); + + if(errno != ENOENT) + syslog(LOG_WARNING, _("Error while executing %s: %m"), scriptname); + + exit(0); + } + + free(scriptname); + close(tap_fd); destroy_conn_list(); - syslog(LOG_NOTICE, "Terminating."); + syslog(LOG_NOTICE, _("Terminating")); cp return; } @@ -669,31 +863,32 @@ int setup_vpn_connection(conn_list_t *cl) int nfd, flags; struct sockaddr_in a; cp - if(debug_lvl > 1) - syslog(LOG_DEBUG, "Opening UDP socket to " IP_ADDR_S, IP_ADDR_V(cl->real_ip)); + 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 data socket failed: %m"); + 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->real_ip); + a.sin_addr.s_addr = htonl(cl->address); if(connect(nfd, (struct sockaddr *)&a, sizeof(a)) == -1) { - syslog(LOG_ERR, "Create connection to %08lx:%d failed: %m", ntohs(cl->real_ip), - cl->port); + 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", __FILE__, __LINE__, nfd); + syslog(LOG_ERR, _("This is a bug: %s:%d: %d:%m %s (%s)"), __FILE__, __LINE__, nfd, + cl->name, cl->hostname); return -1; } @@ -717,22 +912,25 @@ cp if(getpeername(sfd, &ci, &len) < 0) { - syslog(LOG_ERR, "Error: getpeername: %m"); + syslog(LOG_ERR, _("Error: getpeername: %m")); return NULL; } + p->name = unknown; + p->address = ntohl(ci.sin_addr.s_addr); p->hostname = hostlookup(ci.sin_addr.s_addr); - p->real_ip = ntohl(ci.sin_addr.s_addr); 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)); - syslog(LOG_NOTICE, "Connection from %s:%d", p->hostname, htons(ci.sin_port)); - - if(send_basic_info(p) < 0) - { - free(p); - return NULL; - } + p->allow_request = ID; cp return p; } @@ -765,59 +963,32 @@ cp udp socket and write it to the ethertap device after being decrypted */ -int handle_incoming_vpn_data(conn_list_t *cl) +int handle_incoming_vpn_data() { - real_packet_t rp; + vpn_packet_t pkt; int lenin; int x, l = sizeof(x); - conn_list_t *f; cp - if(getsockopt(cl->socket, SOL_SOCKET, SO_ERROR, &x, &l) < 0) + if(getsockopt(myself->socket, SOL_SOCKET, SO_ERROR, &x, &l) < 0) { - syslog(LOG_ERR, "This is a bug: %s:%d: %d:%m", __FILE__, __LINE__, cl->socket); + syslog(LOG_ERR, _("This is a bug: %s:%d: %d:%m"), + __FILE__, __LINE__, myself->socket); return -1; } if(x) { - syslog(LOG_ERR, "Incoming data socket error: %s", sys_errlist[x]); + syslog(LOG_ERR, _("Incoming data socket error: %s"), strerror(x)); return -1; } - rp.len = -1; - lenin = recvfrom(cl->socket, &rp, MTU, 0, NULL, NULL); - if(lenin <= 0) + if(recvfrom(myself->socket, (char *) &(pkt.len), MTU, 0, NULL, NULL) <= 0) { - syslog(LOG_ERR, "Receiving data failed: %m"); + syslog(LOG_ERR, _("Receiving packet failed: %m")); return -1; } - total_socket_in += lenin; - if(rp.len >= 0) - { - f = lookup_conn(rp.from); - if(debug_lvl > 3) - syslog(LOG_DEBUG, "packet from " IP_ADDR_S " (len %d)", - IP_ADDR_V(rp.from), rp.len); - if(!f) - { - syslog(LOG_ERR, "Got packet from unknown source " IP_ADDR_S, - IP_ADDR_V(rp.from)); - return -1; - } - - if(f->status.validkey) - xrecv(f, &rp); - else - { - add_queue(&(f->rq), &rp, rp.len); - if(!cl->status.waitingforkey) - send_key_request(rp.from); - } - if(my_key_expiry <= time(NULL)) - regenerate_keys(); - } cp - return 0; + return xrecv(&pkt); } /* @@ -826,80 +997,99 @@ cp */ void terminate_connection(conn_list_t *cl) { + conn_list_t *p; + cp if(cl->status.remove) return; - if(debug_lvl > 0) - syslog(LOG_NOTICE, "Closing connection with %s.", cl->hostname); - - if(cl->status.timeout) - send_timeout(cl); - else if(!cl->status.termreq) - send_termreq(cl); - - close(cl->socket); + 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) close(cl->meta_socket); - if(cl->status.outgoing) - { - alarm(5); - signal(SIGALRM, sigalrm_handler); - syslog(LOG_NOTICE, "Try to re-establish outgoing connection in 5 seconds."); - } - cl->status.remove = 1; -cp -} -/* - send out a ping request to all active - connections + /* If this cl isn't active, don't send any DEL_HOSTs. */ + +/* FIXME: reprogram this. + if(cl->status.active) + notify_others(cl,NULL,send_del_host); */ -int send_broadcast_ping(void) -{ - conn_list_t *p; + cp - for(p = conn_list; p != NULL; p = p->next) + /* 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)) + { + 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; + } + } + + cl->status.active = 0; + + if(cl->status.outgoing) { - if(p->status.remove) - continue; - if(p->status.active && p->status.meta) - { - if(send_ping(p)) - terminate_connection(p); - else - { - p->status.pinged = 1; - p->status.got_pong = 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")); } - - last_ping_time = time(NULL); cp - return 0; } /* - end all connections that did not respond - to the ping probe in time + Check if the other end is active. + If we have sent packets, but didn't receive any, + then possibly the other end is dead. We send a + PING request over the meta connection. If the other + end does not reply in time, we consider them dead + and close the connection. */ int check_dead_connections(void) { conn_list_t *p; + time_t now; cp + now = time(NULL); for(p = conn_list; p != NULL; p = p->next) { if(p->status.remove) continue; - if(p->status.active && p->status.meta && p->status.pinged && !p->status.got_pong) + if(p->status.active && p->status.meta) { - syslog(LOG_INFO, "%s (" IP_ADDR_S ") didn't respond to ping", - p->hostname, IP_ADDR_V(p->vpn_ip)); - p->status.timeout = 1; - terminate_connection(p); + if(p->last_ping_time + timeout < now) + { + if(p->status.pinged && !p->status.got_pong) + { + 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); + } + else if(p->want_ping) + { + send_ping(p); + p->last_ping_time = now; + p->status.pinged = 1; + p->status.got_pong = 0; + } + } } } cp @@ -910,23 +1100,23 @@ cp accept a new tcp connect and create a new connection */ -int handle_new_meta_connection(conn_list_t *cl) +int handle_new_meta_connection() { conn_list_t *ncn; struct sockaddr client; - int nfd, len = sizeof(struct sockaddr); + int nfd, len = sizeof(client); cp - if((nfd = accept(cl->meta_socket, &client, &len)) < 0) + if((nfd = accept(myself->meta_socket, &client, &len)) < 0) { - syslog(LOG_ERR, "Accepting a new connection failed: %m"); + syslog(LOG_ERR, _("Accepting a new connection failed: %m")); return -1; } - if((ncn = create_new_connection(nfd)) == NULL) + if(!(ncn = create_new_connection(nfd))) { shutdown(nfd, 2); close(nfd); - syslog(LOG_NOTICE, "Closed attempted connection."); + syslog(LOG_NOTICE, _("Closed attempted connection")); return 0; } @@ -937,46 +1127,6 @@ cp return 0; } -/* - dispatch any incoming meta requests -*/ -int handle_incoming_meta_data(conn_list_t *cl) -{ - int x, l = sizeof(x), lenin; - unsigned char tmp[1600]; - int request; -cp - if(getsockopt(cl->meta_socket, SOL_SOCKET, SO_ERROR, &x, &l) < 0) - { - syslog(LOG_ERR, "This is a bug: %s:%d: %d:%m", __FILE__, __LINE__, cl->meta_socket); - return -1; - } - if(x) - { - syslog(LOG_ERR, "Metadata socket error: %s", sys_errlist[x]); - return -1; - } - - if((lenin = recv(cl->meta_socket, &tmp, sizeof(tmp), 0)) <= 0) - { - syslog(LOG_ERR, "Receive failed: %m"); - return -1; - } - - request = (int)(tmp[0]); - - if(debug_lvl > 3) - syslog(LOG_DEBUG, "got request %d", request); - - if(request_handlers[request] == NULL) - syslog(LOG_ERR, "Unknown request %d.", request); - else - if(request_handlers[request](cl, tmp, lenin) < 0) - return -1; -cp - return 0; -} - /* check all connections to see if anything happened on their sockets @@ -991,7 +1141,7 @@ cp if(p->status.remove) continue; - if(p->status.active) + if(p->status.dataopen) if(FD_ISSET(p->socket, f)) { /* @@ -1001,14 +1151,15 @@ cp 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: %s", sys_errlist[x]); + syslog(LOG_ERR, _("Outgoing data socket error for %s (%s): %s"), + p->name, p->hostname, strerror(x)); terminate_connection(p); return; } if(p->status.meta) if(FD_ISSET(p->meta_socket, f)) - if(handle_incoming_meta_data(p) < 0) + if(receive_meta(p) < 0) { terminate_connection(p); return; @@ -1016,10 +1167,10 @@ cp } if(FD_ISSET(myself->socket, f)) - handle_incoming_vpn_data(myself); + handle_incoming_vpn_data(); if(FD_ISSET(myself->meta_socket, f)) - handle_new_meta_connection(myself); + handle_new_meta_connection(); cp } @@ -1034,10 +1185,24 @@ void handle_tap_input(void) int ether_type, lenin; cp memset(&vp, 0, sizeof(vp)); - if((lenin = read(tap_fd, &vp, MTU)) <= 0) + + if(taptype = 1) { - syslog(LOG_ERR, "Error while reading from tapdevice: %m"); - return; + if((lenin = read(tap_fd, vp.data, MTU)) <= 0) + { + syslog(LOG_ERR, _("Error while reading from tapdevice: %m")); + return; + } + vp.len = lenin; + } + else + { + if((lenin = read(tap_fd, &vp, MTU)) <= 0) + { + syslog(LOG_ERR, _("Error while reading from tapdevice: %m")); + return; + } + vp.len = lenin - 2; } total_tap_in += lenin; @@ -1045,47 +1210,36 @@ cp ether_type = ntohs(*((unsigned short*)(&vp.data[12]))); if(ether_type != 0x0800) { - if(debug_lvl > 0) - syslog(LOG_INFO, "Non-IP ethernet frame %04x from " MAC_ADDR_S, - ether_type, MAC_ADDR_V(vp.data[6])); + if(debug_lvl >= DEBUG_TRAFFIC) + syslog(LOG_INFO, _("Non-IP ethernet frame %04x from %02x:%02x:%02x:%02x:%02x:%02x"), ether_type, MAC_ADDR_V(vp.data[6])); return; } if(lenin < 32) { - if(debug_lvl > 0) - syslog(LOG_INFO, "Dropping short packet"); + if(debug_lvl >= DEBUG_TRAFFIC) + syslog(LOG_INFO, _("Dropping short packet from %02x:%02x:%02x:%02x:%02x:%02x"), MAC_ADDR_V(vp.data[6])); return; } from = ntohl(*((unsigned long*)(&vp.data[26]))); to = ntohl(*((unsigned long*)(&vp.data[30]))); - if(debug_lvl > 3) - syslog(LOG_DEBUG, "An IP packet (%04x) for " IP_ADDR_S " from " IP_ADDR_S, - ether_type, IP_ADDR_V(to), IP_ADDR_V(from)); - if(debug_lvl > 4) - syslog(LOG_DEBUG, MAC_ADDR_S " to " MAC_ADDR_S, - MAC_ADDR_V(vp.data[0]), MAC_ADDR_V(vp.data[6])); - - vp.len = (length_t)lenin - 2; - - strip_mac_addresses(&vp); - send_packet(to, &vp); cp } /* - this is where it al happens... + this is where it all happens... */ void main_loop(void) { fd_set fset; struct timeval tv; int r; + time_t last_ping_check; cp - last_ping_time = time(NULL); + last_ping_check = time(NULL); for(;;) { @@ -1097,25 +1251,47 @@ cp if((r = select(FD_SETSIZE, &fset, NULL, NULL, &tv)) < 0) { - if(errno == EINTR) /* because of alarm */ - continue; - syslog(LOG_ERR, "Error while waiting for input: %m"); - return; + if(errno != EINTR) /* because of alarm */ + { + syslog(LOG_ERR, _("Error while waiting for input: %m")); + return; + } + } + + if(sighup) + { + 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)) + { + syslog(LOG_ERR, _("Unable to reread configuration file, exiting")); + exit(0); + } + sleep(5); + setup_network_connections(); +*/ + continue; } - if(r == 0 || last_ping_time + timeout < time(NULL)) - /* Timeout... hm... something might be wrong. */ + if(last_ping_check + timeout < time(NULL)) + /* Let's check if everybody is still alive */ { check_dead_connections(); - send_broadcast_ping(); - continue; + last_ping_check = time(NULL); } - check_network_activity(&fset); + if(r > 0) + { + check_network_activity(&fset); - /* local tap data */ - if(FD_ISSET(tap_fd, &fset)) - handle_tap_input(); + /* local tap data */ + if(FD_ISSET(tap_fd, &fset)) + handle_tap_input(); + } } cp }