X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fnet_packet.c;h=e0b364311cf8d18d3e3e6cee91733e9d90c811c4;hb=76c7550c8ab0e9c0ee14a9c396baa008cfb9bc42;hp=818dd3883b3f53ddaeea9a3e6c6743cb485eeeac;hpb=fb7b6e7a0c966a88a682f656ca1caeb9a0583c5b;p=meshlink

diff --git a/src/net_packet.c b/src/net_packet.c
index 818dd388..e0b36431 100644
--- a/src/net_packet.c
+++ b/src/net_packet.c
@@ -23,13 +23,12 @@
 #include <zlib.h>
 #endif
 
-#include "cipher.h"
 #include "conf.h"
 #include "connection.h"
 #include "crypto.h"
-#include "digest.h"
 #include "graph.h"
 #include "logger.h"
+#include "meshlink_internal.h"
 #include "net.h"
 #include "netutl.h"
 #include "protocol.h"
@@ -39,11 +38,7 @@
 
 int keylifetime = 0;
 
-static void send_udppacket(node_t *, vpn_packet_t *);
-
-unsigned replaywin = 16;
-bool localdiscovery = false;
-sockaddr_t localdiscovery_address;
+static void send_udppacket(meshlink_handle_t *mesh, node_t *, vpn_packet_t *);
 
 #define MAX_SEQNO 1073741824
 
@@ -63,14 +58,15 @@ sockaddr_t localdiscovery_address;
 
 */
 
