#include "system.h"
-#ifdef HAVE_ZLIB
-#include <zlib.h>
-#endif
-
#include "conf.h"
#include "connection.h"
#include "crypto.h"
if(n->mtuprobes > 32) {
if(!n->minmtu) {
n->mtuprobes = 31;
- timeout = mesh->pinginterval;
+ timeout = mesh->dev_class_traits[n->devclass].pinginterval;
goto end;
}
n->mtuprobes = 1;
n->minmtu = 0;
n->maxmtu = MTU;
+
+ update_node_pmtu(mesh, n);
}
if(n->mtuprobes >= 10 && n->mtuprobes < 32 && !n->minmtu) {
if(n->mtuprobes == 30 || (n->mtuprobes < 30 && n->minmtu >= n->maxmtu)) {
if(n->minmtu > n->maxmtu) {
n->minmtu = n->maxmtu;
+ update_node_pmtu(mesh, n);
} else {
n->maxmtu = n->minmtu;
}
}
if(n->mtuprobes == 31) {
- timeout = mesh->pinginterval;
+ timeout = mesh->dev_class_traits[n->devclass].pinginterval;
goto end;
} else if(n->mtuprobes == 32) {
- timeout = mesh->pingtimeout;
+ timeout = mesh->dev_class_traits[n->devclass].pingtimeout;
}
- for(int i = 0; i < 4 + mesh->localdiscovery; i++) {
+ for(int i = 0; i < 5; i++) {
int len;
if(i == 0) {
} else if(n->maxmtu <= n->minmtu) {
len = n->maxmtu;
} else {
- len = n->minmtu + 1 + rand() % (n->maxmtu - n->minmtu);
+ len = n->minmtu + 1 + prng(mesh, n->maxmtu - n->minmtu);
}
if(len < 64) {
end:
timeout_set(&mesh->loop, &n->mtutimeout, &(struct timeval) {
- timeout, rand() % 100000
+ timeout, prng(mesh, TIMER_FUDGE)
});
}
}
static void mtu_probe_h(meshlink_handle_t *mesh, node_t *n, vpn_packet_t *packet, uint16_t len) {
+ if(len < 64) {
+ logger(mesh, MESHLINK_WARNING, "Got too short MTU probe length %d from %s", packet->len, n->name);
+ return;
+ }
+
logger(mesh, MESHLINK_DEBUG, "Got MTU probe length %d from %s", packet->len, n->name);
if(!packet->data[0]) {
if(n->minmtu < len) {
n->minmtu = len;
+ update_node_pmtu(mesh, n);
}
}
}
return;
}
- if(n->outcompression) {
- logger(mesh, MESHLINK_ERROR, "Error while compressing packet to %s", n->name);
- return;
- }
-
sptps_send_record(&n->sptps, type, origpkt->data, origpkt->len);
return;
}
to the node's reflexive UDP address discovered during key
exchange. */
- static int x = 0;
-
- if(++x >= 3) {
- x = 0;
+ if(++mesh->udp_choice >= 3) {
+ mesh->udp_choice = 0;
return;
}
So we pick a random edge and a random socket. */
int i = 0;
- int j = rand() % n->edge_tree->count;
+ int j = prng(mesh, n->edge_tree->count);
edge_t *candidate = NULL;
for splay_each(edge_t, e, n->edge_tree) {
if(candidate) {
*sa = &candidate->address;
- *sock = rand() % mesh->listen_sockets;
+ *sock = prng(mesh, mesh->listen_sockets);
}
/* Make sure we have a suitable socket for the chosen address */
}
};
- *sock = rand() % mesh->listen_sockets;
+ *sock = prng(mesh, mesh->listen_sockets);
if(mesh->listen_socket[*sock].sa.sa.sa_family == AF_INET6) {
- if(mesh->localdiscovery_address.sa.sa_family == AF_INET6) {
- mesh->localdiscovery_address.in6.sin6_port = n->prevedge->address.in.sin_port;
- *sa = &mesh->localdiscovery_address;
- } else {
- broadcast_ipv6.in6.sin6_port = n->prevedge->address.in.sin_port;
- broadcast_ipv6.in6.sin6_scope_id = mesh->listen_socket[*sock].sa.in6.sin6_scope_id;
- *sa = &broadcast_ipv6;
- }
+ broadcast_ipv6.in6.sin6_port = n->prevedge->address.in.sin_port;
+ broadcast_ipv6.in6.sin6_scope_id = mesh->listen_socket[*sock].sa.in6.sin6_scope_id;
+ *sa = &broadcast_ipv6;
} else {
- if(mesh->localdiscovery_address.sa.sa_family == AF_INET) {
- mesh->localdiscovery_address.in.sin_port = n->prevedge->address.in.sin_port;
- *sa = &mesh->localdiscovery_address;
- } else {
- broadcast_ipv4.in.sin_port = n->prevedge->address.in.sin_port;
- *sa = &broadcast_ipv4;
- }
+ broadcast_ipv4.in.sin_port = n->prevedge->address.in.sin_port;
+ *sa = &broadcast_ipv4;
}
}
}
bool send_sptps_data(void *handle, uint8_t type, const void *data, size_t len) {
+ assert(handle);
+ assert(data);
+ assert(len);
+
node_t *to = handle;
meshlink_handle_t *mesh = to->mesh;
/* 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 || ((mesh->self->options | to->options) & OPTION_TCPONLY) || (type != PKT_PROBE && len > to->minmtu)) {
+ if(type >= SPTPS_HANDSHAKE || (type != PKT_PROBE && len > to->minmtu)) {
char buf[len * 4 / 3 + 5];
b64encode(data, buf, len);
/* 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) {
- to->incompression = mesh->self->incompression;
- return send_request(mesh, to->nexthop->connection, "%d %s %s %s -1 -1 -1 %d", ANS_KEY, mesh->self->name, to->name, buf, to->incompression);
+ return send_request(mesh, to->nexthop->connection, NULL, "%d %s %s %s -1 -1 -1 %d", ANS_KEY, mesh->self->name, to->name, buf, 0);
} else {
- return send_request(mesh, to->nexthop->connection, "%d %s %s %d %s", REQ_KEY, mesh->self->name, to->name, REQ_SPTPS, buf);
+ return send_request(mesh, to->nexthop->connection, NULL, "%d %s %s %d %s", REQ_KEY, mesh->self->name, to->name, REQ_SPTPS, buf);
}
}
}
bool receive_sptps_record(void *handle, uint8_t type, const void *data, uint16_t len) {
+ assert(handle);
+ assert(!data || len);
+
node_t *from = handle;
meshlink_handle_t *mesh = from->mesh;
if(type == SPTPS_HANDSHAKE) {
if(!from->status.validkey) {
- logger(mesh, MESHLINK_INFO, "SPTPS key exchange with %s succesful", from->name);
+ logger(mesh, MESHLINK_INFO, "SPTPS key exchange with %s successful", from->name);
from->status.validkey = true;
from->status.waitingforkey = false;
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;
- static time_t last_hard_try = 0;
for splay_each(edge_t, e, mesh->edges) {
if(!e->to->status.reachable || e->to == mesh->self) {
}
if(sockaddrcmp_noport(from, &e->address)) {
- if(last_hard_try == mesh->loop.now.tv_sec) {
+ if(mesh->last_hard_try == mesh->loop.now.tv_sec) {
continue;
}
}
if(hard) {
- last_hard_try = mesh->loop.now.tv_sec;
+ mesh->last_hard_try = mesh->loop.now.tv_sec;
}
- last_hard_try = mesh->loop.now.tv_sec;
return n;
}
listen_socket_t *ls = data;
vpn_packet_t pkt;
char *hostname;
- sockaddr_t from = {0};
+ sockaddr_t from;
socklen_t fromlen = sizeof(from);
node_t *n;
int len;
+ memset(&from, 0, sizeof(from));
+
len = recvfrom(ls->udp.fd, pkt.data, MAXSIZE, 0, &from.sa, &fromlen);
if(len <= 0 || len > MAXSIZE) {