}
if(n->mtuprobes == 31) {
- if(!n->minmtu && n->status.want_udp) {
+ if(!n->minmtu && n->status.want_udp && n->nexthop && n->nexthop->connection) {
/* 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;
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);
+
+ if(n->nexthop && n->nexthop->connection) {
+ send_request(mesh, n->nexthop->connection, NULL, "%d %s %s . -1 -1 -1 0 %s %s", ANS_KEY, n->name, n->name, address, port);
+ } else {
+ logger(mesh, MESHLINK_WARNING, "Cannot send reflexive address to %s via %s", n->name, n->nexthop ? n->nexthop->name : n->name);
+ }
+
free(address);
free(port);
n->status.udp_confirmed = true;
return;
}
-static void choose_udp_address(meshlink_handle_t *mesh, const node_t *n, const sockaddr_t **sa, int *sock) {
+static void choose_udp_address(meshlink_handle_t *mesh, const node_t *n, const sockaddr_t **sa, int *sock, sockaddr_t *sa_buf) {
/* Latest guess */
*sa = &n->address;
*sock = n->sock;
goto check_socket;
}
+ /* Else, if we have a canonical address, try this once every batch */
+ if(mesh->udp_choice == 1 && n->canonical_address) {
+ char *host = xstrdup(n->canonical_address);
+ char *port = strchr(host, ' ');
+
+ if(port) {
+ *port++ = 0;
+ *sa_buf = str2sockaddr_random(mesh, host, port);
+ *sa = sa_buf;
+ free(host);
+ goto check_socket;
+ }
+
+ free(host);
+ }
+
/* Otherwise, address are found in edges to this node.
So we pick a random edge and a random socket. */
char buf[len * 4 / 3 + 5];
b64encode(data, buf, len);
+ if(!to->nexthop || !to->nexthop->connection) {
+ logger(mesh, MESHLINK_WARNING, "Unable to forward SPTPS packet to %s via %s", to->name, to->nexthop ? to->nexthop->name : to->name);
+ return false;
+ }
+
/* If no valid key is known yet, send the packets using ANS_KEY requests,
to ensure we get to learn the reflexive UDP address. */
if(!to->status.validkey) {
/* Otherwise, send the packet via UDP */
+ sockaddr_t sa_buf;
const sockaddr_t *sa;
int sock;
if(to->status.broadcast) {
choose_broadcast_address(mesh, to, &sa, &sock);
} else {
- choose_udp_address(mesh, to, &sa, &sock);
+ choose_udp_address(mesh, to, &sa, &sock, &sa_buf);
}
if(sendto(mesh->listen_socket[sock].udp.fd, data, len, 0, &sa->sa, SALEN(sa->sa)) < 0 && !sockwouldblock(sockerrno)) {