-static void send_mtu_probe_handler(void *data) {
+static void send_mtu_probe_handler(event_loop_t *loop, void *data) {
+	meshlink_handle_t *mesh = loop->data;
 	node_t *n = data;
 	int timeout = 1;
 
 	n->mtuprobes++;
 
 	if(!n->status.reachable || !n->status.validkey) {
-		logger(DEBUG_TRAFFIC, LOG_INFO, "Trying to send MTU probe to unreachable or rekeying node %s (%s)", n->name, n->hostname);
+		logger(mesh, MESHLINK_INFO, "Trying to send MTU probe to unreachable or rekeying node %s (%s)", n->name, n->hostname);
 		n->mtuprobes = 0;
 		return;
 	}
@@ -78,11 +74,11 @@ static void send_mtu_probe_handler(void *data) {
 	if(n->mtuprobes > 32) {
 		if(!n->minmtu) {
 			n->mtuprobes = 31;
-			timeout = pinginterval;
+			timeout = mesh->pinginterval;
 			goto end;
 		}
 
-		logger(DEBUG_TRAFFIC, LOG_INFO, "%s (%s) did not respond to UDP ping, restarting PMTU discovery", n->name, n->hostname);
+		logger(mesh, MESHLINK_INFO, "%s (%s) did not respond to UDP ping, restarting PMTU discovery", n->name, n->hostname);
 		n->status.udp_confirmed = false;
 		n->mtuprobes = 1;
 		n->minmtu = 0;
@@ -90,7 +86,7 @@ static void send_mtu_probe_handler(void *data) {
 	}
 
 	if(n->mtuprobes >= 10 && n->mtuprobes < 32 && !n->minmtu) {
-		logger(DEBUG_TRAFFIC, LOG_INFO, "No response to MTU probes from %s (%s)", n->name, n->hostname);
+		logger(mesh, MESHLINK_INFO, "No response to MTU probes from %s (%s)", n->name, n->hostname);
 		n->mtuprobes = 31;
 	}
 
@@ -100,72 +96,60 @@ static void send_mtu_probe_handler(void *data) {
 		else
 			n->maxmtu = n->minmtu;
 		n->mtu = n->minmtu;
-		logger(DEBUG_TRAFFIC, LOG_INFO, "Fixing MTU of %s (%s) to %d after %d probes", n->name, n->hostname, n->mtu, n->mtuprobes);
+		logger(mesh, MESHLINK_INFO, "Fixing MTU of %s (%s) to %d after %d probes", n->name, n->hostname, n->mtu, n->mtuprobes);
 		n->mtuprobes = 31;
 	}
 
 	if(n->mtuprobes == 31) {
-		timeout = pinginterval;
+		timeout = mesh->pinginterval;
 		goto end;
-	} else if(n->mtuprobes == 32) {
-		timeout = pingtimeout;
-	}
+	} else if(n->mtuprobes == 32)
+		timeout = mesh->pingtimeout;
 
-	for(int i = 0; i < 4 + localdiscovery; i++) {
+	for(int i = 0; i < 4 + mesh->localdiscovery; i++) {
 		int len;
 
 		if(i == 0) {
 			if(n->mtuprobes < 30 || n->maxmtu + 8 >= MTU)
 				continue;
 			len = n->maxmtu + 8;
-		} else if(n->maxmtu <= n->minmtu) {
+		} else if(n->maxmtu <= n->minmtu)
 			len = n->maxmtu;
-		} else {
+		else
 			len = n->minmtu + 1 + rand() % (n->maxmtu - n->minmtu);
-		}
 
 		if(len < 64)
 			len = 64;
 
 		vpn_packet_t packet;
+		packet.probe = true;
 		memset(packet.data, 0, 14);
 		randomize(packet.data + 14, len - 14);
 		packet.len = len;
-		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);
+		logger(mesh, MESHLINK_DEBUG, "Sending MTU probe length %d to %s (%s)", len, n->name, n->hostname);
 
-		send_udppacket(n, &packet);
+		send_udppacket(mesh, n, &packet);
 	}
 
 	n->status.broadcast = false;
-	n->probe_counter = 0;
-	gettimeofday(&n->probe_time, NULL);
-
-	/* Calculate the packet loss of incoming traffic by comparing the rate of
-	   packets received to the rate with which the sequence number has increased.
-	 */
-
-	if(n->received > n->prev_received)
-		n->packetloss = 1.0 - (n->received - n->prev_received) / (float)(n->received_seqno - n->prev_received_seqno);
-	else
-		n->packetloss = n->received_seqno <= n->prev_received_seqno;
-
-	n->prev_received_seqno = n->received_seqno;
-	n->prev_received = n->received;
 
 end:
-	timeout_set(&n->mtutimeout, &(struct timeval){timeout, rand() % 100000});
+	timeout_set(&mesh->loop, &n->mtutimeout, &(struct timeval) {
+		timeout, rand() % 100000
+	});
 }
 
-void send_mtu_probe(node_t *n) {
-	timeout_add(&n->mtutimeout, send_mtu_probe_handler, n, &(struct timeval){1, 0});
-	send_mtu_probe_handler(n);
+void send_mtu_probe(meshlink_handle_t *mesh, node_t *n) {
+	timeout_add(&mesh->loop, &n->mtutimeout, send_mtu_probe_handler, n, &(struct timeval) {
+		1, 0
+	});
+	send_mtu_probe_handler(&mesh->loop, n);
 }
 
-static void mtu_probe_h(node_t *n, vpn_packet_t *packet, length_t len) {
-	logger(DEBUG_TRAFFIC, LOG_INFO, "Got MTU probe length %d from %s (%s)", packet->len, n->name, n->hostname);
+static void mtu_probe_h(meshlink_handle_t *mesh, node_t *n, vpn_packet_t *packet, uint16_t len) {
+	logger(mesh, MESHLINK_DEBUG, "Got MTU probe length %d from %s (%s)", packet->len, n->name, n->hostname);
 
 	if(!packet->data[0]) {
 		/* It's a probe request, send back a reply */
@@ -177,7 +161,7 @@ static void mtu_probe_h(node_t *n, vpn_packet_t *packet, length_t len) {
 
 		bool udp_confirmed = n->status.udp_confirmed;
 		n->status.udp_confirmed = true;
-		send_udppacket(n, packet);
+		send_udppacket(mesh, n, packet);
 		n->status.udp_confirmed = udp_confirmed;
 	} else {
 		/* It's a valid reply: now we know bidirectional communication
@@ -189,8 +173,8 @@ static void mtu_probe_h(node_t *n, vpn_packet_t *packet, length_t len) {
 		/* If we haven't established the PMTU yet, restart the discovery process. */
 
 		if(n->mtuprobes > 30) {
-			if (len == n->maxmtu + 8) {
-				logger(DEBUG_TRAFFIC, LOG_INFO, "Increase in PMTU to %s (%s) detected, restarting PMTU discovery", n->name, n->hostname);
+			if(len == n->maxmtu + 8) {
+				logger(mesh, MESHLINK_INFO, "Increase in PMTU to %s (%s) detected, restarting PMTU discovery", n->name, n->hostname);
 				n->maxmtu = MTU;
 				n->mtuprobes = 10;
 				return;
@@ -208,169 +192,102 @@ static void mtu_probe_h(node_t *n, vpn_packet_t *packet, length_t len) {
 			len = n->maxmtu;
 		if(n->minmtu < len)
 			n->minmtu = len;
-
-		/* Calculate RTT and bandwidth.
-		   The RTT is the time between the MTU probe burst was sent and the first
-		   reply is received. The bandwidth is measured using the time between the
-		   arrival of the first and third probe reply.
-		 */
-
-		struct timeval now, diff;
-		gettimeofday(&now, NULL);
-		timersub(&now, &n->probe_time, &diff);
-		
-		n->probe_counter++;
-
-		if(n->probe_counter == 1) {
-			n->rtt = diff.tv_sec + diff.tv_usec * 1e-6;
-			n->probe_time = now;
-		} else if(n->probe_counter == 3) {
-			n->bandwidth = 2.0 * len / (diff.tv_sec + diff.tv_usec * 1e-6);
-			logger(DEBUG_TRAFFIC, LOG_DEBUG, "%s (%s) RTT %.2f ms, burst bandwidth %.3f Mbit/s, rx packet loss %.2f %%", n->name, n->hostname, n->rtt * 1e3, n->bandwidth * 8e-6, n->packetloss * 1e2);
-		}
 	}
 }
 
-static length_t compress_packet(uint8_t *dest, const uint8_t *source, length_t len, int level) {
-	if(level == 0) {
-		memcpy(dest, source, len);
-		return len;
-	} else if(level == 10) {
-		return -1;
-	} else if(level < 10) {
-#ifdef HAVE_ZLIB
-		unsigned long destlen = MAXSIZE;
-		if(compress2(dest, &destlen, source, len, level) == Z_OK)
-			return destlen;
-		else
-#endif
-			return -1;
-	} else {
-		return -1;
-	}
-
-	return -1;
+static uint16_t compress_packet(uint8_t *dest, const uint8_t *source, uint16_t len, int level) {
+	abort();
 }
 
-static length_t uncompress_packet(uint8_t *dest, const uint8_t *source, length_t len, int level) {
-	if(level == 0) {
-		memcpy(dest, source, len);
-		return len;
-	} else if(level > 9) {
-			return -1;
-	}
-#ifdef HAVE_ZLIB
-	else {
-		unsigned long destlen = MAXSIZE;
-		if(uncompress(dest, &destlen, source, len) == Z_OK)
-			return destlen;
-		else
-			return -1;
-	}
-#endif
-
-	return -1;
+static uint16_t uncompress_packet(uint8_t *dest, const uint8_t *source, uint16_t len, int level) {
+	abort();
 }
 
 /* VPN packet I/O */
 
-static void receive_packet(node_t *n, vpn_packet_t *packet) {
-	logger(DEBUG_TRAFFIC, LOG_DEBUG, "Received packet of %d bytes from %s (%s)",
-			   packet->len, n->name, n->hostname);
+static void receive_packet(meshlink_handle_t *mesh, node_t *n, vpn_packet_t *packet) {
+	logger(mesh, MESHLINK_DEBUG, "Received packet of %d bytes from %s (%s)",
+	       packet->len, n->name, n->hostname);
 
-	n->in_packets++;
-	n->in_bytes += packet->len;
+	if(n->status.blacklisted)
+		logger(mesh, MESHLINK_WARNING, "Dropping packet from blacklisted node %s", n->name);
+	else {
+		n->in_packets++;
+		n->in_bytes += packet->len;
 
-	route(n, packet);
+		route(mesh, n, packet);
+	}
 }
 
-static bool try_mac(node_t *n, const vpn_packet_t *inpkt) {
-	return sptps_verify_datagram(&n->sptps, (char *)&inpkt->seqno, inpkt->len);
+static bool try_mac(meshlink_handle_t *mesh, node_t *n, const vpn_packet_t *inpkt) {
+	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;
-
+static void receive_udppacket(meshlink_handle_t *mesh, node_t *n, vpn_packet_t *inpkt) {
 	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);
-		}
+			logger(mesh, MESHLINK_DEBUG, "Got packet from %s (%s) but we haven't exchanged keys yet", n->name, n->hostname);
+			send_req_key(mesh, n);
+		} else
+			logger(mesh, MESHLINK_DEBUG, "Got packet from %s (%s) but he hasn't got our key yet", n->name, n->hostname);
 		return;
 	}
-	sptps_receive_data(&n->sptps, (char *)&inpkt->seqno, inpkt->len);
+	sptps_receive_data(&n->sptps, inpkt->data, inpkt->len);
 }
 
-void receive_tcppacket(connection_t *c, const char *buffer, int len) {
+void receive_tcppacket(meshlink_handle_t *mesh, connection_t *c, const char *buffer, int len) {
 	vpn_packet_t outpkt;
 
-	if(len > sizeof outpkt.data)
+	if(len > sizeof(outpkt).data)
 		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);
+	receive_packet(mesh, c->node, &outpkt);
 }
 
-static void send_sptps_packet(node_t *n, vpn_packet_t *origpkt) {
+static void send_sptps_packet(meshlink_handle_t *mesh, node_t *n, vpn_packet_t *origpkt) {
 	if(!n->status.validkey) {
-		logger(DEBUG_TRAFFIC, LOG_INFO, "No valid key known yet for %s (%s)", n->name, n->hostname);
+		logger(mesh, MESHLINK_INFO, "No valid key known yet for %s (%s)", n->name, n->hostname);
 		if(!n->status.waitingforkey)
-			send_req_key(n);
-		else if(n->last_req_key + 10 < now.tv_sec) {
-			logger(DEBUG_ALWAYS, LOG_DEBUG, "No key from %s after 10 seconds, restarting SPTPS", n->name);
+			send_req_key(mesh, n);
+		else if(n->last_req_key + 10 < mesh->loop.now.tv_sec) {
+			logger(mesh, MESHLINK_DEBUG, "No key from %s after 10 seconds, restarting SPTPS", n->name);
 			sptps_stop(&n->sptps);
 			n->status.waitingforkey = false;
-			send_req_key(n);
+			send_req_key(mesh, n);
 		}
 		return;
 	}
 
 	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);
-		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;
+		int len = compress_packet(outpkt.data, origpkt->data, origpkt->len, n->outcompression);
+		if(len < 0)
+			logger(mesh, MESHLINK_ERROR, "Error while compressing packet to %s (%s)", n->name, n->hostname);
+		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;
 }
 
-static void choose_udp_address(const node_t *n, const sockaddr_t **sa, int *sock) {
+static void choose_udp_address(meshlink_handle_t *mesh, const node_t *n, const sockaddr_t **sa, int *sock) {
 	/* Latest guess */
 	*sa = &n->address;
 	*sock = n->sock;
@@ -405,13 +322,13 @@ static void choose_udp_address(const node_t *n, const sockaddr_t **sa, int *sock
 
 	if(candidate) {
 		*sa = &candidate->address;
-		*sock = rand() % listen_sockets;
+		*sock = rand() % mesh->listen_sockets;
 	}
 
 	/* Make sure we have a suitable socket for the chosen address */
-	if(listen_socket[*sock].sa.sa.sa_family != (*sa)->sa.sa_family) {
-		for(int i = 0; i < listen_sockets; i++) {
-			if(listen_socket[i].sa.sa.sa_family == (*sa)->sa.sa_family) {
+	if(mesh->listen_socket[*sock].sa.sa.sa_family != (*sa)->sa.sa_family) {
+		for(int i = 0; i < mesh->listen_sockets; i++) {
+			if(mesh->listen_socket[i].sa.sa.sa_family == (*sa)->sa.sa_family) {
 				*sock = i;
 				break;
 			}
@@ -419,7 +336,7 @@ static void choose_udp_address(const node_t *n, const sockaddr_t **sa, int *sock
 	}
 }
 
-static void choose_broadcast_address(const node_t *n, const sockaddr_t **sa, int *sock) {
+static void choose_broadcast_address(meshlink_handle_t *mesh, const node_t *n, const sockaddr_t **sa, int *sock) {
 	static sockaddr_t broadcast_ipv4 = {
 		.in = {
 			.sin_family = AF_INET,
@@ -436,21 +353,21 @@ static void choose_broadcast_address(const node_t *n, const sockaddr_t **sa, int
 		}
 	};
 
-	*sock = rand() % listen_sockets;
+	*sock = rand() % mesh->listen_sockets;
 
-	if(listen_socket[*sock].sa.sa.sa_family == AF_INET6) {
-		if(localdiscovery_address.sa.sa_family == AF_INET6) {
-			localdiscovery_address.in6.sin6_port = n->prevedge->address.in.sin_port;
-			*sa = &localdiscovery_address;
+	if(mesh->listen_socket[*sock].sa.sa.sa_family == AF_INET6) {
+		if(mesh->localdiscovery_address.sa.sa_family == AF_INET6) {
+			mesh->localdiscovery_address.in6.sin6_port = n->prevedge->address.in.sin_port;
+			*sa = &mesh->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;
+			broadcast_ipv6.in6.sin6_scope_id = mesh->listen_socket[*sock].sa.in6.sin6_scope_id;
 			*sa = &broadcast_ipv6;
 		}
 	} else {
-		if(localdiscovery_address.sa.sa_family == AF_INET) {
-			localdiscovery_address.in.sin_port = n->prevedge->address.in.sin_port;
-			*sa = &localdiscovery_address;
+		if(mesh->localdiscovery_address.sa.sa_family == AF_INET) {
+			mesh->localdiscovery_address.in.sin_port = n->prevedge->address.in.sin_port;
+			*sa = &mesh->localdiscovery_address;
 		} else {
 			broadcast_ipv4.in.sin_port = n->prevedge->address.in.sin_port;
 			*sa = &broadcast_ipv4;
@@ -458,43 +375,31 @@ static void choose_broadcast_address(const node_t *n, const sockaddr_t **sa, int
 	}
 }
 
-static void send_udppacket(node_t *n, vpn_packet_t *origpkt) {
-	vpn_packet_t pkt1, pkt2;
-	vpn_packet_t *pkt[] = { &pkt1, &pkt2, &pkt1, &pkt2 };
-	vpn_packet_t *inpkt = origpkt;
-	int nextpkt = 0;
-	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;
-
+static void send_udppacket(meshlink_handle_t *mesh, node_t *n, vpn_packet_t *origpkt) {
 	if(!n->status.reachable) {
-		logger(DEBUG_TRAFFIC, LOG_INFO, "Trying to send UDP packet to unreachable node %s (%s)", n->name, n->hostname);
+		logger(mesh, MESHLINK_INFO, "Trying to send UDP packet to unreachable node %s (%s)", n->name, n->hostname);
 		return;
 	}
 
-	return send_sptps_packet(n, origpkt);
+	return send_sptps_packet(mesh, n, origpkt);
 }
 
-bool send_sptps_data(void *handle, uint8_t type, const char *data, size_t len) {
+bool send_sptps_data(void *handle, uint8_t type, const void *data, size_t len) {
 	node_t *to = handle;
+	meshlink_handle_t *mesh = to->mesh;
 
 	/* 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) {
-			to->incompression = myself->incompression;
-			return send_request(to->nexthop->connection, "%d %s %s %s -1 -1 -1 %d", ANS_KEY, myself->name, to->name, buf, to->incompression);
-		} else {
-			return send_request(to->nexthop->connection, "%d %s %s %d %s", REQ_KEY, myself->name, to->name, REQ_SPTPS, buf);
-		}
+			to->incompression = mesh->self->incompression;
+			return send_request(mesh, 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(mesh, to->nexthop->connection, "%d %s %s %d %s", REQ_KEY, mesh->self->name, to->name, REQ_SPTPS, buf);
 	}
 
 	/* Otherwise, send the packet via UDP */
@@ -503,18 +408,18 @@ bool send_sptps_data(void *handle, uint8_t type, const char *data, size_t len) {
 	int sock;
 
 	if(to->status.broadcast)
-		choose_broadcast_address(to, &sa, &sock);
+		choose_broadcast_address(mesh, to, &sa, &sock);
 	else
-		choose_udp_address(to, &sa, &sock);
+		choose_udp_address(mesh, to, &sa, &sock);
 
-	if(sendto(listen_socket[sock].udp.fd, data, len, 0, &sa->sa, SALEN(sa->sa)) < 0 && !sockwouldblock(sockerrno)) {
+	if(sendto(mesh->listen_socket[sock].udp.fd, data, len, 0, &sa->sa, SALEN(sa->sa)) < 0 && !sockwouldblock(sockerrno)) {
 		if(sockmsgsize(sockerrno)) {
 			if(to->maxmtu >= len)
 				to->maxmtu = len - 1;
 			if(to->mtu >= len)
 				to->mtu = len - 1;
 		} else {
-			logger(DEBUG_TRAFFIC, LOG_WARNING, "Error sending UDP SPTPS packet to %s (%s): %s", to->name, to->hostname, sockstrerror(sockerrno));
+			logger(mesh, MESHLINK_WARNING, "Error sending UDP SPTPS packet to %s (%s): %s", to->name, to->hostname, sockstrerror(sockerrno));
 			return false;
 		}
 	}
@@ -522,20 +427,21 @@ bool send_sptps_data(void *handle, uint8_t type, const char *data, size_t len) {
 	return true;
 }
 
-bool receive_sptps_record(void *handle, uint8_t type, const char *data, uint16_t len) {
+bool receive_sptps_record(void *handle, uint8_t type, const void *data, uint16_t len) {
 	node_t *from = handle;
+	meshlink_handle_t *mesh = from->mesh;
 
 	if(type == SPTPS_HANDSHAKE) {
 		if(!from->status.validkey) {
 			from->status.validkey = true;
 			from->status.waitingforkey = false;
-			logger(DEBUG_META, LOG_INFO, "SPTPS key exchange with %s (%s) succesful", from->name, from->hostname);
+			logger(mesh, MESHLINK_INFO, "SPTPS key exchange with %s (%s) succesful", from->name, from->hostname);
 		}
 		return true;
 	}
 
 	if(len > MTU) {
-		logger(DEBUG_ALWAYS, LOG_ERR, "Packet from %s (%s) larger than maximum supported size (%d > %d)", from->name, from->hostname, len, MTU);
+		logger(mesh, MESHLINK_ERROR, "Packet from %s (%s) larger than maximum supported size (%d > %d)", from->name, from->hostname, len, MTU);
 		return false;
 	}
 
@@ -543,144 +449,93 @@ 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);
+		mtu_probe_h(mesh, from, &inpkt, len);
 		return true;
-	}
-
-	if(type & ~(PKT_COMPRESSED | PKT_MAC)) {
-		logger(DEBUG_ALWAYS, LOG_ERR, "Unexpected SPTPS record type %d len %d from %s (%s)", type, len, from->name, from->hostname);
-		return false;
-	}
+	} else
+		inpkt.probe = 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);
+	if(type & ~(PKT_COMPRESSED)) {
+		logger(mesh, MESHLINK_ERROR, "Unexpected SPTPS record type %d len %d from %s (%s)", type, len, 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);
-		if(ulen < 0) {
+		uint16_t ulen = uncompress_packet(inpkt.data, (const uint8_t *)data, len, from->incompression);
+		if(ulen < 0)
 			return false;
-		} else {
-			inpkt.len = ulen + offset;
-		}
+		else
+			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);
+	receive_packet(mesh, from, &inpkt);
 	return true;
 }
 
 /*
   send a packet to the given vpn ip.
 */
-void send_packet(node_t *n, vpn_packet_t *packet) {
-	node_t *via;
-
-	if(n == myself) {
+void send_packet(meshlink_handle_t *mesh, node_t *n, vpn_packet_t *packet) {
+	if(n == mesh->self) {
 		n->out_packets++;
 		n->out_bytes += packet->len;
 		// TODO: send to application
 		return;
 	}
 
-	logger(DEBUG_TRAFFIC, LOG_ERR, "Sending packet of %d bytes to %s (%s)",
-			   packet->len, n->name, n->hostname);
+	logger(mesh, MESHLINK_DEBUG, "Sending packet of %d bytes to %s (%s)",
+	       packet->len, n->name, n->hostname);
 
 	if(!n->status.reachable) {
-		logger(DEBUG_TRAFFIC, LOG_INFO, "Node %s (%s) is not reachable",
-				   n->name, n->hostname);
+		logger(mesh, MESHLINK_WARNING, "Node %s (%s) is not reachable",
+		       n->name, n->hostname);
 		return;
 	}
 
 	n->out_packets++;
 	n->out_bytes += packet->len;
 
-	send_sptps_packet(n, packet);
+	send_sptps_packet(mesh, n, packet);
 	return;
 }
 
 /* Broadcast a packet using the minimum spanning tree */
 
-void broadcast_packet(const node_t *from, vpn_packet_t *packet) {
+void broadcast_packet(meshlink_handle_t *mesh, const node_t *from, vpn_packet_t *packet) {
 	// Always give ourself a copy of the packet.
-	if(from != myself)
-		send_packet(myself, 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;
+	if(from != mesh->self)
+		send_packet(mesh, mesh->self, packet);
 
-		// 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;
+	logger(mesh, MESHLINK_INFO, "Broadcasting packet of %d bytes from %s (%s)",
+	       packet->len, from->name, from->hostname);
 
-			for splay_each(node_t, n, node_tree)
-				if(n->status.reachable && n != myself && ((n->via == myself && n->nexthop == n) || n->via == n))
-					send_packet(n, packet);
-			break;
-
-		default:
-			break;
-	}
+	for list_each(connection_t, c, mesh->connections)
+		if(c->status.active && c->status.mst && c != from->nexthop->connection)
+			send_packet(mesh, c->node, packet);
 }
 
-static node_t *try_harder(const sockaddr_t *from, const vpn_packet_t *pkt) {
+static node_t *try_harder(meshlink_handle_t *mesh, const sockaddr_t *from, const vpn_packet_t *pkt) {
 	node_t *n = NULL;
 	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)) {
-			if(last_hard_try == now.tv_sec)
+			if(last_hard_try == mesh->loop.now.tv_sec)
 				continue;
 			hard = true;
 		}
 
-		if(!try_mac(e->to, pkt))
+		if(!try_mac(mesh, e->to, pkt))
 			continue;
 
 		n = e->to;
@@ -688,26 +543,27 @@ static node_t *try_harder(const sockaddr_t *from, const vpn_packet_t *pkt) {
 	}
 
 	if(hard)
-		last_hard_try = now.tv_sec;
+		last_hard_try = mesh->loop.now.tv_sec;
 
-	last_hard_try = now.tv_sec;
+	last_hard_try = mesh->loop.now.tv_sec;
 	return n;
 }
 
-void handle_incoming_vpn_data(void *data, int flags) {
+void handle_incoming_vpn_data(event_loop_t *loop, void *data, int flags) {
+	meshlink_handle_t *mesh = loop->data;
 	listen_socket_t *ls = data;
 	vpn_packet_t pkt;
 	char *hostname;
 	sockaddr_t from = {{0}};
-	socklen_t fromlen = sizeof from;
+	socklen_t fromlen = sizeof(from);
 	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))
-			logger(DEBUG_ALWAYS, LOG_ERR, "Receiving packet failed: %s", sockstrerror(sockerrno));
+			logger(mesh, MESHLINK_ERROR, "Receiving packet failed: %s", sockstrerror(sockerrno));
 		return;
 	}
 
@@ -715,23 +571,26 @@ void handle_incoming_vpn_data(void *data, int flags) {
 
 	sockaddrunmap(&from); /* Some braindead IPv6 implementations do stupid things. */
 
-	n = lookup_node_udp(&from);
+	n = lookup_node_udp(mesh, &from);
 
 	if(!n) {
-		n = try_harder(&from, &pkt);
+		n = try_harder(mesh, &from, &pkt);
 		if(n)
-			update_node_udp(n, &from);
-		else if(debug_level >= DEBUG_PROTOCOL) {
+			update_node_udp(mesh, n, &from);
+		else if(mesh->log_level >= MESHLINK_WARNING) {
 			hostname = sockaddr2hostname(&from);
-			logger(DEBUG_PROTOCOL, LOG_WARNING, "Received UDP packet from unknown source %s", hostname);
+			logger(mesh, MESHLINK_WARNING, "Received UDP packet from unknown source %s", hostname);
 			free(hostname);
 			return;
-		}
-		else
+		} else
 			return;
 	}
 
-	n->sock = ls - listen_socket;
+	if(n->status.blacklisted) {
+		logger(mesh, MESHLINK_WARNING, "Dropping packet from blacklisted node %s", n->name);
+		return;
+	}
+	n->sock = ls - mesh->listen_socket;
 
-	receive_udppacket(n, &pkt);
+	receive_udppacket(mesh, n, &pkt);
 }