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;
+ }
}
}
*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++) {
/* Send it via TCP if it is a handshake packet, TCPOnly is in use, or this packet is larger than the MTU. */
- if(type >= SPTPS_HANDSHAKE || (type != PKT_PROBE && len > to->minmtu)) {
+ if(type >= SPTPS_HANDSHAKE || (type != PKT_PROBE && (len - 21) > to->minmtu)) {
char buf[len * 4 / 3 + 5];
b64encode(data, buf, len);
return true;
}
- if(len > MTU) {
- logger(mesh, MESHLINK_ERROR, "Packet from %s larger than maximum supported size (%d > %d)", from->name, len, MTU);
+ if(len > MAXSIZE) {
+ logger(mesh, MESHLINK_ERROR, "Packet from %s larger than maximum supported size (%d > %d)", from->name, len, MAXSIZE);
return false;
}