X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fnet_packet.c;h=29f4fb8e59aebfcd900c99b5230db87335c2913e;hb=a7ef599e6bdd8730c5a949d4c1727c38d5b6ff9e;hp=27ca71480e247c39d0bc5d31c45a4d2819ac9ba5;hpb=258bf7ea0fe69bae395a084843ba59b9770199f1;p=meshlink

diff --git a/src/net_packet.c b/src/net_packet.c
index 27ca7148..29f4fb8e 100644
--- a/src/net_packet.c
+++ b/src/net_packet.c
@@ -1,9 +1,6 @@
 /*
     net_packet.c -- Handles in- and outgoing VPN packets
-    Copyright (C) 1998-2005 Ivo Timmermans,
-                  2000-2013 Guus Sliepen <guus@tinc-vpn.org>
-                  2010      Timothy Redaelli <timothy@redaelli.eu>
-                  2010      Brandon Black <blblack@gmail.com>
+    Copyright (C) 2014 Guus Sliepen <guus@meshlink.io>
 
     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
@@ -26,36 +23,28 @@
 #include <zlib.h>
 #endif
 
-#ifdef HAVE_LZO
-#include LZO1X_H
-#endif
-
 #include "cipher.h"
 #include "conf.h"
 #include "connection.h"
 #include "crypto.h"
 #include "digest.h"
-#include "device.h"
-#include "ethernet.h"
 #include "graph.h"
 #include "logger.h"
+#include "meshlink_internal.h"
 #include "net.h"
 #include "netutl.h"
 #include "protocol.h"
-#include "process.h"
 #include "route.h"
 #include "utils.h"
 #include "xalloc.h"
 
 int keylifetime = 0;
-#ifdef HAVE_LZO
-static char lzo_wrkmem[LZO1X_999_MEM_COMPRESS > LZO1X_1_MEM_COMPRESS ? LZO1X_999_MEM_COMPRESS : LZO1X_1_MEM_COMPRESS];
-#endif
 
 static void send_udppacket(node_t *, vpn_packet_t *);
 
 unsigned replaywin = 16;
 bool localdiscovery = false;
+sockaddr_t localdiscovery_address;
 
 #define MAX_SEQNO 1073741824
 
@@ -143,16 +132,14 @@ static void send_mtu_probe_handler(void *data) {
 		memset(packet.data, 0, 14);
 		randomize(packet.data + 14, len - 14);
 		packet.len = len;
-		if(i >= 4 && n->mtuprobes <= 10)
-			packet.priority = -1;
-		else
-			packet.priority = 0;
+		n->status.broadcast = i >= 4 && n->mtuprobes <= 10 && n->prevedge;
 
 		logger(DEBUG_TRAFFIC, LOG_INFO, "Sending MTU probe length %d to %s (%s)", len, n->name, n->hostname);
 
 		send_udppacket(n, &packet);
 	}
 
+	n->status.broadcast = false;
 	n->probe_counter = 0;
 	gettimeofday(&n->probe_time, NULL);
 
@@ -177,7 +164,7 @@ void send_mtu_probe(node_t *n) {
 	send_mtu_probe_handler(n);
 }
 
-static void mtu_probe_h(node_t *n, vpn_packet_t *packet, length_t len) {
+static void mtu_probe_h(node_t *n, vpn_packet_t *packet, uint16_t len) {
 	logger(DEBUG_TRAFFIC, LOG_INFO, "Got MTU probe length %d from %s (%s)", packet->len, n->name, n->hostname);
 
 	if(!packet->data[0]) {
@@ -231,6 +218,7 @@ static void mtu_probe_h(node_t *n, vpn_packet_t *packet, length_t len) {
 		struct timeval now, diff;
 		gettimeofday(&now, NULL);
 		timersub(&now, &n->probe_time, &diff);
+		
 		n->probe_counter++;
 
 		if(n->probe_counter == 1) {
@@ -243,18 +231,12 @@ static void mtu_probe_h(node_t *n, vpn_packet_t *packet, length_t len) {
 	}
 }
 
-static length_t compress_packet(uint8_t *dest, const uint8_t *source, length_t len, int level) {
+static uint16_t compress_packet(uint8_t *dest, const uint8_t *source, uint16_t len, int level) {
 	if(level == 0) {
 		memcpy(dest, source, len);
 		return len;
 	} else if(level == 10) {
-#ifdef HAVE_LZO
-		lzo_uint lzolen = MAXSIZE;
-		lzo1x_1_compress(source, len, dest, &lzolen, lzo_wrkmem);
-		return lzolen;
-#else
 		return -1;
-#endif
 	} else if(level < 10) {
 #ifdef HAVE_ZLIB
 		unsigned long destlen = MAXSIZE;
@@ -264,29 +246,17 @@ static length_t compress_packet(uint8_t *dest, const uint8_t *source, length_t l
 #endif
 			return -1;
 	} else {
-#ifdef HAVE_LZO
-		lzo_uint lzolen = MAXSIZE;
-		lzo1x_999_compress(source, len, dest, &lzolen, lzo_wrkmem);
-		return lzolen;
-#else
 		return -1;
-#endif
 	}
 
 	return -1;
 }
 
-static length_t uncompress_packet(uint8_t *dest, const uint8_t *source, length_t len, int level) {
+static uint16_t uncompress_packet(uint8_t *dest, const uint8_t *source, uint16_t len, int level) {
 	if(level == 0) {
 		memcpy(dest, source, len);
 		return len;
 	} else if(level > 9) {
-#ifdef HAVE_LZO
-		lzo_uint lzolen = MAXSIZE;
-		if(lzo1x_decompress_safe(source, len, dest, &lzolen, NULL) == LZO_E_OK)
-			return lzolen;
-		else
-#endif
 			return -1;
 	}
 #ifdef HAVE_ZLIB
@@ -315,129 +285,20 @@ static void receive_packet(node_t *n, vpn_packet_t *packet) {
 }
 
 static bool try_mac(node_t *n, const vpn_packet_t *inpkt) {
-	if(n->status.sptps)
-		return sptps_verify_datagram(&n->sptps, (char *)&inpkt->seqno, inpkt->len);
-
-	if(!digest_active(&n->indigest) || inpkt->len < sizeof inpkt->seqno + digest_length(&n->indigest))
-		return false;
-
-	return digest_verify(&n->indigest, &inpkt->seqno, inpkt->len - n->indigest.maclength, (const char *)&inpkt->seqno + inpkt->len - n->indigest.maclength);
+	return sptps_verify_datagram(&n->sptps, inpkt->data, inpkt->len);
 }
 
 static void receive_udppacket(node_t *n, vpn_packet_t *inpkt) {
-	vpn_packet_t pkt1, pkt2;
-	vpn_packet_t *pkt[] = { &pkt1, &pkt2, &pkt1, &pkt2 };
-	int nextpkt = 0;
-	vpn_packet_t *outpkt = pkt[0];
-	size_t outlen;
-
-	if(n->status.sptps) {
-		sptps_receive_data(&n->sptps, (char *)&inpkt->seqno, inpkt->len);
-		return;
-	}
-
-	if(!cipher_active(&n->incipher)) {
-		logger(DEBUG_TRAFFIC, LOG_DEBUG, "Got packet from %s (%s) but he hasn't got our key yet",
-					n->name, n->hostname);
-		return;
-	}
-
-	/* Check packet length */
-
-	if(inpkt->len < sizeof inpkt->seqno + digest_length(&n->indigest)) {
-		logger(DEBUG_TRAFFIC, LOG_DEBUG, "Got too short packet from %s (%s)",
-					n->name, n->hostname);
-		return;
-	}
-
-	/* Check the message authentication code */
-
-	if(digest_active(&n->indigest)) {
-		inpkt->len -= n->indigest.maclength;
-		if(!digest_verify(&n->indigest, &inpkt->seqno, inpkt->len, (const char *)&inpkt->seqno + inpkt->len)) {
-			logger(DEBUG_TRAFFIC, LOG_DEBUG, "Got unauthenticated packet from %s (%s)", n->name, n->hostname);
-			return;
-		}
-	}
-	/* Decrypt the packet */
-
-	if(cipher_active(&n->incipher)) {
-		outpkt = pkt[nextpkt++];
-		outlen = MAXSIZE;
-
-		if(!cipher_decrypt(&n->incipher, &inpkt->seqno, inpkt->len, &outpkt->seqno, &outlen, true)) {
-			logger(DEBUG_TRAFFIC, LOG_DEBUG, "Error decrypting packet from %s (%s)", n->name, n->hostname);
-			return;
-		}
-
-		outpkt->len = outlen;
-		inpkt = outpkt;
-	}
-
-	/* Check the sequence number */
-
-	inpkt->len -= sizeof inpkt->seqno;
-	inpkt->seqno = ntohl(inpkt->seqno);
-
-	if(replaywin) {
-		if(inpkt->seqno != n->received_seqno + 1) {
-			if(inpkt->seqno >= n->received_seqno + replaywin * 8) {
-				if(n->farfuture++ < replaywin >> 2) {
-					logger(DEBUG_ALWAYS, LOG_WARNING, "Packet from %s (%s) is %d seqs in the future, dropped (%u)",
-						n->name, n->hostname, inpkt->seqno - n->received_seqno - 1, n->farfuture);
-					return;
-				}
-				logger(DEBUG_ALWAYS, LOG_WARNING, "Lost %d packets from %s (%s)",
-						inpkt->seqno - n->received_seqno - 1, n->name, n->hostname);
-				memset(n->late, 0, replaywin);
-			} else if (inpkt->seqno <= n->received_seqno) {
-				if((n->received_seqno >= replaywin * 8 && inpkt->seqno <= n->received_seqno - replaywin * 8) || !(n->late[(inpkt->seqno / 8) % replaywin] & (1 << inpkt->seqno % 8))) {
-					logger(DEBUG_ALWAYS, LOG_WARNING, "Got late or replayed packet from %s (%s), seqno %d, last received %d",
-						n->name, n->hostname, inpkt->seqno, n->received_seqno);
-					return;
-				}
-			} else {
-				for(int i = n->received_seqno + 1; i < inpkt->seqno; i++)
-					n->late[(i / 8) % replaywin] |= 1 << i % 8;
-			}
-		}
-
-		n->farfuture = 0;
-		n->late[(inpkt->seqno / 8) % replaywin] &= ~(1 << inpkt->seqno % 8);
-	}
-
-	if(inpkt->seqno > n->received_seqno)
-		n->received_seqno = inpkt->seqno;
-
-	n->received++;
-
-	if(n->received_seqno > MAX_SEQNO)
-		regenerate_key();
-
-	/* Decompress the packet */
-
-	length_t origlen = inpkt->len;
-
-	if(n->incompression) {
-		outpkt = pkt[nextpkt++];
-
-		if((outpkt->len = uncompress_packet(outpkt->data, inpkt->data, inpkt->len, n->incompression)) < 0) {
-			logger(DEBUG_TRAFFIC, LOG_ERR, "Error while uncompressing packet from %s (%s)",
-						 n->name, n->hostname);
-			return;
+	if(!n->sptps.state) {
+		if(!n->status.waitingforkey) {
+			logger(DEBUG_TRAFFIC, LOG_DEBUG, "Got packet from %s (%s) but we haven't exchanged keys yet", n->name, n->hostname);
+			send_req_key(n);
+		} else {
+			logger(DEBUG_TRAFFIC, LOG_DEBUG, "Got packet from %s (%s) but he hasn't got our key yet", n->name, n->hostname);
 		}
-
-		inpkt = outpkt;
-
-		origlen -= MTU/64 + 20;
+		return;
 	}
-
-	inpkt->priority = 0;
-
-	if(!inpkt->data[12] && !inpkt->data[13])
-		mtu_probe_h(n, inpkt, origlen);
-	else
-		receive_packet(n, inpkt);
+	sptps_receive_data(&n->sptps, inpkt->data, inpkt->len);
 }
 
 void receive_tcppacket(connection_t *c, const char *buffer, int len) {
@@ -447,10 +308,7 @@ void receive_tcppacket(connection_t *c, const char *buffer, int len) {
 		return;
 
 	outpkt.len = len;
-	if(c->options & OPTION_TCPONLY)
-		outpkt.priority = 0;
-	else
-		outpkt.priority = -1;
+	outpkt.tcp = true;
 	memcpy(outpkt.data, buffer, len);
 
 	receive_packet(c->node, &outpkt);
@@ -471,35 +329,27 @@ static void send_sptps_packet(node_t *n, vpn_packet_t *origpkt) {
 	}
 
 	uint8_t type = 0;
-	int offset = 0;
 
-	if(!(origpkt->data[12] | origpkt->data[13])) {
-		sptps_send_record(&n->sptps, PKT_PROBE, (char *)origpkt->data, origpkt->len);
+	// If it's a probe, send it immediately without trying to compress it.
+	if(origpkt->probe) {
+		sptps_send_record(&n->sptps, PKT_PROBE, origpkt->data, origpkt->len);
 		return;
 	}
 
-	if(routing_mode == RMODE_ROUTER)
-		offset = 14;
-	else
-		type = PKT_MAC;
-
-	if(origpkt->len < offset)
-		return;
-
 	vpn_packet_t outpkt;
 
 	if(n->outcompression) {
-		int len = compress_packet(outpkt.data + offset, origpkt->data + offset, origpkt->len - offset, n->outcompression);
+		int len = compress_packet(outpkt.data, origpkt->data, origpkt->len, n->outcompression);
 		if(len < 0) {
 			logger(DEBUG_TRAFFIC, LOG_ERR, "Error while compressing packet to %s (%s)", n->name, n->hostname);
-		} else if(len < origpkt->len - offset) {
-			outpkt.len = len + offset;
+		} else if(len < origpkt->len) {
+			outpkt.len = len;
 			origpkt = &outpkt;
 			type |= PKT_COMPRESSED;
 		}
 	}
 
-	sptps_send_record(&n->sptps, type, (char *)origpkt->data + offset, origpkt->len - offset);
+	sptps_send_record(&n->sptps, type, origpkt->data, origpkt->len);
 	return;
 }
 
@@ -572,12 +422,22 @@ static void choose_broadcast_address(const node_t *n, const sockaddr_t **sa, int
 	*sock = rand() % listen_sockets;
 
 	if(listen_socket[*sock].sa.sa.sa_family == AF_INET6) {
-		broadcast_ipv6.in6.sin6_port = n->prevedge->address.in.sin_port;
-		broadcast_ipv6.in6.sin6_scope_id = listen_socket[*sock].sa.in6.sin6_scope_id;
-		*sa = &broadcast_ipv6;
+		if(localdiscovery_address.sa.sa_family == AF_INET6) {
+			localdiscovery_address.in6.sin6_port = n->prevedge->address.in.sin_port;
+			*sa = &localdiscovery_address;
+		} else {
+			broadcast_ipv6.in6.sin6_port = n->prevedge->address.in.sin_port;
+			broadcast_ipv6.in6.sin6_scope_id = listen_socket[*sock].sa.in6.sin6_scope_id;
+			*sa = &broadcast_ipv6;
+		}
 	} else {
-		broadcast_ipv4.in.sin_port = n->prevedge->address.in.sin_port;
-		*sa = &broadcast_ipv4;
+		if(localdiscovery_address.sa.sa_family == AF_INET) {
+			localdiscovery_address.in.sin_port = n->prevedge->address.in.sin_port;
+			*sa = &localdiscovery_address;
+		} else {
+			broadcast_ipv4.in.sin_port = n->prevedge->address.in.sin_port;
+			*sa = &broadcast_ipv4;
+		}
 	}
 }
 
@@ -589,124 +449,13 @@ static void send_udppacket(node_t *n, vpn_packet_t *origpkt) {
 	vpn_packet_t *outpkt;
 	int origlen = origpkt->len;
 	size_t outlen;
-#if defined(SOL_IP) && defined(IP_TOS)
-	static int priority = 0;
-#endif
-	int origpriority = origpkt->priority;
 
 	if(!n->status.reachable) {
 		logger(DEBUG_TRAFFIC, LOG_INFO, "Trying to send UDP packet to unreachable node %s (%s)", n->name, n->hostname);
 		return;
 	}
 
-	if(n->status.sptps)
-		return send_sptps_packet(n, origpkt);
-
-	/* Make sure we have a valid key */
-
-	if(!n->status.validkey) {
-		logger(DEBUG_TRAFFIC, LOG_INFO,
-				   "No valid key known yet for %s (%s), forwarding via TCP",
-				   n->name, n->hostname);
-
-		if(n->last_req_key + 10 <= now.tv_sec) {
-			send_req_key(n);
-			n->last_req_key = now.tv_sec;
-		}
-
-		send_tcppacket(n->nexthop->connection, origpkt);
-
-		return;
-	}
-
-	if(n->options & OPTION_PMTU_DISCOVERY && inpkt->len > n->minmtu && (inpkt->data[12] | inpkt->data[13])) {
-		logger(DEBUG_TRAFFIC, LOG_INFO,
-				"Packet for %s (%s) larger than minimum MTU, forwarding via %s",
-				n->name, n->hostname, n != n->nexthop ? n->nexthop->name : "TCP");
-
-		if(n != n->nexthop)
-			send_packet(n->nexthop, origpkt);
-		else
-			send_tcppacket(n->nexthop->connection, origpkt);
-
-		return;
-	}
-
-	/* Compress the packet */
-
-	if(n->outcompression) {
-		outpkt = pkt[nextpkt++];
-
-		if((outpkt->len = compress_packet(outpkt->data, inpkt->data, inpkt->len, n->outcompression)) < 0) {
-			logger(DEBUG_TRAFFIC, LOG_ERR, "Error while compressing packet to %s (%s)",
-				   n->name, n->hostname);
-			return;
-		}
-
-		inpkt = outpkt;
-	}
-
-	/* Add sequence number */
-
-	inpkt->seqno = htonl(++(n->sent_seqno));
-	inpkt->len += sizeof inpkt->seqno;
-
-	/* Encrypt the packet */
-
-	if(cipher_active(&n->outcipher)) {
-		outpkt = pkt[nextpkt++];
-		outlen = MAXSIZE;
-
-		if(!cipher_encrypt(&n->outcipher, &inpkt->seqno, inpkt->len, &outpkt->seqno, &outlen, true)) {
-			logger(DEBUG_TRAFFIC, LOG_ERR, "Error while encrypting packet to %s (%s)", n->name, n->hostname);
-			goto end;
-		}
-
-		outpkt->len = outlen;
-		inpkt = outpkt;
-	}
-
-	/* Add the message authentication code */
-
-	if(digest_active(&n->outdigest)) {
-		digest_create(&n->outdigest, &inpkt->seqno, inpkt->len, (char *)&inpkt->seqno + inpkt->len);
-		inpkt->len += digest_length(&n->outdigest);
-	}
-
-	/* Send the packet */
-
-	const sockaddr_t *sa;
-	int sock;
-
-	/* Overloaded use of priority field: -1 means local broadcast */
-
-	if(origpriority == -1 && n->prevedge)
-		choose_broadcast_address(n, &sa, &sock);
-	else
-		choose_udp_address(n, &sa, &sock);
-
-#if defined(SOL_IP) && defined(IP_TOS)
-	if(priorityinheritance && origpriority != priority
-	   && listen_socket[n->sock].sa.sa.sa_family == AF_INET) {
-		priority = origpriority;
-		logger(DEBUG_TRAFFIC, LOG_DEBUG, "Setting outgoing packet priority to %d", priority);
-		if(setsockopt(listen_socket[n->sock].udp.fd, SOL_IP, IP_TOS, &priority, sizeof(priority))) /* SO_PRIORITY doesn't seem to work */
-			logger(DEBUG_ALWAYS, LOG_ERR, "System call `%s' failed: %s", "setsockopt", strerror(errno));
-	}
-#endif
-
-	if(sendto(listen_socket[sock].udp.fd, (char *) &inpkt->seqno, inpkt->len, 0, &sa->sa, SALEN(sa->sa)) < 0 && !sockwouldblock(sockerrno)) {
-		if(sockmsgsize(sockerrno)) {
-			if(n->maxmtu >= origlen)
-				n->maxmtu = origlen - 1;
-			if(n->mtu >= origlen)
-				n->mtu = origlen - 1;
-		} else
-			logger(DEBUG_TRAFFIC, LOG_WARNING, "Error sending packet to %s (%s): %s", n->name, n->hostname, sockstrerror(sockerrno));
-	}
-
-end:
-	origpkt->len = origlen;
+	return send_sptps_packet(n, origpkt);
 }
 
 bool send_sptps_data(void *handle, uint8_t type, const char *data, size_t len) {
@@ -714,15 +463,17 @@ bool send_sptps_data(void *handle, uint8_t type, const char *data, size_t len) {
 
 	/* Send it via TCP if it is a handshake packet, TCPOnly is in use, or this packet is larger than the MTU. */
 
-	if(type >= SPTPS_HANDSHAKE || ((myself->options | to->options) & OPTION_TCPONLY) || (type != PKT_PROBE && len > to->minmtu)) {
+	if(type >= SPTPS_HANDSHAKE || ((mesh->self->options | to->options) & OPTION_TCPONLY) || (type != PKT_PROBE && len > to->minmtu)) {
 		char buf[len * 4 / 3 + 5];
 		b64encode(data, buf, len);
 		/* If no valid key is known yet, send the packets using ANS_KEY requests,
 		   to ensure we get to learn the reflexive UDP address. */
-		if(!to->status.validkey)
-			return send_request(to->nexthop->connection, "%d %s %s %s -1 -1 -1 %d", ANS_KEY, myself->name, to->name, buf, myself->incompression);
-		else
-			return send_request(to->nexthop->connection, "%d %s %s %d %s", REQ_KEY, myself->name, to->name, REQ_SPTPS, buf);
+		if(!to->status.validkey) {
+			to->incompression = mesh->self->incompression;
+			return send_request(to->nexthop->connection, "%d %s %s %s -1 -1 -1 %d", ANS_KEY, mesh->self->name, to->name, buf, to->incompression);
+		} else {
+			return send_request(to->nexthop->connection, "%d %s %s %d %s", REQ_KEY, mesh->self->name, to->name, REQ_SPTPS, buf);
+		}
 	}
 
 	/* Otherwise, send the packet via UDP */
@@ -730,7 +481,10 @@ bool send_sptps_data(void *handle, uint8_t type, const char *data, size_t len) {
 	const sockaddr_t *sa;
 	int sock;
 
-	choose_udp_address(to, &sa, &sock);
+	if(to->status.broadcast)
+		choose_broadcast_address(to, &sa, &sock);
+	else
+		choose_udp_address(to, &sa, &sock);
 
 	if(sendto(listen_socket[sock].udp.fd, data, len, 0, &sa->sa, SALEN(sa->sa)) < 0 && !sockwouldblock(sockerrno)) {
 		if(sockmsgsize(sockerrno)) {
@@ -768,56 +522,31 @@ bool receive_sptps_record(void *handle, uint8_t type, const char *data, uint16_t
 
 	if(type == PKT_PROBE) {
 		inpkt.len = len;
+		inpkt.probe = true;
 		memcpy(inpkt.data, data, len);
 		mtu_probe_h(from, &inpkt, len);
 		return true;
+	} else {
+		inpkt.probe = false;
 	}
 
-	if(type & ~(PKT_COMPRESSED | PKT_MAC)) {
+	if(type & ~(PKT_COMPRESSED)) {
 		logger(DEBUG_ALWAYS, LOG_ERR, "Unexpected SPTPS record type %d len %d from %s (%s)", type, len, from->name, from->hostname);
 		return false;
 	}
 
-	/* Check if we have the headers we need */
-	if(routing_mode != RMODE_ROUTER && !(type & PKT_MAC)) {
-		logger(DEBUG_TRAFFIC, LOG_ERR, "Received packet from %s (%s) without MAC header (maybe Mode is not set correctly)", from->name, from->hostname);
-		return false;
-	} else if(routing_mode == RMODE_ROUTER && (type & PKT_MAC)) {
-		logger(DEBUG_TRAFFIC, LOG_WARNING, "Received packet from %s (%s) with MAC header (maybe Mode is not set correctly)", from->name, from->hostname);
-	}
-
-	int offset = (type & PKT_MAC) ? 0 : 14;
 	if(type & PKT_COMPRESSED) {
-		length_t ulen = uncompress_packet(inpkt.data + offset, (const uint8_t *)data, len, from->incompression);
+		uint16_t ulen = uncompress_packet(inpkt.data, (const uint8_t *)data, len, from->incompression);
 		if(ulen < 0) {
 			return false;
 		} else {
-			inpkt.len = ulen + offset;
+			inpkt.len = ulen;
 		}
 		if(inpkt.len > MAXSIZE)
 			abort();
 	} else {
-		memcpy(inpkt.data + offset, data, len);
-		inpkt.len = len + offset;
-	}
-
-	/* Generate the Ethernet packet type if necessary */
-	if(offset) {
-		switch(inpkt.data[14] >> 4) {
-			case 4:
-				inpkt.data[12] = 0x08;
-				inpkt.data[13] = 0x00;
-				break;
-			case 6:
-				inpkt.data[12] = 0x86;
-				inpkt.data[13] = 0xDD;
-				break;
-			default:
-				logger(DEBUG_TRAFFIC, LOG_ERR,
-						   "Unknown IP version %d while reading packet from %s (%s)",
-						   inpkt.data[14] >> 4, from->name, from->hostname);
-				return false;
-		}
+		memcpy(inpkt.data, data, len);
+		inpkt.len = len;
 	}
 
 	receive_packet(from, &inpkt);
@@ -830,12 +559,10 @@ bool receive_sptps_record(void *handle, uint8_t type, const char *data, uint16_t
 void send_packet(node_t *n, vpn_packet_t *packet) {
 	node_t *via;
 
-	if(n == myself) {
-		if(overwrite_mac)
-			 memcpy(packet->data, mymac.x, ETH_ALEN);
+	if(n == mesh->self) {
 		n->out_packets++;
 		n->out_bytes += packet->len;
-		devops.write(packet);
+		// TODO: send to application
 		return;
 	}
 
@@ -851,64 +578,23 @@ void send_packet(node_t *n, vpn_packet_t *packet) {
 	n->out_packets++;
 	n->out_bytes += packet->len;
 
-	if(n->status.sptps) {
-		send_sptps_packet(n, packet);
-		return;
-	}
-
-	via = (packet->priority == -1 || n->via == myself) ? n->nexthop : n->via;
-
-	if(via != n)
-		logger(DEBUG_TRAFFIC, LOG_INFO, "Sending packet to %s via %s (%s)",
-			   n->name, via->name, n->via->hostname);
-
-	if(packet->priority == -1 || ((myself->options | via->options) & OPTION_TCPONLY)) {
-		if(!send_tcppacket(via->connection, packet))
-			terminate_connection(via->connection, true);
-	} else
-		send_udppacket(via, packet);
+	send_sptps_packet(n, packet);
+	return;
 }
 
 /* Broadcast a packet using the minimum spanning tree */
 
 void broadcast_packet(const node_t *from, vpn_packet_t *packet) {
 	// Always give ourself a copy of the packet.
-	if(from != myself)
-		send_packet(myself, packet);
-
-	// In TunnelServer mode, do not forward broadcast packets.
-	// The MST might not be valid and create loops.
-	if(tunnelserver || broadcast_mode == BMODE_NONE)
-		return;
+	if(from != mesh->self)
+		send_packet(mesh->self, packet);
 
 	logger(DEBUG_TRAFFIC, LOG_INFO, "Broadcasting packet of %d bytes from %s (%s)",
 			   packet->len, from->name, from->hostname);
 
-	switch(broadcast_mode) {
-		// In MST mode, broadcast packets travel via the Minimum Spanning Tree.
-		// This guarantees all nodes receive the broadcast packet, and
-		// usually distributes the sending of broadcast packets over all nodes.
-		case BMODE_MST:
-			for list_each(connection_t, c, connection_list)
-				if(c->status.active && c->status.mst && c != from->nexthop->connection)
-					send_packet(c->node, packet);
-			break;
-
-		// In direct mode, we send copies to each node we know of.
-		// However, this only reaches nodes that can be reached in a single hop.
-		// We don't have enough information to forward broadcast packets in this case.
-		case BMODE_DIRECT:
-			if(from != myself)
-				break;
-
-			for splay_each(node_t, n, node_tree)
-				if(n->status.reachable && ((n->via == myself && n->nexthop == n) || n->via == n))
-					send_packet(n, packet);
-			break;
-
-		default:
-			break;
-	}
+	for list_each(connection_t, c, connection_list)
+		if(c->status.active && c->status.mst && c != from->nexthop->connection)
+			send_packet(c->node, packet);
 }
 
 static node_t *try_harder(const sockaddr_t *from, const vpn_packet_t *pkt) {
@@ -916,8 +602,8 @@ static node_t *try_harder(const sockaddr_t *from, const vpn_packet_t *pkt) {
 	bool hard = false;
 	static time_t last_hard_try = 0;
 
-	for splay_each(edge_t, e, edge_weight_tree) {
-		if(!e->to->status.reachable || e->to == myself)
+	for splay_each(edge_t, e, mesh->edges) {
+		if(!e->to->status.reachable || e->to == mesh->self)
 			continue;
 
 		if(sockaddrcmp_noport(from, &e->address)) {
@@ -949,7 +635,7 @@ void handle_incoming_vpn_data(void *data, int flags) {
 	node_t *n;
 	int len;
 
-	len = recvfrom(ls->udp.fd, (char *) &pkt.seqno, MAXSIZE, 0, &from.sa, &fromlen);
+	len = recvfrom(ls->udp.fd, pkt.data, MAXSIZE, 0, &from.sa, &fromlen);
 
 	if(len <= 0 || len > MAXSIZE) {
 		if(!sockwouldblock(sockerrno))
@@ -981,15 +667,3 @@ void handle_incoming_vpn_data(void *data, int flags) {
 
 	receive_udppacket(n, &pkt);
 }
-
-void handle_device_data(void *data, int flags) {
-	vpn_packet_t packet;
-
-	packet.priority = 0;
-
-	if(devops.read(&packet)) {
-		myself->in_packets++;
-		myself->in_bytes += packet.len;
-		route(myself, &packet);
-	}
-}