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.41 2000/10/20 15:34:35 guus Exp $
+ $Id: net.c,v 1.35.4.64 2000/11/04 15:32:05 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 <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>
#ifdef HAVE_TUNTAP
-#include <net/if.h>
#include LINUX_IF_TUN_H
#endif
#include <xalloc.h>
#include "conf.h"
-#include "encr.h"
+#include "connlist.h"
+#include "meta.h"
#include "net.h"
#include "netutl.h"
#include "protocol.h"
-#include "meta.h"
+#include "subnet.h"
#include "system.h"
int tap_fd = -1;
-int taptype = 0;
+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 upstreamindex = 0;
+config_t *upstreamcfg;
static int seconds_till_retry;
+int keylifetime = 0;
+int keyexpires = 0;
+
char *unknown = NULL;
+char *interface_name = NULL; /* Contains the name of the interface */
-/*
- strip off the MAC adresses of an ethernet frame
-*/
-void strip_mac_addresses(vpn_packet_t *p)
-{
-cp
- memmove(p->data, p->data + 12, p->len -= 12);
-cp
-}
+subnet_t mymac;
/*
- reassemble MAC addresses
+ Execute the given script.
+ This function doesn't really belong here.
*/
-void add_mac_addresses(vpn_packet_t *p)
+int execute_script(const char* name)
{
-cp
- memcpy(p->data + 12, p->data, p->len);
- p->len += 12;
- p->data[0] = p->data[6] = 0xfe;
- p->data[1] = p->data[7] = 0xfd;
- /* Really evil pointer stuff just below! */
- *((ip_t*)(&p->data[2])) = (ip_t)(htonl(myself->address));
- *((ip_t*)(&p->data[8])) = *((ip_t*)(&p->data[26]));
-cp
+ char *scriptname;
+ pid_t pid;
+ char *s;
+
+ if((pid = fork()) < 0)
+ {
+ syslog(LOG_ERR, _("System call `%s' failed: %m"),
+ "fork");
+ return -1;
+ }
+
+ if(pid)
+ {
+ return 0;
+ }
+
+ /* Child here */
+
+ asprintf(&scriptname, "%s/%s", confbase, name);
+ asprintf(&s, "IFNAME=%s", interface_name);
+ putenv(s);
+ free(s);
+
+ if(netname)
+ {
+ asprintf(&s, "NETNAME=%s", netname);
+ putenv(s);
+ free(s);
+ }
+ else
+ {
+ unsetenv("NETNAME");
+ }
+
+ if(chdir(confbase) < 0)
+ {
+ syslog(LOG_ERR, _("Couldn't chdir to `%s': %m"),
+ confbase);
+ }
+
+ execl(scriptname, NULL);
+ /* 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)
{
vpn_packet_t outpkt;
int outlen, outpad;
+ EVP_CIPHER_CTX ctx;
cp
outpkt.len = inpkt->len;
- EVP_EncryptInit(cl->cipher_pktctx, cl->cipher_pkttype, cl->cipher_pktkey, NULL);
- EVP_EncryptUpdate(cl->cipher_pktctx, outpkt.data, &outlen, inpkt->data, inpkt->len);
- EVP_EncryptFinal(cl->cipher_pktctx, outpkt.data + outlen, &outpad);
- outlen += outpad;
- if(debug_lvl > 3)
+ /* 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);
+*/
+
+ if(debug_lvl >= DEBUG_TRAFFIC)
syslog(LOG_ERR, _("Sending packet of %d bytes to %s (%s)"),
outlen, cl->name, cl->hostname);
cl->want_ping = 1;
- if((send(cl->socket, (char *) &(outpkt.len), outlen + 2, 0)) < 0)
+ if((send(cl->socket, (char *) &(outpkt.len), outlen, 0)) < 0)
{
syslog(LOG_ERR, _("Error sending packet to %s (%s): %m"),
cl->name, cl->hostname);
{
vpn_packet_t outpkt;
int outlen, outpad;
+ EVP_CIPHER_CTX ctx;
cp
- if(debug_lvl > 3)
- 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 += outpkt.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);
+ outlen += outpad;
+
+/* Bypass
+ outlen = outpkt.len+2;
+ memcpy(&outpkt, inpkt, outlen);
+*/
+
+ if(debug_lvl >= DEBUG_TRAFFIC)
+ syslog(LOG_ERR, _("Writing packet of %d bytes to tap device"),
+ outpkt.len, outlen);
+
+ /* Fix mac address */
+
+ memcpy(outpkt.data, mymac.net.mac.address.x, 6);
+
+ if(taptype == TAP_TYPE_TUNTAP)
+ {
+ if(write(tap_fd, outpkt.data, outpkt.len) < 0)
+ syslog(LOG_ERR, _("Can't write to tun/tap device: %m"));
+ else
+ total_tap_out += outpkt.len;
+ }
+ else /* ethertap */
+ {
+ if(write(tap_fd, outpkt.data - 2, outpkt.len + 2) < 0)
+ syslog(LOG_ERR, _("Can't write to ethertap device: %m"));
+ else
+ total_tap_out += outpkt.len + 2;
+ }
cp
return 0;
}
p = next;
}
- if(debug_lvl > 3)
+ if(debug_lvl >= DEBUG_TRAFFIC)
syslog(LOG_DEBUG, _("Queue flushed"));
cp
}
cp
if(cl->sq)
{
- if(debug_lvl > 3)
+ 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 > 3)
+ if(debug_lvl >= DEBUG_TRAFFIC)
syslog(LOG_DEBUG, _("Flushing receive queue for %s (%s)"),
cl->name, cl->hostname);
flush_queue(cl, &(cl->rq), xrecv);
int send_packet(ip_t to, vpn_packet_t *packet)
{
conn_list_t *cl;
+ subnet_t *subnet;
cp
- if((cl = lookup_conn_list_ipv4(to)) == NULL)
+ if((subnet = lookup_subnet_ipv4(to)) == NULL)
{
- if(debug_lvl > 3)
+ if(debug_lvl >= DEBUG_TRAFFIC)
{
syslog(LOG_NOTICE, _("Trying to look up %d.%d.%d.%d in connection list failed!"),
IP_ADDR_V(to));
return -1;
}
+
+ cl = subnet->owner;
/* If we ourselves have indirectdata flag set, we should send only to our uplink! */
if(!cl->status.validkey)
{
- if(debug_lvl > 3)
+/* FIXME: Don't queue until everything else is fixed.
+ if(debug_lvl >= DEBUG_TRAFFIC)
syslog(LOG_INFO, _("No valid key known yet for %s (%s), queueing packet"),
cl->name, cl->hostname);
add_queue(&(cl->sq), packet, packet->len + 2);
+*/
if(!cl->status.waitingforkey)
send_req_key(myself, cl); /* Keys should be sent to the host running the tincd */
return 0;
if(!cl->status.active)
{
- if(debug_lvl > 3)
+/* FIXME: Don't queue until everything else is fixed.
+ if(debug_lvl >= DEBUG_TRAFFIC)
syslog(LOG_INFO, _("%s (%s) is not ready, queueing packet"),
cl->name, cl->hostname);
add_queue(&(cl->sq), packet, packet->len + 2);
+*/
return 0; /* We don't want to mess up, do we? */
}
int nfd;
const char *tapfname;
config_t const *cfg;
-
-#ifdef HAVE_TUNTAP
struct ifreq ifr;
-#endif
+
cp
if((cfg = get_config_val(config, tapdevice)))
tapfname = cfg->data.ptr;
cp
tap_fd = nfd;
- taptype = 0;
+ /* 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[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_TUNTAP
/* Ok now check if this is an old ethertap or a new tun/tap thingie */
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 */;
+ 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)))
{
- syslog(LOG_ERR, _("setsockopt: %m"));
+ syslog(LOG_ERR, _("System call `%s' failed: %m"),
+ "setsockopt");
return -1;
}
if(setsockopt(nfd, SOL_SOCKET, SO_KEEPALIVE, &one, sizeof(one)))
{
- syslog(LOG_ERR, _("setsockopt: %m"));
+ 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)
{
- syslog(LOG_ERR, _("fcntl: %m"));
+ syslog(LOG_ERR, _("System call `%s' failed: %m"),
+ "fcntl");
return -1;
}
a.sin_port = htons(port);
if((cfg = get_config_val(config, interfaceip)))
- a.sin_addr.s_addr = htonl(cfg->data.ip->ip);
+ a.sin_addr.s_addr = htonl(cfg->data.ip->address);
else
a.sin_addr.s_addr = htonl(INADDR_ANY);
if(listen(nfd, 3))
{
- syslog(LOG_ERR, _("listen: %m"));
+ syslog(LOG_ERR, _("System call `%s' failed: %m"),
+ "listen");
return -1;
}
cp
if(setsockopt(nfd, SOL_SOCKET, SO_REUSEADDR, &one, sizeof(one)))
{
- syslog(LOG_ERR, _("setsockopt: %m"));
+ 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)
{
- syslog(LOG_ERR, _("fcntl: %m"));
+ syslog(LOG_ERR, _("System call `%s' failed: %m"),
+ "fcntl");
return -1;
}
struct sockaddr_in a;
config_t const *cfg;
cp
- if(debug_lvl > 0)
+ if(debug_lvl >= DEBUG_CONNECTIONS)
syslog(LOG_INFO, _("Trying to connect to %s"), cl->hostname);
if((cfg = get_config_val(cl->config, port)) == NULL)
return -1;
}
- if(debug_lvl > 0)
+ if(debug_lvl >= DEBUG_CONNECTIONS)
syslog(LOG_INFO, _("Connected to %s port %hd"),
cl->hostname, cl->port);
{
conn_list_t *ncn;
struct hostent *h;
- config_t *cfg;
+ config_t const *cfg;
cp
if(check_id(name))
{
}
/*
- set up the local sockets (listen only)
+ Configure conn_list_t myself and set up the local sockets (listen only)
*/
int setup_myself(void)
{
config_t const *cfg;
+ subnet_t *net;
cp
myself = new_conn_list();
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)
+ {
+ net = new_subnet();
+ net->type = SUBNET_IPV4;
+ net->net.ipv4.address = cfg->data.ip->address;
+ net->net.ipv4.mask = cfg->data.ip->mask;
+
+ /* Teach newbies what subnets are... */
+
+ if((net->net.ipv4.address & net->net.ipv4.mask) != net->net.ipv4.address)
+ {
+ syslog(LOG_ERR, _("Network address and subnet mask do not match!"));
+ return -1;
+ }
+
+ subnet_add(myself, net);
+ }
+
if((myself->meta_socket = setup_listen_meta_socket(myself->port)) < 0)
{
syslog(LOG_ERR, _("Unable to set up a listening socket!"));
return -1;
}
+ /* Generate packet encryption key */
+
+ myself->cipher_pkttype = EVP_bf_cfb();
+
+ 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);
+
+ if(!(cfg = get_config_val(config, keyexpire)))
+ keylifetime = 3600;
+ else
+ keylifetime = cfg->data.val;
+
+ keyexpires = time(NULL) + keylifetime;
+
+ /* Activate ourselves */
+
myself->status.active = 1;
syslog(LOG_NOTICE, _("Ready: listening on port %hd"), myself->port);
{
config_t const *cfg;
cp
- cfg = get_next_config_val(config, connectto, upstreamindex++);
+ cfg = get_config_val(upstreamcfg, connectto);
- if(!upstreamindex && !cfg)
+ if(!cfg && upstreamcfg == config)
/* No upstream IP given, we're listen only. */
return;
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_next_config_val(config, connectto, upstreamindex++); /* Or else we try the next ConnectTo line */
+ cfg = get_config_val(upstreamcfg, connectto); /* Or else we try the next ConnectTo line */
}
signal(SIGALRM, sigalrm_handler);
- upstreamindex = 0;
+ upstreamcfg = config;
seconds_till_retry += 5;
if(seconds_till_retry > MAXTIMEOUT) /* Don't wait more than MAXTIMEOUT seconds. */
seconds_till_retry = MAXTIMEOUT;
if(setup_myself() < 0)
return -1;
- if((cfg = get_next_config_val(config, connectto, upstreamindex++)) == NULL)
+ /* Run tinc-up script to further initialize the tap interface */
+ execute_script("tinc-up");
+
+ if(!(cfg = get_config_val(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_next_config_val(config, connectto, upstreamindex++); /* Or else we try the next ConnectTo line */
+ cfg = get_config_val(upstreamcfg, connectto); /* Or else we try the next ConnectTo line */
}
signal(SIGALRM, sigalrm_handler);
- upstreamindex = 0;
+ 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);
cp
for(p = conn_list; p != NULL; p = p->next)
{
- if(p->status.dataopen)
- {
- shutdown(p->socket, 0); /* No more receptions */
- close(p->socket);
- }
- if(p->status.meta)
- {
- send_termreq(p);
- shutdown(p->meta_socket, 0); /* No more receptions */
- close(p->meta_socket);
- }
+ p->status.active = 0;
+ terminate_connection(p);
}
if(myself)
{
close(myself->meta_socket);
close(myself->socket);
+ free_conn_list(myself);
+ myself = NULL;
}
close(tap_fd);
+
+ /* Execute tinc-down script right after shutting down the interface */
+ execute_script("tinc-down");
+
destroy_conn_list();
syslog(LOG_NOTICE, _("Terminating"));
int nfd, flags;
struct sockaddr_in a;
cp
- if(debug_lvl > 0)
+ if(debug_lvl >= DEBUG_TRAFFIC)
syslog(LOG_DEBUG, _("Opening UDP socket to %s"), cl->hostname);
nfd = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
if(getpeername(sfd, &ci, &len) < 0)
{
- syslog(LOG_ERR, _("Error: getpeername: %m"));
+ syslog(LOG_ERR, _("System call `%s' failed: %m"),
+ "getpeername");
return NULL;
}
p->last_ping_time = time(NULL);
p->want_ping = 0;
- if(debug_lvl > 0)
+ if(debug_lvl >= DEBUG_CONNECTIONS)
syslog(LOG_NOTICE, _("Connection from %s port %d"),
p->hostname, htons(ci.sin_port));
int handle_incoming_vpn_data()
{
vpn_packet_t pkt;
- int lenin;
int x, l = sizeof(x);
+ struct sockaddr from;
+ int lenin;
+ socklen_t fromlen = sizeof(from);
cp
if(getsockopt(myself->socket, SOL_SOCKET, SO_ERROR, &x, &l) < 0)
{
return -1;
}
- if(recvfrom(myself->socket, (char *) &(pkt.len), MTU, 0, NULL, NULL) <= 0)
+ if((lenin = recvfrom(myself->socket, (char *) &(pkt.len), MTU, 0, &from, &fromlen)) <= 0)
{
syslog(LOG_ERR, _("Receiving packet failed: %m"));
return -1;
}
+ if(debug_lvl >= DEBUG_TRAFFIC)
+ {
+ syslog(LOG_DEBUG, _("Received packet of %d bytes"), lenin);
+ }
+
cp
return xrecv(&pkt);
}
void terminate_connection(conn_list_t *cl)
{
conn_list_t *p;
-
+ subnet_t *s;
cp
if(cl->status.remove)
return;
- if(debug_lvl > 0)
+ cl->status.remove = 1;
+
+ if(debug_lvl >= DEBUG_CONNECTIONS)
syslog(LOG_NOTICE, _("Closing connection with %s (%s)"),
cl->name, cl->hostname);
if(cl->status.meta)
close(cl->meta_socket);
- cl->status.remove = 1;
-
- /* 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);
-*/
-
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))
- {
- 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;
- }
- }
+ if((p->nexthop == cl) && (p != cl))
+ terminate_connection(p); /* Sounds like recursion, but p does not have a meta connection :) */
+
+ /* 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);
+
+ /* Remove the associated subnets */
+
+ for(s = cl->subnets; s; s = s->next)
+ subnet_del(s);
+
+ /* Check if this was our outgoing connection */
- cl->status.active = 0;
-
- if(cl->status.outgoing)
+ if(cl->status.outgoing && cl->status.active)
{
signal(SIGALRM, sigalrm_handler);
seconds_till_retry = 5;
alarm(seconds_till_retry);
syslog(LOG_NOTICE, _("Trying to re-establish outgoing connection in 5 seconds"));
}
+
+ /* Inactivate */
+
+ cl->status.active = 0;
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)
{
if(p->last_ping_time + timeout < now)
{
if(p->status.pinged && !p->status.got_pong)
{
- if(debug_lvl > 1)
+ if(debug_lvl >= DEBUG_PROTOCOL)
syslog(LOG_INFO, _("%s (%s) didn't respond to PING"),
p->name, p->hostname);
p->status.timeout = 1;
return 0;
}
- ncn->status.meta = 1;
- ncn->next = conn_list;
- conn_list = ncn;
+ conn_list_add(ncn);
cp
return 0;
}
void handle_tap_input(void)
{
vpn_packet_t vp;
- ip_t from, to;
- int ether_type, lenin;
+ int lenin;
cp
- memset(&vp, 0, sizeof(vp));
-
- if(taptype = 1)
+ if(taptype == TAP_TYPE_TUNTAP)
{
if((lenin = read(tap_fd, vp.data, MTU)) <= 0)
{
- syslog(LOG_ERR, _("Error while reading from tapdevice: %m"));
+ syslog(LOG_ERR, _("Error while reading from tun/tap device: %m"));
return;
}
vp.len = lenin;
}
- else
+ else /* ethertap */
{
- if((lenin = read(tap_fd, &vp, MTU)) <= 0)
+ if((lenin = read(tap_fd, vp.data - 2, MTU)) <= 0)
{
- syslog(LOG_ERR, _("Error while reading from tapdevice: %m"));
+ syslog(LOG_ERR, _("Error while reading from ethertap device: %m"));
return;
}
vp.len = lenin - 2;
total_tap_in += lenin;
- ether_type = ntohs(*((unsigned short*)(&vp.data[12])));
- if(ether_type != 0x0800)
- {
- if(debug_lvl > 3)
- 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 > 3)
- syslog(LOG_INFO, _("Dropping short packet from %02x:%02x:%02x:%02x:%02x:%02x"), MAC_ADDR_V(vp.data[6]));
+ if(debug_lvl >= DEBUG_TRAFFIC)
+ syslog(LOG_WARNING, _("Received short packet from tap device"));
return;
}
- from = ntohl(*((unsigned long*)(&vp.data[26])));
- to = ntohl(*((unsigned long*)(&vp.data[30])));
+ if(debug_lvl >= DEBUG_TRAFFIC)
+ {
+ syslog(LOG_DEBUG, _("Read packet of length %d from tap device"), vp.len);
+ }
- send_packet(to, &vp);
+ send_packet(ntohl(*((unsigned long*)(&vp.data[30]))), &vp);
cp
}
struct timeval tv;
int r;
time_t last_ping_check;
+ int t;
cp
last_ping_check = time(NULL);
if(sighup)
{
+ syslog(LOG_INFO, _("Rereading configuration file and restarting in 5 seconds"));
sighup = 0;
-/* FIXME: reprogram this.
- if(debug_lvl > 1)
- syslog(LOG_INFO, _("Rereading configuration file"));
close_network_connections();
- clear_config();
- if(read_config_file(&config, configfilename))
+ clear_config(&config);
+
+ if(read_server_config())
{
syslog(LOG_ERR, _("Unable to reread configuration file, exiting"));
exit(0);
}
+
sleep(5);
- setup_network_connections();
-*/
+
+ if(setup_network_connections())
+ return;
+
continue;
}
- if(last_ping_check + timeout < time(NULL))
- /* Let's check if everybody is still alive */
+ t = time(NULL);
+
+ /* Let's check if everybody is still alive */
+
+ if(last_ping_check + timeout < t)
{
check_dead_connections();
last_ping_check = time(NULL);
+
+ /* Should we regenerate our key? */
+
+ if(keyexpires < t)
+ {
+ if(debug_lvl >= DEBUG_STATUS)
+ syslog(LOG_INFO, _("Regenerating symmetric key"));
+
+ RAND_bytes(myself->cipher_pktkey, myself->cipher_pktkeylength);
+ send_key_changed(myself, NULL);
+ keyexpires = time(NULL) + keylifetime;
+ }
}
if(r > 0)
projects / tinc / blobdiff