X-Git-Url: http://git.meshlink.io/?p=meshlink;a=blobdiff_plain;f=src%2Fnet_packet.c;h=8bc363d229a8f45350a09e3d18a53ad5ca264681;hp=8aca6aa59adda1ef8f78d9eecec914625a9a367a;hb=72fe3cdc361b933d8a471902b073378cbed6273d;hpb=6a0c9818677d1c5507bd8fa9d4378dbb324f6fbc

diff --git a/src/net_packet.c b/src/net_packet.c
index 8aca6aa5..8bc363d2 100644
--- a/src/net_packet.c
+++ b/src/net_packet.c
@@ -308,6 +308,12 @@ 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. */
 
@@ -327,6 +333,7 @@ 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++) {