X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fnet_packet.c;h=38200e5a1d9a31f05bfe6b63ef86634eb9079374;hb=c5ef941dafcbce05801f65f9cf7abe8aa4a3e641;hp=7dae0fe0a558c3ac5eed8920de4f00ef290e2f14;hpb=4c57e6902219ecca1872e18e34365d8e54a0f407;p=meshlink

diff --git a/src/net_packet.c b/src/net_packet.c
index 7dae0fe0..38200e5a 100644
--- a/src/net_packet.c
+++ b/src/net_packet.c
@@ -245,6 +245,11 @@ static bool try_mac(meshlink_handle_t *mesh, node_t *n, const vpn_packet_t *inpk
 }
 
 static void receive_udppacket(meshlink_handle_t *mesh, node_t *n, vpn_packet_t *inpkt) {
+	if(!n->status.reachable) {
+		logger(mesh, MESHLINK_ERROR, "Got SPTPS data from unreachable node %s", n->name);
+		return;
+	}
+
 	if(!n->sptps.state) {
 		if(!n->status.waitingforkey) {
 			logger(mesh, MESHLINK_DEBUG, "Got packet from %s but we haven't exchanged keys yet", n->name);
@@ -262,6 +267,11 @@ static void receive_udppacket(meshlink_handle_t *mesh, node_t *n, vpn_packet_t *
 }
 
 static void send_sptps_packet(meshlink_handle_t *mesh, node_t *n, vpn_packet_t *origpkt) {
+	if(!n->status.reachable) {
+		logger(mesh, MESHLINK_ERROR, "Trying to send SPTPS data to unreachable node %s", n->name);
+		return;
+	}
+
 	if(!n->status.validkey) {
 		logger(mesh, MESHLINK_INFO, "No valid key known yet for %s", n->name);
 
@@ -308,17 +318,26 @@ static void choose_udp_address(meshlink_handle_t *mesh, const node_t *n, const s
 		return;
 	}
 
+	/* If we have learned an address via Catta, try this once every batch */
+	if(mesh->udp_choice == 1 && n->catta_address.sa.sa_family != AF_UNSPEC) {
+		*sa = &n->catta_address;
+		goto check_socket;
+	}
+
 	/* Otherwise, address are found in edges to this node.
 	   So we pick a random edge and a random socket. */
 
-	int i = 0;
-	int j = prng(mesh, n->edge_tree->count);
 	edge_t *candidate = NULL;
 
-	for splay_each(edge_t, e, n->edge_tree) {
-		if(i++ == j) {
-			candidate = e->reverse;
-			break;
+	{
+		int i = 0;
+		int j = prng(mesh, n->edge_tree->count);
+
+		for splay_each(edge_t, e, n->edge_tree) {
+			if(i++ == j) {
+				candidate = e->reverse;
+				break;
+			}
 		}
 	}
 
@@ -327,6 +346,8 @@ static void choose_udp_address(meshlink_handle_t *mesh, const node_t *n, const s
 		*sock = prng(mesh, mesh->listen_sockets);
 	}
 
+check_socket:
+
 	/* Make sure we have a suitable socket for the chosen address */
 	if(mesh->listen_socket[*sock].sa.sa.sa_family != (*sa)->sa.sa_family) {
 		for(int i = 0; i < mesh->listen_sockets; i++) {
@@ -368,9 +389,14 @@ 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;
 
+	if(!to->status.reachable) {
+		logger(mesh, MESHLINK_ERROR, "Trying to send SPTPS data to unreachable node %s", to->name);
+		return false;
+	}
+
 	/* 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 || (type != PKT_PROBE && len > to->minmtu)) {
+	if(type >= SPTPS_HANDSHAKE || (type != PKT_PROBE && (len - 21) > to->minmtu)) {
 		char buf[len * 4 / 3 + 5];
 		b64encode(data, buf, len);
 
@@ -433,8 +459,8 @@ bool receive_sptps_record(void *handle, uint8_t type, const void *data, uint16_t
 		return true;
 	}
 
-	if(len > MTU) {
-		logger(mesh, MESHLINK_ERROR, "Packet from %s larger than maximum supported size (%d > %d)", from->name, len, MTU);
+	if(len > MAXSIZE) {
+		logger(mesh, MESHLINK_ERROR, "Packet from %s larger than maximum supported size (%d > %d)", from->name, len, MAXSIZE);
 		return false;
 	}