#include "utils.h"
#include "xalloc.h"
-void send_key_changed(meshlink_handle_t *mesh) {
- send_request(mesh, mesh->everyone, "%d %x %s", KEY_CHANGED, rand(), mesh->self->name);
-
- /* Force key exchange for connections using SPTPS */
-
- for splay_each(node_t, n, mesh->nodes)
- if(n->status.reachable && n->status.validkey) {
- sptps_force_kex(&n->sptps);
- }
-}
+static const int req_key_timeout = 2;
bool key_changed_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
+ assert(request);
+ assert(*request);
+
char name[MAX_STRING_SIZE];
node_t *n;
/* Tell the others */
- forward_request(mesh, c, request);
+ forward_request(mesh, c, NULL, request);
return true;
}
static bool send_initial_sptps_data(void *handle, uint8_t type, const void *data, size_t len) {
(void)type;
+
+ assert(data);
+ assert(len);
+
node_t *to = handle;
meshlink_handle_t *mesh = to->mesh;
to->sptps.send_data = send_sptps_data;
char buf[len * 4 / 3 + 5];
b64encode(data, buf, len);
- return send_request(mesh, to->nexthop->connection, "%d %s %s %d %s", REQ_KEY, mesh->self->name, to->name, REQ_KEY, buf);
+ return send_request(mesh, to->nexthop->connection, NULL, "%d %s %s %d %s", REQ_KEY, mesh->self->name, to->name, REQ_KEY, buf);
}
bool send_req_key(meshlink_handle_t *mesh, node_t *to) {
- if(!node_read_ecdsa_public_key(mesh, to)) {
+ if(!node_read_public_key(mesh, to)) {
logger(mesh, MESHLINK_DEBUG, "No ECDSA key known for %s", to->name);
- send_request(mesh, to->nexthop->connection, "%d %s %s %d", REQ_KEY, mesh->self->name, to->name, REQ_PUBKEY);
+ send_request(mesh, to->nexthop->connection, NULL, "%d %s %s %d", REQ_KEY, mesh->self->name, to->name, REQ_PUBKEY);
return true;
}
to->status.validkey = false;
to->status.waitingforkey = true;
to->last_req_key = mesh->loop.now.tv_sec;
- to->incompression = mesh->self->incompression;
- return sptps_start(&to->sptps, to, true, true, mesh->self->connection->ecdsa, to->ecdsa, label, sizeof(label) - 1, send_initial_sptps_data, receive_sptps_record);
+ return sptps_start(&to->sptps, to, true, true, mesh->private_key, to->ecdsa, label, sizeof(label) - 1, send_initial_sptps_data, receive_sptps_record);
}
/* REQ_KEY is overloaded to allow arbitrary requests to be routed between two nodes. */
switch(reqno) {
case REQ_PUBKEY: {
- char *pubkey = ecdsa_get_base64_public_key(mesh->self->connection->ecdsa);
- send_request(mesh, from->nexthop->connection, "%d %s %s %d %s", REQ_KEY, mesh->self->name, from->name, ANS_PUBKEY, pubkey);
+ char *pubkey = ecdsa_get_base64_public_key(mesh->private_key);
+
+ if(!from->nexthop || !from->nexthop->connection) {
+ return false;
+ }
+
+ send_request(mesh, from->nexthop->connection, NULL, "%d %s %s %d %s", REQ_KEY, mesh->self->name, from->name, ANS_PUBKEY, pubkey);
free(pubkey);
return true;
}
case ANS_PUBKEY: {
- if(node_read_ecdsa_public_key(mesh, from)) {
+ if(node_read_public_key(mesh, from)) {
logger(mesh, MESHLINK_WARNING, "Got ANS_PUBKEY from %s even though we already have his pubkey", from->name);
return true;
}
}
logger(mesh, MESHLINK_INFO, "Learned ECDSA public key from %s", from->name);
- append_config_file(mesh, from->name, "ECDSAPublicKey", pubkey);
+ from->status.dirty = true;
+
+ /* If we are trying to form an outgoing connection to this node, retry immediately */
+ for list_each(outgoing_t, outgoing, mesh->outgoings) {
+ if(outgoing->node == from && outgoing->ev.cb) {
+ outgoing->timeout = 0;
+ timeout_set(&mesh->loop, &outgoing->ev, &(struct timespec) {
+ 0, 0
+ });
+ }
+ }
+
+ /* Also reset any UTCP timers */
+ utcp_reset_timers(from->utcp);
+
return true;
}
case REQ_KEY: {
- if(!node_read_ecdsa_public_key(mesh, from)) {
+ if(!node_read_public_key(mesh, from)) {
logger(mesh, MESHLINK_DEBUG, "No ECDSA key known for %s", from->name);
- send_request(mesh, from->nexthop->connection, "%d %s %s %d", REQ_KEY, mesh->self->name, from->name, REQ_PUBKEY);
+ send_request(mesh, from->nexthop->connection, NULL, "%d %s %s %d", REQ_KEY, mesh->self->name, from->name, REQ_PUBKEY);
return true;
}
if(from->sptps.label) {
logger(mesh, MESHLINK_DEBUG, "Got REQ_KEY from %s while we already started a SPTPS session!", from->name);
- if(strcmp(mesh->self->name, from->name) < 0) {
+ if(mesh->loop.now.tv_sec < from->last_req_key + req_key_timeout && strcmp(mesh->self->name, from->name) < 0) {
logger(mesh, MESHLINK_DEBUG, "Ignoring REQ_KEY from %s.", from->name);
return true;
}
from->status.validkey = false;
from->status.waitingforkey = true;
from->last_req_key = mesh->loop.now.tv_sec;
- sptps_start(&from->sptps, from, false, true, mesh->self->connection->ecdsa, from->ecdsa, label, sizeof(label) - 1, send_sptps_data, receive_sptps_record);
- sptps_receive_data(&from->sptps, buf, len);
+
+ if(!sptps_start(&from->sptps, from, false, true, mesh->private_key, from->ecdsa, label, sizeof(label) - 1, send_sptps_data, receive_sptps_record)) {
+ logger(mesh, MESHLINK_ERROR, "Could not start SPTPS session with %s: %s", from->name, strerror(errno));
+ return true;
+ }
+
+ if(!sptps_receive_data(&from->sptps, buf, len)) {
+ logger(mesh, MESHLINK_ERROR, "Could not process SPTPS data from %s: %s", from->name, strerror(errno));
+ return true;
+ }
+
return true;
}
return true;
}
- sptps_receive_data(&from->sptps, buf, len);
+ if(!sptps_receive_data(&from->sptps, buf, len)) {
+ logger(mesh, MESHLINK_ERROR, "Could not process SPTPS data from %s: %s", from->name, strerror(errno));
+ return true;
+ }
+
return true;
}
}
bool req_key_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
+ assert(request);
+ assert(*request);
+
char from_name[MAX_STRING_SIZE];
char to_name[MAX_STRING_SIZE];
node_t *from, *to;
return true;
}
- send_request(mesh, to->nexthop->connection, "%s", request);
+ send_request(mesh, to->nexthop->connection, NULL, "%s", request);
}
return true;
}
-bool send_ans_key(meshlink_handle_t *mesh, node_t *to) {
- (void)mesh;
- (void)to;
- abort();
-}
-
bool ans_key_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
+ assert(request);
+ assert(*request);
+
char from_name[MAX_STRING_SIZE];
char to_name[MAX_STRING_SIZE];
char key[MAX_STRING_SIZE];
return true;
}
- if(!*address && from->address.sa.sa_family != AF_UNSPEC) {
+ if(from == to) {
+ logger(mesh, MESHLINK_WARNING, "Got %s from %s from %s to %s",
+ "ANS_KEY", c->name, from_name, to_name);
+ return true;
+ }
+
+ /* Append the known UDP address of the from node, if we have a confirmed one */
+ if(!*address && from->status.udp_confirmed && from->address.sa.sa_family != AF_UNSPEC) {
char *address, *port;
logger(mesh, MESHLINK_DEBUG, "Appending reflexive UDP address to ANS_KEY from %s to %s", from->name, to->name);
sockaddr2str(&from->address, &address, &port);
- send_request(mesh, to->nexthop->connection, "%s %s %s", request, address, port);
+ send_request(mesh, to->nexthop->connection, NULL, "%s %s %s", request, address, port);
free(address);
free(port);
return true;
}
- return send_request(mesh, to->nexthop->connection, "%s", request);
+ return send_request(mesh, to->nexthop->connection, NULL, "%s", request);
}
- /* Don't use key material until every check has passed. */
- from->status.validkey = false;
+ /* Is this an ANS_KEY informing us of our own reflexive UDP address? */
+
+ if(from == mesh->self) {
+ if(*key == '.' && *address && *port) {
+ logger(mesh, MESHLINK_DEBUG, "Learned our own reflexive UDP address from %s: %s port %s", c->name, address, port);
+
+ /* Inform all other nodes we want to communicate with and which are reachable via this connection */
+ for splay_each(node_t, n, mesh->nodes) {
+ if(n->nexthop != c->node) {
+ continue;
+ }
+
+ if(n->status.udp_confirmed) {
+ continue;
+ }
+
+ if(!n->status.waitingforkey && !n->status.validkey) {
+ continue;
+ }
+
+ logger(mesh, MESHLINK_DEBUG, "Forwarding our own reflexive UDP address to %s", n->name);
+ send_request(mesh, c, NULL, "%d %s %s . -1 -1 -1 0 %s %s", ANS_KEY, mesh->self->name, n->name, address, port);
+ }
+ } else {
+ logger(mesh, MESHLINK_WARNING, "Got %s from %s from %s to %s",
+ "ANS_KEY", c->name, from_name, to_name);
+ }
- /* Compression is not supported. */
- if(compression != 0) {
- logger(mesh, MESHLINK_ERROR, "Node %s uses bogus compression level!", from->name);
return true;
}
- from->outcompression = compression;
+ /* Process SPTPS data if present */
- /* SPTPS or old-style key exchange? */
+ if(*key != '.') {
+ /* Don't use key material until every check has passed. */
+ from->status.validkey = false;
- char buf[strlen(key)];
- int len = b64decode(key, buf, strlen(key));
+ /* Compression is not supported. */
+ if(compression != 0) {
+ logger(mesh, MESHLINK_ERROR, "Node %s uses bogus compression level!", from->name);
+ return true;
+ }
+
+ char buf[strlen(key)];
+ int len = b64decode(key, buf, strlen(key));
- if(!len || !sptps_receive_data(&from->sptps, buf, len)) {
- logger(mesh, MESHLINK_ERROR, "Error processing SPTPS data from %s", from->name);
+ if(!len || !sptps_receive_data(&from->sptps, buf, len)) {
+ logger(mesh, MESHLINK_ERROR, "Error processing SPTPS data from %s", from->name);
+ }
}
if(from->status.validkey) {
update_node_udp(mesh, from, &sa);
}
- if(from->options & OPTION_PMTU_DISCOVERY && !(from->options & OPTION_TCPONLY)) {
- send_mtu_probe(mesh, from);
- }
+ send_mtu_probe(mesh, from);
}
return true;
projects / meshlink / blobdiff