X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fnet_packet.c;h=2d3d7c7711c78f0769131c37ef6976e2bbc107ba;hb=0b6635bd9460ba2f9aeafddd2aef79929cd417a1;hp=e4f3295af941bdd92335298c30b9c776e9b9c8dd;hpb=46e373d99b4559245885c94930a6979d03a6f12b;p=meshlink

diff --git a/src/net_packet.c b/src/net_packet.c
index e4f3295a..2d3d7c77 100644
--- a/src/net_packet.c
+++ b/src/net_packet.c
@@ -102,6 +102,12 @@ static void send_mtu_probe_handler(event_loop_t *loop, void *data) {
 	}
 
 	if(n->mtuprobes == 31) {
+		if(!n->minmtu && n->status.want_udp) {
+			/* Send a dummy ANS_KEY to try to update the reflexive UDP address */
+			send_request(mesh, n->nexthop->connection, NULL, "%d %s %s . -1 -1 -1 0", ANS_KEY, mesh->self->name, n->name);
+			n->status.want_udp = false;
+		}
+
 		timeout = mesh->dev_class_traits[n->devclass].pinginterval;
 		goto end;
 	} else if(n->mtuprobes == 32) {
@@ -179,7 +185,14 @@ static void mtu_probe_h(meshlink_handle_t *mesh, node_t *n, vpn_packet_t *packet
 		   is possible using the address and socket that the reply
 		   packet used. */
 
-		n->status.udp_confirmed = true;
+		if(!n->status.udp_confirmed) {
+			char *address, *port;
+			sockaddr2str(&n->address, &address, &port);
+			send_request(mesh, n->nexthop->connection, NULL, "%d %s %s . -1 -1 -1 0 %s %s", ANS_KEY, n->name, n->name, address, port);
+			free(address);
+			free(port);
+			n->status.udp_confirmed = true;
+		}
 
 		/* If we haven't established the PMTU yet, restart the discovery process. */
 
@@ -243,7 +256,9 @@ static void receive_udppacket(meshlink_handle_t *mesh, node_t *n, vpn_packet_t *
 		return;
 	}
 
-	sptps_receive_data(&n->sptps, inpkt->data, inpkt->len);
+	if(!sptps_receive_data(&n->sptps, inpkt->data, inpkt->len)) {
+		logger(mesh, MESHLINK_ERROR, "Could not process SPTPS data from %s: %s", n->name, strerror(errno));
+	}
 }
 
 static void send_sptps_packet(meshlink_handle_t *mesh, node_t *n, vpn_packet_t *origpkt) {
@@ -472,27 +487,12 @@ void send_packet(meshlink_handle_t *mesh, node_t *n, vpn_packet_t *packet) {
 
 	n->out_packets++;
 	n->out_bytes += packet->len;
+	n->status.want_udp = true;
 
 	send_sptps_packet(mesh, n, packet);
 	return;
 }
 
-/* Broadcast a packet using the minimum spanning tree */
-
-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 != mesh->self) {
-		send_packet(mesh, mesh->self, packet);
-	}
-
-	logger(mesh, MESHLINK_INFO, "Broadcasting packet of %d bytes from %s", packet->len, from->name);
-
-	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(meshlink_handle_t *mesh, const sockaddr_t *from, const vpn_packet_t *pkt) {
 	node_t *n = NULL;
 	bool hard = false;
@@ -559,7 +559,7 @@ void handle_incoming_vpn_data(event_loop_t *loop, void *data, int flags) {
 
 		if(n) {
 			update_node_udp(mesh, n, &from);
-		} else if(mesh->log_level >= MESHLINK_WARNING) {
+		} else if(mesh->log_level <= MESHLINK_WARNING) {
 			hostname = sockaddr2hostname(&from);
 			logger(mesh, MESHLINK_WARNING, "Received UDP packet from unknown source %s", hostname);
 			free(hostname);