static const int req_key_timeout = 2;
void send_key_changed(meshlink_handle_t *mesh) {
- send_request(mesh, mesh->everyone, NULL, "%d %x %s", KEY_CHANGED, rand(), mesh->self->name);
+ send_request(mesh, mesh->everyone, NULL, "%d %x %s", KEY_CHANGED, prng(mesh, UINT_MAX), mesh->self->name);
/* Force key exchange for connections using SPTPS */
}
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;
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;
}
}
+ /* Also reset any UTCP timers */
+ utcp_reset_timers(from->utcp);
+
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;
}
-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) {
+ /* 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);