X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fnet_packet.c;h=3ee0eaec4a4be44f6d5ec57ed69ddeb5242d4656;hb=8d4b96efb7955eaa96174af4804597f92e124041;hp=8aca6aa59adda1ef8f78d9eecec914625a9a367a;hpb=7212e13585536500c61c458e6d55e723183e4a5b;p=meshlink

diff --git a/src/net_packet.c b/src/net_packet.c
index 8aca6aa5..3ee0eaec 100644
--- a/src/net_packet.c
+++ b/src/net_packet.c
@@ -308,17 +308,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 +336,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++) {