X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fnet_packet.c;h=36386b58dd3d6757345ee831beabbc283e54a953;hb=415910897122da0073a862784d148802ca390020;hp=f69bf98f5766722c15798e2580ae3c48889fbac8;hpb=0c026f3c6dec784c3267ad7e2c4709d5393dc292;p=tinc

diff --git a/src/net_packet.c b/src/net_packet.c
index f69bf98f..36386b58 100644
--- a/src/net_packet.c
+++ b/src/net_packet.c
@@ -55,7 +55,6 @@ static void send_udppacket(node_t *, vpn_packet_t *);
 
 unsigned replaywin = 16;
 bool localdiscovery = false;
-sockaddr_t localdiscovery_address;
 
 #define MAX_SEQNO 1073741824
 
@@ -144,14 +143,14 @@ static void send_mtu_probe_handler(void *data) {
 		randomize(packet.data + 14, len - 14);
 		packet.len = len;
 		packet.priority = 0;
-		n->status.broadcast = i >= 4 && n->mtuprobes <= 10 && n->prevedge;
+		n->status.send_locally = 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->status.send_locally = false;
 	n->probe_counter = 0;
 	gettimeofday(&n->probe_time, NULL);
 
@@ -544,6 +543,18 @@ static void send_sptps_packet(node_t *n, vpn_packet_t *origpkt) {
 	return;
 }
 
+static void adapt_socket(const sockaddr_t *sa, int *sock) {
+	/* 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) {
+				*sock = i;
+				break;
+			}
+		}
+	}
+}
+
 static void choose_udp_address(const node_t *n, const sockaddr_t **sa, int *sock) {
 	/* Latest guess */
 	*sa = &n->address;
@@ -582,54 +593,30 @@ static void choose_udp_address(const node_t *n, const sockaddr_t **sa, int *sock
 		*sock = rand() % 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) {
-				*sock = i;
-				break;
-			}
-		}
-	}
+	adapt_socket(*sa, sock);
 }
 
-static void choose_broadcast_address(const node_t *n, const sockaddr_t **sa, int *sock) {
-	static sockaddr_t broadcast_ipv4 = {
-		.in = {
-			.sin_family = AF_INET,
-			.sin_addr.s_addr = -1,
-		}
-	};
-
-	static sockaddr_t broadcast_ipv6 = {
-		.in6 = {
-			.sin6_family = AF_INET6,
-			.sin6_addr.s6_addr[0x0] = 0xff,
-			.sin6_addr.s6_addr[0x1] = 0x02,
-			.sin6_addr.s6_addr[0xf] = 0x01,
-		}
-	};
+static void choose_local_address(const node_t *n, const sockaddr_t **sa, int *sock) {
+	*sa = NULL;
 
-	*sock = rand() % listen_sockets;
+	/* Pick one of the edges from this node at random, then use its local address. */
 
-	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;
-		} 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 {
-		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;
+	int i = 0;
+	int j = rand() % n->edge_tree->count;
+	edge_t *candidate = NULL;
+
+	for splay_each(edge_t, e, n->edge_tree) {
+		if(i++ == j) {
+			candidate = e;
+			break;
 		}
 	}
+
+	if (candidate && candidate->local_address.sa.sa_family) {
+		*sa = &candidate->local_address;
+		*sock = rand() % listen_sockets;
+		adapt_socket(*sa, sock);
+	}
 }
 
 static void send_udppacket(node_t *n, vpn_packet_t *origpkt) {
@@ -730,12 +717,12 @@ static void send_udppacket(node_t *n, vpn_packet_t *origpkt) {
 
 	/* Send the packet */
 
-	const sockaddr_t *sa;
+	const sockaddr_t *sa = NULL;
 	int sock;
 
-	if(n->status.broadcast)
-		choose_broadcast_address(n, &sa, &sock);
-	else
+	if(n->status.send_locally)
+		choose_local_address(n, &sa, &sock);
+	if(!sa)
 		choose_udp_address(n, &sa, &sock);
 
 #if defined(SOL_IP) && defined(IP_TOS)
@@ -785,8 +772,8 @@ bool send_sptps_data(void *handle, uint8_t type, const char *data, size_t len) {
 	const sockaddr_t *sa;
 	int sock;
 
-	if(to->status.broadcast)
-		choose_broadcast_address(to, &sa, &sock);
+	if(to->status.send_locally)
+		choose_local_address(to, &sa, &sock);
 	else
 		choose_udp_address(to, &sa, &sock);