node_t *to = handle;
meshlink_handle_t *mesh = to->mesh;
+
+ if(!to->nexthop || !to->nexthop->connection) {
+ logger(mesh, MESHLINK_WARNING, "Cannot send SPTPS data to %s via %s", to->name, to->nexthop ? to->nexthop->name : to->name);
+ return false;
+ }
+
to->sptps.send_data = send_sptps_data;
char buf[len * 4 / 3 + 5];
b64encode(data, buf, len);
bool send_req_key(meshlink_handle_t *mesh, node_t *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, NULL, "%d %s %s %d", REQ_KEY, mesh->self->name, to->name, REQ_PUBKEY);
+
+ if(!to->nexthop || !to->nexthop->connection) {
+ logger(mesh, MESHLINK_WARNING, "Cannot send REQ_PUBKEY to %s via %s", to->name, to->nexthop ? to->nexthop->name : to->name);
+ return true;
+ }
+
+ char *pubkey = ecdsa_get_base64_public_key(mesh->private_key);
+ send_request(mesh, to->nexthop->connection, NULL, "%d %s %s %d %s", REQ_KEY, mesh->self->name, to->name, REQ_PUBKEY, pubkey);
+ free(pubkey);
return true;
}
static bool req_key_ext_h(meshlink_handle_t *mesh, connection_t *c, const char *request, node_t *from, int reqno) {
(void)c;
+ if(!from->nexthop || !from->nexthop->connection) {
+ logger(mesh, MESHLINK_WARNING, "Cannot answer REQ_KEY from %s via %s", from->name, from->nexthop ? from->nexthop->name : from->name);
+ return true;
+ }
+
switch(reqno) {
case REQ_PUBKEY: {
char *pubkey = ecdsa_get_base64_public_key(mesh->private_key);
- if(!from->nexthop || !from->nexthop->connection) {
- return false;
+ if(!node_read_public_key(mesh, from)) {
+ char hiskey[MAX_STRING_SIZE];
+
+ if(sscanf(request, "%*d %*s %*s %*d " MAX_STRING, hiskey) == 1) {
+ from->ecdsa = ecdsa_set_base64_public_key(hiskey);
+
+ if(!from->ecdsa) {
+ logger(mesh, MESHLINK_ERROR, "Got bad %s from %s: %s", "REQ_PUBKEY", from->name, "invalid pubkey");
+ return true;
+ }
+ }
}
send_request(mesh, from->nexthop->connection, NULL, "%d %s %s %d %s", REQ_KEY, mesh->self->name, from->name, ANS_PUBKEY, pubkey);
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 timeval) {
+ timeout_set(&mesh->loop, &outgoing->ev, &(struct timespec) {
0, 0
});
}
/* This should never happen. Ignore it, unless it came directly from the connected peer, in which case we disconnect. */
return from->connection != c;
} else {
- if(!to->status.reachable) {
+ if(!to->status.reachable || !to->nexthop || !to->nexthop->connection) {
logger(mesh, MESHLINK_WARNING, "Got %s from %s destination %s which is not reachable",
"REQ_KEY", c->name, to_name);
return true;
return true;
}
+ if(!to->nexthop || !to->nexthop->connection) {
+ logger(mesh, MESHLINK_WARNING, "Cannot forward ANS_KEY to %s via %s", to->name, to->nexthop ? to->nexthop->name : to->name);
+ return false;
+ }
+
/* 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;
+ char *reflexive_address, *reflexive_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, NULL, "%s %s %s", request, address, port);
- free(address);
- free(port);
+ sockaddr2str(&from->address, &reflexive_address, &reflexive_port);
+ send_request(mesh, to->nexthop->connection, NULL, "%s %s %s", request, reflexive_address, reflexive_port);
+ free(reflexive_address);
+ free(reflexive_port);
return true;
}
continue;
}
+ if(!n->nexthop->connection) {
+ 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);
}