break;
}
- if(found) {
+ if(found || !is_valid_hostname(host[i])) {
free(host[i]);
free(port[i]);
host[i] = NULL;
char resolved_port[NI_MAXSERV];
err = getnameinfo(ai_in->ai_addr, ai_in->ai_addrlen, resolved_host, sizeof resolved_host, resolved_port, sizeof resolved_port, NI_NUMERICSERV);
- if(err) {
+ if(err || !is_valid_hostname(resolved_host)) {
freeaddrinfo(ai_in);
continue;
}
return true;
}
-int check_port(meshlink_handle_t *mesh) {
+static int check_port(meshlink_handle_t *mesh) {
for(int i = 0; i < 1000; i++) {
- int port = 0x1000 + (rand() & 0x7fff);
+ int port = 0x1000 + prng(mesh, 0x8000);
if(try_bind(port)) {
free(mesh->myport);
// Get our local address(es) by simulating connecting to an Internet host.
static void add_local_addresses(meshlink_handle_t *mesh) {
struct sockaddr_storage sn;
+ sn.ss_family = AF_UNKNOWN;
socklen_t sl = sizeof(sn);
// IPv4 example.org
if(!name || !*name) {
logger(NULL, MESHLINK_ERROR, "No name given!\n");
- //return NULL;
- } else { //check name only if there is a name != NULL
- if(!check_id(name)) {
- logger(NULL, MESHLINK_ERROR, "Invalid name given!\n");
- meshlink_errno = MESHLINK_EINVAL;
- return NULL;
- }
+ meshlink_errno = MESHLINK_EINVAL;
+ return NULL;
+ };
+
+ if(!check_id(name)) {
+ logger(NULL, MESHLINK_ERROR, "Invalid name given!\n");
+ meshlink_errno = MESHLINK_EINVAL;
+ return NULL;
}
if(devclass < 0 || devclass >= DEV_CLASS_COUNT) {
return false;
}
- pthread_mutex_lock(&(mesh->mesh_mutex));
+ pthread_mutex_lock(&mesh->mutex);
// Create hash for the new key
void *new_config_key;
if(!prf(new_key, new_keylen, "MeshLink configuration key", 26, new_config_key, CHACHA_POLY1305_KEYLEN)) {
logger(mesh, MESHLINK_ERROR, "Error creating new configuration key!\n");
meshlink_errno = MESHLINK_EINTERNAL;
- pthread_mutex_unlock(&(mesh->mesh_mutex));
+ pthread_mutex_unlock(&mesh->mutex);
return false;
}
if(!config_copy(mesh, "current", mesh->config_key, "new", new_config_key)) {
logger(mesh, MESHLINK_ERROR, "Could not set up configuration in %s/old: %s\n", mesh->confbase, strerror(errno));
meshlink_errno = MESHLINK_ESTORAGE;
- pthread_mutex_unlock(&(mesh->mesh_mutex));
+ pthread_mutex_unlock(&mesh->mutex);
return false;
}
logger(mesh, MESHLINK_ERROR, "Cannot rename %s/current to %s/old\n", mesh->confbase, mesh->confbase);
meshlink_errno = MESHLINK_ESTORAGE;
main_config_lock(mesh);
- pthread_mutex_unlock(&(mesh->mesh_mutex));
+ pthread_mutex_unlock(&mesh->mutex);
return false;
}
logger(mesh, MESHLINK_ERROR, "Cannot rename %s/new to %s/current\n", mesh->confbase, mesh->confbase);
meshlink_errno = MESHLINK_ESTORAGE;
main_config_lock(mesh);
- pthread_mutex_unlock(&(mesh->mesh_mutex));
+ pthread_mutex_unlock(&mesh->mutex);
return false;
}
devtool_keyrotate_probe(3);
if(!main_config_lock(mesh)) {
- pthread_mutex_unlock(&(mesh->mesh_mutex));
+ pthread_mutex_unlock(&mesh->mutex);
return false;
}
// Cleanup the "old" confbase sub-directory
if(!config_destroy(mesh->confbase, "old")) {
- pthread_mutex_unlock(&(mesh->mesh_mutex));
+ pthread_mutex_unlock(&mesh->mutex);
return false;
}
free(mesh->config_key);
mesh->config_key = new_config_key;
- pthread_mutex_unlock(&(mesh->mesh_mutex));
+ pthread_mutex_unlock(&mesh->mutex);
return true;
}
}
/* Create a temporary struct on the stack, to avoid allocating and freeing one. */
- meshlink_open_params_t params = {NULL};
+ meshlink_open_params_t params;
+ memset(¶ms, 0, sizeof(params));
params.confbase = (char *)confbase;
params.name = (char *)name;
meshlink_handle_t *meshlink_open_ephemeral(const char *name, const char *appname, dev_class_t devclass) {
/* Create a temporary struct on the stack, to avoid allocating and freeing one. */
- meshlink_open_params_t params = {NULL};
+ meshlink_open_params_t params;
+ memset(¶ms, 0, sizeof(params));
params.name = (char *)name;
params.appname = (char *)appname;
mesh->log_cb = global_log_cb;
mesh->log_level = global_log_level;
+ randomize(&mesh->prng_state, sizeof(mesh->prng_state));
+
memcpy(mesh->dev_class_traits, default_class_traits, sizeof(default_class_traits));
if(usingname) {
pthread_mutexattr_t attr;
pthread_mutexattr_init(&attr);
pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
- pthread_mutex_init(&(mesh->mesh_mutex), &attr);
+ pthread_mutex_init(&mesh->mutex, &attr);
mesh->threadstarted = false;
event_loop_init(&mesh->loop);
}
//lock mesh->nodes
- pthread_mutex_lock(&(mesh->mesh_mutex));
+ pthread_mutex_lock(&mesh->mutex);
s = (meshlink_submesh_t *)create_submesh(mesh, submesh);
- pthread_mutex_unlock(&(mesh->mesh_mutex));
+ pthread_mutex_unlock(&mesh->mutex);
return s;
}
#endif
- pthread_mutex_lock(&(mesh->mesh_mutex));
+ pthread_mutex_lock(&mesh->mutex);
logger(mesh, MESHLINK_DEBUG, "Starting main_loop...\n");
pthread_cond_broadcast(&mesh->cond);
main_loop(mesh);
logger(mesh, MESHLINK_DEBUG, "main_loop returned.\n");
- pthread_mutex_unlock(&(mesh->mesh_mutex));
+ pthread_mutex_unlock(&mesh->mutex);
#if HAVE_CATTA
logger(mesh, MESHLINK_DEBUG, "meshlink_start called\n");
- pthread_mutex_lock(&(mesh->mesh_mutex));
+ pthread_mutex_lock(&mesh->mutex);
assert(mesh->self->ecdsa);
assert(!memcmp((uint8_t *)mesh->self->ecdsa + 64, (uint8_t *)mesh->private_key + 64, 32));
if(mesh->threadstarted) {
logger(mesh, MESHLINK_DEBUG, "thread was already running\n");
- pthread_mutex_unlock(&(mesh->mesh_mutex));
+ pthread_mutex_unlock(&mesh->mutex);
return true;
}
if(!mesh->name) {
logger(mesh, MESHLINK_DEBUG, "No name given!\n");
meshlink_errno = MESHLINK_EINVAL;
- pthread_mutex_unlock(&(mesh->mesh_mutex));
+ pthread_mutex_unlock(&mesh->mutex);
return false;
}
memset(&mesh->thread, 0, sizeof(mesh)->thread);
meshlink_errno = MESHLINK_EINTERNAL;
event_loop_stop(&mesh->loop);
- pthread_mutex_unlock(&(mesh->mesh_mutex));
+ pthread_mutex_unlock(&mesh->mutex);
return false;
}
- pthread_cond_wait(&mesh->cond, &mesh->mesh_mutex);
+ pthread_cond_wait(&mesh->cond, &mesh->mutex);
mesh->threadstarted = true;
- pthread_mutex_unlock(&(mesh->mesh_mutex));
+ pthread_mutex_unlock(&mesh->mutex);
return true;
}
return;
}
- pthread_mutex_lock(&(mesh->mesh_mutex));
+ pthread_mutex_lock(&mesh->mutex);
logger(mesh, MESHLINK_DEBUG, "meshlink_stop called\n");
// Shut down the main thread
if(mesh->threadstarted) {
// Wait for the main thread to finish
- pthread_mutex_unlock(&(mesh->mesh_mutex));
+ pthread_mutex_unlock(&mesh->mutex);
pthread_join(mesh->thread, NULL);
- pthread_mutex_lock(&(mesh->mesh_mutex));
+ pthread_mutex_lock(&mesh->mutex);
mesh->threadstarted = false;
}
}
}
- pthread_mutex_unlock(&(mesh->mesh_mutex));
+ pthread_mutex_unlock(&mesh->mutex);
}
void meshlink_close(meshlink_handle_t *mesh) {
meshlink_stop(mesh);
// lock is not released after this
- pthread_mutex_lock(&(mesh->mesh_mutex));
+ pthread_mutex_lock(&mesh->mutex);
// Close and free all resources used.
close(mesh->netns);
}
+ for(vpn_packet_t *packet; (packet = meshlink_queue_pop(&mesh->outpacketqueue));) {
+ free(packet);
+ }
+
+ meshlink_queue_exit(&mesh->outpacketqueue);
+
free(mesh->name);
free(mesh->appname);
free(mesh->confbase);
free(mesh->config_key);
ecdsa_free(mesh->private_key);
- pthread_mutex_destroy(&(mesh->mesh_mutex));
main_config_unlock(mesh);
+ pthread_mutex_unlock(&mesh->mutex);
+ pthread_mutex_destroy(&mesh->mutex);
+
memset(mesh, 0, sizeof(*mesh));
free(mesh);
return;
}
- pthread_mutex_lock(&(mesh->mesh_mutex));
+ pthread_mutex_lock(&mesh->mutex);
mesh->receive_cb = cb;
- pthread_mutex_unlock(&(mesh->mesh_mutex));
+ pthread_mutex_unlock(&mesh->mutex);
}
void meshlink_set_connection_try_cb(meshlink_handle_t *mesh, meshlink_connection_try_cb_t cb) {
return;
}
- pthread_mutex_lock(&(mesh->mesh_mutex));
+ pthread_mutex_lock(&mesh->mutex);
mesh->connection_try_cb = cb;
- pthread_mutex_unlock(&(mesh->mesh_mutex));
+ pthread_mutex_unlock(&mesh->mutex);
}
void meshlink_set_node_status_cb(meshlink_handle_t *mesh, meshlink_node_status_cb_t cb) {
return;
}
- pthread_mutex_lock(&(mesh->mesh_mutex));
+ pthread_mutex_lock(&mesh->mutex);
mesh->node_status_cb = cb;
- pthread_mutex_unlock(&(mesh->mesh_mutex));
+ pthread_mutex_unlock(&mesh->mutex);
+}
+
+void meshlink_set_node_pmtu_cb(meshlink_handle_t *mesh, meshlink_node_pmtu_cb_t cb) {
+ if(!mesh) {
+ meshlink_errno = MESHLINK_EINVAL;
+ return;
+ }
+
+ pthread_mutex_lock(&mesh->mutex);
+ mesh->node_pmtu_cb = cb;
+ pthread_mutex_unlock(&mesh->mutex);
}
void meshlink_set_node_duplicate_cb(meshlink_handle_t *mesh, meshlink_node_duplicate_cb_t cb) {
return;
}
- pthread_mutex_lock(&(mesh->mesh_mutex));
+ pthread_mutex_lock(&mesh->mutex);
mesh->node_duplicate_cb = cb;
- pthread_mutex_unlock(&(mesh->mesh_mutex));
+ pthread_mutex_unlock(&mesh->mutex);
}
void meshlink_set_log_cb(meshlink_handle_t *mesh, meshlink_log_level_t level, meshlink_log_cb_t cb) {
if(mesh) {
- pthread_mutex_lock(&(mesh->mesh_mutex));
+ pthread_mutex_lock(&mesh->mutex);
mesh->log_cb = cb;
mesh->log_level = cb ? level : 0;
- pthread_mutex_unlock(&(mesh->mesh_mutex));
+ pthread_mutex_unlock(&mesh->mutex);
} else {
global_log_cb = cb;
global_log_level = cb ? level : 0;
}
}
+void meshlink_set_error_cb(struct meshlink_handle *mesh, meshlink_error_cb_t cb) {
+ if(!mesh) {
+ meshlink_errno = MESHLINK_EINVAL;
+ return;
+ }
+
+ pthread_mutex_lock(&mesh->mutex);
+ mesh->error_cb = cb;
+ pthread_mutex_unlock(&mesh->mutex);
+}
+
bool meshlink_send(meshlink_handle_t *mesh, meshlink_node_t *destination, const void *data, size_t len) {
meshlink_packethdr_t *hdr;
return true;
}
-void meshlink_send_from_queue(event_loop_t *loop, meshlink_handle_t *mesh) {
+void meshlink_send_from_queue(event_loop_t *loop, void *data) {
(void)loop;
+ meshlink_handle_t *mesh = data;
vpn_packet_t *packet = meshlink_queue_pop(&mesh->outpacketqueue);
if(!packet) {
mesh->self->in_packets++;
mesh->self->in_bytes += packet->len;
route(mesh, mesh->self, packet);
+
+ free(packet);
}
ssize_t meshlink_get_pmtu(meshlink_handle_t *mesh, meshlink_node_t *destination) {
return -1;
}
- pthread_mutex_lock(&(mesh->mesh_mutex));
+ pthread_mutex_lock(&mesh->mutex);
node_t *n = (node_t *)destination;
if(!n->status.reachable) {
- pthread_mutex_unlock(&(mesh->mesh_mutex));
+ pthread_mutex_unlock(&mesh->mutex);
return 0;
} else if(n->mtuprobes > 30 && n->minmtu) {
- pthread_mutex_unlock(&(mesh->mesh_mutex));
+ pthread_mutex_unlock(&mesh->mutex);
return n->minmtu;
} else {
- pthread_mutex_unlock(&(mesh->mesh_mutex));
+ pthread_mutex_unlock(&mesh->mutex);
return MTU;
}
}
return NULL;
}
- pthread_mutex_lock(&(mesh->mesh_mutex));
+ pthread_mutex_lock(&mesh->mutex);
node_t *n = (node_t *)node;
if(!node_read_public_key(mesh, n) || !n->ecdsa) {
meshlink_errno = MESHLINK_EINTERNAL;
- pthread_mutex_unlock(&(mesh->mesh_mutex));
+ pthread_mutex_unlock(&mesh->mutex);
return false;
}
meshlink_errno = MESHLINK_EINTERNAL;
}
- pthread_mutex_unlock(&(mesh->mesh_mutex));
+ pthread_mutex_unlock(&mesh->mutex);
return fingerprint;
}
meshlink_node_t *node = NULL;
- pthread_mutex_lock(&(mesh->mesh_mutex));
+ pthread_mutex_lock(&mesh->mutex);
node = (meshlink_node_t *)lookup_node(mesh, (char *)name); // TODO: make lookup_node() use const
- pthread_mutex_unlock(&(mesh->mesh_mutex));
+ pthread_mutex_unlock(&mesh->mutex);
+
+ if(!node) {
+ meshlink_errno = MESHLINK_ENOENT;
+ }
+
return node;
}
meshlink_submesh_t *submesh = NULL;
- pthread_mutex_lock(&(mesh->mesh_mutex));
+ pthread_mutex_lock(&mesh->mutex);
submesh = (meshlink_submesh_t *)lookup_submesh(mesh, name);
- pthread_mutex_unlock(&(mesh->mesh_mutex));
+ pthread_mutex_unlock(&mesh->mutex);
+
+ if(!submesh) {
+ meshlink_errno = MESHLINK_ENOENT;
+ }
+
return submesh;
}
meshlink_node_t **result;
//lock mesh->nodes
- pthread_mutex_lock(&(mesh->mesh_mutex));
+ pthread_mutex_lock(&mesh->mutex);
*nmemb = mesh->nodes->count;
result = realloc(nodes, *nmemb * sizeof(*nodes));
meshlink_errno = MESHLINK_ENOMEM;
}
- pthread_mutex_unlock(&(mesh->mesh_mutex));
+ pthread_mutex_unlock(&mesh->mutex);
return result;
}
static meshlink_node_t **meshlink_get_all_nodes_by_condition(meshlink_handle_t *mesh, const void *condition, meshlink_node_t **nodes, size_t *nmemb, search_node_by_condition_t search_node) {
meshlink_node_t **result;
- pthread_mutex_lock(&(mesh->mesh_mutex));
+ pthread_mutex_lock(&mesh->mutex);
*nmemb = 0;
if(*nmemb == 0) {
free(nodes);
- pthread_mutex_unlock(&(mesh->mesh_mutex));
+ pthread_mutex_unlock(&mesh->mutex);
return NULL;
}
meshlink_errno = MESHLINK_ENOMEM;
}
- pthread_mutex_unlock(&(mesh->mesh_mutex));
+ pthread_mutex_unlock(&mesh->mutex);
return result;
}
dev_class_t devclass;
- pthread_mutex_lock(&(mesh->mesh_mutex));
+ pthread_mutex_lock(&mesh->mutex);
devclass = ((node_t *)node)->devclass;
- pthread_mutex_unlock(&(mesh->mesh_mutex));
+ pthread_mutex_unlock(&mesh->mutex);
return devclass;
}
return false;
}
- pthread_mutex_lock(&(mesh->mesh_mutex));
+ pthread_mutex_lock(&mesh->mutex);
if(!ecdsa_sign(mesh->private_key, data, len, signature)) {
meshlink_errno = MESHLINK_EINTERNAL;
- pthread_mutex_unlock(&(mesh->mesh_mutex));
+ pthread_mutex_unlock(&mesh->mutex);
return false;
}
*siglen = MESHLINK_SIGLEN;
- pthread_mutex_unlock(&(mesh->mesh_mutex));
+ pthread_mutex_unlock(&mesh->mutex);
return true;
}
return false;
}
- pthread_mutex_lock(&(mesh->mesh_mutex));
+ pthread_mutex_lock(&mesh->mutex);
bool rval = false;
rval = ecdsa_verify(((struct node_t *)source)->ecdsa, data, len, signature);
}
- pthread_mutex_unlock(&(mesh->mesh_mutex));
+ pthread_mutex_unlock(&mesh->mutex);
return rval;
}
static bool refresh_invitation_key(meshlink_handle_t *mesh) {
- pthread_mutex_lock(&(mesh->mesh_mutex));
+ pthread_mutex_lock(&mesh->mutex);
size_t count = invitation_purge_old(mesh, time(NULL) - mesh->invitation_timeout);
// TODO: Update invitation key if necessary?
}
- pthread_mutex_unlock(&(mesh->mesh_mutex));
+ pthread_mutex_unlock(&mesh->mutex);
return mesh->invitation_key;
}
canonical_address = xstrdup(address);
}
- pthread_mutex_lock(&(mesh->mesh_mutex));
+ pthread_mutex_lock(&mesh->mutex);
node_t *n = (node_t *)node;
free(n->canonical_address);
n->canonical_address = canonical_address;
node_write_config(mesh, n);
- pthread_mutex_unlock(&(mesh->mesh_mutex));
+ pthread_mutex_unlock(&mesh->mutex);
return true;
}
return -1;
}
- return atoi(mesh->myport);
+ int port;
+
+ pthread_mutex_lock(&mesh->mutex);
+ port = atoi(mesh->myport);
+ pthread_mutex_unlock(&mesh->mutex);
+
+ return port;
}
bool meshlink_set_port(meshlink_handle_t *mesh, int port) {
bool rval = false;
- pthread_mutex_lock(&(mesh->mesh_mutex));
+ pthread_mutex_lock(&mesh->mutex);
if(mesh->threadstarted) {
meshlink_errno = MESHLINK_EINVAL;
free(mesh->myport);
xasprintf(&mesh->myport, "%d", port);
- /* Write meshlink.conf with the updated port number */
- write_main_config_files(mesh);
-
/* Close down the network. This also deletes mesh->self. */
close_network_connections(mesh);
meshlink_errno = MESHLINK_ESTORAGE;
free_node(mesh->self);
mesh->self = NULL;
+ goto done;
} else if(!setup_network(mesh)) {
meshlink_errno = MESHLINK_ENETWORK;
- } else {
- rval = true;
+ goto done;
}
+ /* Rebuild our own list of recent addresses */
+ memset(mesh->self->recent, 0, sizeof(mesh->self->recent));
+ add_local_addresses(mesh);
+
+ /* Write meshlink.conf with the updated port number */
+ write_main_config_files(mesh);
+
+ rval = config_sync(mesh, "current");
+
done:
- pthread_mutex_unlock(&(mesh->mesh_mutex));
+ pthread_mutex_unlock(&mesh->mutex);
return rval && meshlink_get_port(mesh) == port;
}
s = (meshlink_submesh_t *)mesh->self->submesh;
}
- pthread_mutex_lock(&(mesh->mesh_mutex));
+ pthread_mutex_lock(&mesh->mutex);
// Check validity of the new node's name
if(!check_id(name)) {
logger(mesh, MESHLINK_DEBUG, "Invalid name for node.\n");
meshlink_errno = MESHLINK_EINVAL;
- pthread_mutex_unlock(&(mesh->mesh_mutex));
+ pthread_mutex_unlock(&mesh->mutex);
return NULL;
}
if(config_exists(mesh, "current", name)) {
logger(mesh, MESHLINK_DEBUG, "A host config file for %s already exists!\n", name);
meshlink_errno = MESHLINK_EEXIST;
- pthread_mutex_unlock(&(mesh->mesh_mutex));
+ pthread_mutex_unlock(&mesh->mutex);
return NULL;
}
if(meshlink_get_node(mesh, name)) {
logger(mesh, MESHLINK_DEBUG, "A node with name %s is already known!\n", name);
meshlink_errno = MESHLINK_EEXIST;
- pthread_mutex_unlock(&(mesh->mesh_mutex));
+ pthread_mutex_unlock(&mesh->mutex);
return NULL;
}
if(!address) {
logger(mesh, MESHLINK_DEBUG, "No Address known for ourselves!\n");
meshlink_errno = MESHLINK_ERESOLV;
- pthread_mutex_unlock(&(mesh->mesh_mutex));
+ pthread_mutex_unlock(&mesh->mutex);
return NULL;
}
if(!refresh_invitation_key(mesh)) {
meshlink_errno = MESHLINK_EINTERNAL;
- pthread_mutex_unlock(&(mesh->mesh_mutex));
+ pthread_mutex_unlock(&mesh->mutex);
return NULL;
}
* Note: make sure we only add config files of nodes that are in the core mesh or the same submesh,
* and are not blacklisted.
*/
- config_t configs[5] = {NULL};
+ config_t configs[5];
+ memset(configs, 0, sizeof(configs));
int count = 0;
if(config_read(mesh, "current", mesh->self->name, &configs[count], mesh->config_key)) {
if(!invitation_write(mesh, "current", cookiehash, &config, mesh->config_key)) {
logger(mesh, MESHLINK_DEBUG, "Could not create invitation file %s: %s\n", cookiehash, strerror(errno));
meshlink_errno = MESHLINK_ESTORAGE;
- pthread_mutex_unlock(&(mesh->mesh_mutex));
+ pthread_mutex_unlock(&mesh->mutex);
return NULL;
}
xasprintf(&url, "%s/%s%s", address, hash, cookie);
free(address);
- pthread_mutex_unlock(&(mesh->mesh_mutex));
+ pthread_mutex_unlock(&mesh->mutex);
return url;
}
return false;
}
- pthread_mutex_lock(&(mesh->mesh_mutex));
+ pthread_mutex_lock(&mesh->mutex);
//Before doing meshlink_join make sure we are not connected to another mesh
if(mesh->threadstarted) {
logger(mesh, MESHLINK_ERROR, "Cannot join while started\n");
meshlink_errno = MESHLINK_EINVAL;
- pthread_mutex_unlock(&(mesh->mesh_mutex));
+ pthread_mutex_unlock(&mesh->mutex);
return false;
}
if(mesh->nodes->count > 1) {
logger(mesh, MESHLINK_ERROR, "Already part of an existing mesh\n");
meshlink_errno = MESHLINK_EINVAL;
- pthread_mutex_unlock(&(mesh->mesh_mutex));
+ pthread_mutex_unlock(&mesh->mutex);
return false;
}
if(!key) {
meshlink_errno = MESHLINK_EINTERNAL;
- pthread_mutex_unlock(&(mesh->mesh_mutex));
+ pthread_mutex_unlock(&mesh->mutex);
return false;
}
}
if(mesh->sock == -1) {
- pthread_mutex_unlock(&mesh->mesh_mutex);
+ pthread_mutex_unlock(&mesh->mutex);
return false;
}
logger(mesh, MESHLINK_DEBUG, "Error sending request to %s port %s: %s\n", address, port, strerror(errno));
closesocket(mesh->sock);
meshlink_errno = MESHLINK_ENETWORK;
- pthread_mutex_unlock(&(mesh->mesh_mutex));
+ pthread_mutex_unlock(&mesh->mutex);
return false;
}
logger(mesh, MESHLINK_DEBUG, "Cannot read greeting from peer\n");
closesocket(mesh->sock);
meshlink_errno = MESHLINK_ENETWORK;
- pthread_mutex_unlock(&(mesh->mesh_mutex));
+ pthread_mutex_unlock(&mesh->mutex);
return false;
}
if(sha512(fingerprint, strlen(fingerprint), hishash)) {
logger(mesh, MESHLINK_DEBUG, "Could not create hash\n%s\n", mesh->line + 2);
meshlink_errno = MESHLINK_EINTERNAL;
- pthread_mutex_unlock(&(mesh->mesh_mutex));
+ pthread_mutex_unlock(&mesh->mutex);
return false;
}
if(memcmp(hishash, mesh->hash, 18)) {
logger(mesh, MESHLINK_DEBUG, "Peer has an invalid key!\n%s\n", mesh->line + 2);
meshlink_errno = MESHLINK_EPEER;
- pthread_mutex_unlock(&(mesh->mesh_mutex));
+ pthread_mutex_unlock(&mesh->mutex);
return false;
}
if(!hiskey) {
meshlink_errno = MESHLINK_EINTERNAL;
- pthread_mutex_unlock(&(mesh->mesh_mutex));
+ pthread_mutex_unlock(&mesh->mutex);
return false;
}
// Start an SPTPS session
if(!sptps_start(&mesh->sptps, mesh, true, false, key, hiskey, meshlink_invitation_label, sizeof(meshlink_invitation_label), invitation_send, invitation_receive)) {
meshlink_errno = MESHLINK_EINTERNAL;
- pthread_mutex_unlock(&(mesh->mesh_mutex));
+ pthread_mutex_unlock(&mesh->mutex);
return false;
}
// Feed rest of input buffer to SPTPS
if(!sptps_receive_data(&mesh->sptps, mesh->buffer, mesh->blen)) {
meshlink_errno = MESHLINK_EPEER;
- pthread_mutex_unlock(&(mesh->mesh_mutex));
+ pthread_mutex_unlock(&mesh->mutex);
return false;
}
logger(mesh, MESHLINK_DEBUG, "Error reading data from %s port %s: %s\n", address, port, strerror(errno));
meshlink_errno = MESHLINK_ENETWORK;
- pthread_mutex_unlock(&(mesh->mesh_mutex));
+ pthread_mutex_unlock(&mesh->mutex);
return false;
}
if(!sptps_receive_data(&mesh->sptps, mesh->line, len)) {
meshlink_errno = MESHLINK_EPEER;
- pthread_mutex_unlock(&(mesh->mesh_mutex));
+ pthread_mutex_unlock(&mesh->mutex);
return false;
}
}
if(!mesh->success) {
logger(mesh, MESHLINK_DEBUG, "Connection closed by peer, invitation cancelled.\n");
meshlink_errno = MESHLINK_EPEER;
- pthread_mutex_unlock(&(mesh->mesh_mutex));
+ pthread_mutex_unlock(&mesh->mutex);
return false;
}
- pthread_mutex_unlock(&(mesh->mesh_mutex));
+ pthread_mutex_unlock(&mesh->mutex);
return true;
invalid:
logger(mesh, MESHLINK_DEBUG, "Invalid invitation URL\n");
meshlink_errno = MESHLINK_EINVAL;
- pthread_mutex_unlock(&(mesh->mesh_mutex));
+ pthread_mutex_unlock(&mesh->mutex);
return false;
}
packmsg_add_str(&out, mesh->name);
packmsg_add_str(&out, CORE_MESH);
- pthread_mutex_lock(&(mesh->mesh_mutex));
+ pthread_mutex_lock(&mesh->mutex);
packmsg_add_int32(&out, mesh->self->devclass);
packmsg_add_bool(&out, mesh->self->status.blacklisted);
packmsg_add_sockaddr(&out, &mesh->self->recent[i]);
}
- pthread_mutex_unlock(&(mesh->mesh_mutex));
+ pthread_mutex_unlock(&mesh->mutex);
if(!packmsg_output_ok(&out)) {
logger(mesh, MESHLINK_DEBUG, "Error creating export data\n");
return false;
}
- pthread_mutex_lock(&(mesh->mesh_mutex));
+ pthread_mutex_lock(&mesh->mutex);
while(count--) {
const void *data;
node_add(mesh, n);
}
- pthread_mutex_unlock(&(mesh->mesh_mutex));
+ pthread_mutex_unlock(&mesh->mutex);
+
+ free(buf);
if(!packmsg_done(&in)) {
logger(mesh, MESHLINK_ERROR, "Invalid data\n");
return;
}
- pthread_mutex_lock(&(mesh->mesh_mutex));
+ pthread_mutex_lock(&mesh->mutex);
node_t *n;
n = (node_t *)node;
if(n == mesh->self) {
logger(mesh, MESHLINK_ERROR, "%s blacklisting itself?\n", node->name);
meshlink_errno = MESHLINK_EINVAL;
- pthread_mutex_unlock(&(mesh->mesh_mutex));
+ pthread_mutex_unlock(&mesh->mutex);
return;
}
if(n->status.blacklisted) {
logger(mesh, MESHLINK_DEBUG, "Node %s already blacklisted\n", node->name);
- pthread_mutex_unlock(&(mesh->mesh_mutex));
+ pthread_mutex_unlock(&mesh->mutex);
return;
}
update_node_status(mesh, n);
}
- pthread_mutex_unlock(&(mesh->mesh_mutex));
+ pthread_mutex_unlock(&mesh->mutex);
}
void meshlink_whitelist(meshlink_handle_t *mesh, meshlink_node_t *node) {
return;
}
- pthread_mutex_lock(&(mesh->mesh_mutex));
+ pthread_mutex_lock(&mesh->mutex);
node_t *n = (node_t *)node;
if(!n->status.blacklisted) {
logger(mesh, MESHLINK_DEBUG, "Node %s was already whitelisted\n", node->name);
meshlink_errno = MESHLINK_EINVAL;
- pthread_mutex_unlock(&(mesh->mesh_mutex));
+ pthread_mutex_unlock(&mesh->mutex);
return;
}
node_write_config(mesh, n);
config_sync(mesh, "current");
- pthread_mutex_unlock(&(mesh->mesh_mutex));
+ if(n->status.reachable) {
+ update_node_status(mesh, n);
+ }
+
+ pthread_mutex_unlock(&mesh->mutex);
return;
}
return;
}
- pthread_mutex_lock(&(mesh->mesh_mutex));
+ pthread_mutex_lock(&mesh->mutex);
node_t *n = (node_t *)node;
memmove(n->recent + 1, n->recent, 4 * sizeof(*n->recent));
memcpy(n->recent, addr, SALEN(*addr));
node_write_config(mesh, n);
- pthread_mutex_unlock(&(mesh->mesh_mutex));
+ pthread_mutex_unlock(&mesh->mutex);
// @TODO do we want to fire off a connection attempt right away?
}
}
void meshlink_set_channel_poll_cb(meshlink_handle_t *mesh, meshlink_channel_t *channel, meshlink_channel_poll_cb_t cb) {
- (void)mesh;
+ if(!mesh || !channel) {
+ meshlink_errno = MESHLINK_EINVAL;
+ return;
+ }
+
+ pthread_mutex_lock(&mesh->mutex);
channel->poll_cb = cb;
utcp_set_poll_cb(channel->c, (cb || channel->aio_send) ? channel_poll : NULL);
+ pthread_mutex_unlock(&mesh->mutex);
}
void meshlink_set_channel_accept_cb(meshlink_handle_t *mesh, meshlink_channel_accept_cb_t cb) {
return;
}
- pthread_mutex_lock(&mesh->mesh_mutex);
+ pthread_mutex_lock(&mesh->mutex);
mesh->channel_accept_cb = cb;
mesh->receive_cb = channel_receive;
}
}
- pthread_mutex_unlock(&mesh->mesh_mutex);
+ pthread_mutex_unlock(&mesh->mutex);
}
void meshlink_set_channel_sndbuf(meshlink_handle_t *mesh, meshlink_channel_t *channel, size_t size) {
return;
}
- pthread_mutex_lock(&mesh->mesh_mutex);
+ pthread_mutex_lock(&mesh->mutex);
utcp_set_sndbuf(channel->c, size);
- pthread_mutex_unlock(&mesh->mesh_mutex);
+ pthread_mutex_unlock(&mesh->mutex);
}
void meshlink_set_channel_rcvbuf(meshlink_handle_t *mesh, meshlink_channel_t *channel, size_t size) {
return;
}
- pthread_mutex_lock(&mesh->mesh_mutex);
+ pthread_mutex_lock(&mesh->mutex);
utcp_set_rcvbuf(channel->c, size);
- pthread_mutex_unlock(&mesh->mesh_mutex);
+ pthread_mutex_unlock(&mesh->mutex);
}
meshlink_channel_t *meshlink_channel_open_ex(meshlink_handle_t *mesh, meshlink_node_t *node, uint16_t port, meshlink_channel_receive_cb_t cb, const void *data, size_t len, uint32_t flags) {
return NULL;
}
+ pthread_mutex_lock(&mesh->mutex);
+
node_t *n = (node_t *)node;
if(!n->utcp) {
if(!n->utcp) {
meshlink_errno = errno == ENOMEM ? MESHLINK_ENOMEM : MESHLINK_EINTERNAL;
+ pthread_mutex_unlock(&mesh->mutex);
return NULL;
}
}
if(n->status.blacklisted) {
logger(mesh, MESHLINK_ERROR, "Cannot open a channel with blacklisted node\n");
+ pthread_mutex_unlock(&mesh->mutex);
return NULL;
}
channel->receive_cb = cb;
channel->c = utcp_connect_ex(n->utcp, port, channel_recv, channel, flags);
+ pthread_mutex_unlock(&mesh->mutex);
+
if(!channel->c) {
meshlink_errno = errno == ENOMEM ? MESHLINK_ENOMEM : MESHLINK_EINTERNAL;
free(channel);
return;
}
+ pthread_mutex_lock(&mesh->mutex);
utcp_shutdown(channel->c, direction);
+ pthread_mutex_unlock(&mesh->mutex);
}
void meshlink_channel_close(meshlink_handle_t *mesh, meshlink_channel_t *channel) {
return;
}
+ pthread_mutex_lock(&mesh->mutex);
+
utcp_close(channel->c);
/* Clean up any outstanding AIO buffers. */
free(aio);
}
+ pthread_mutex_unlock(&mesh->mutex);
+
free(channel);
}
ssize_t retval;
- pthread_mutex_lock(&mesh->mesh_mutex);
+ pthread_mutex_lock(&mesh->mutex);
/* Disallow direct calls to utcp_send() while we still have AIO active. */
if(channel->aio_send) {
retval = utcp_send(channel->c, data, len);
}
- pthread_mutex_unlock(&mesh->mesh_mutex);
+ pthread_mutex_unlock(&mesh->mutex);
if(retval < 0) {
meshlink_errno = MESHLINK_ENETWORK;
aio->cb.buffer = cb;
aio->priv = priv;
- pthread_mutex_lock(&mesh->mesh_mutex);
+ pthread_mutex_lock(&mesh->mutex);
/* Append the AIO buffer descriptor to the end of the chain */
meshlink_aio_buffer_t **p = &channel->aio_send;
utcp_set_poll_cb(channel->c, channel_poll);
channel_poll(channel->c, len);
- pthread_mutex_unlock(&mesh->mesh_mutex);
+ pthread_mutex_unlock(&mesh->mutex);
return true;
}
aio->cb.fd = cb;
aio->priv = priv;
- pthread_mutex_lock(&mesh->mesh_mutex);
+ pthread_mutex_lock(&mesh->mutex);
/* Append the AIO buffer descriptor to the end of the chain */
meshlink_aio_buffer_t **p = &channel->aio_send;
utcp_set_poll_cb(channel->c, channel_poll);
channel_poll(channel->c, len);
- pthread_mutex_unlock(&mesh->mesh_mutex);
+ pthread_mutex_unlock(&mesh->mutex);
return true;
}
aio->cb.buffer = cb;
aio->priv = priv;
- pthread_mutex_lock(&mesh->mesh_mutex);
+ pthread_mutex_lock(&mesh->mutex);
/* Append the AIO buffer descriptor to the end of the chain */
meshlink_aio_buffer_t **p = &channel->aio_receive;
*p = aio;
- pthread_mutex_unlock(&mesh->mesh_mutex);
+ pthread_mutex_unlock(&mesh->mutex);
return true;
}
aio->cb.fd = cb;
aio->priv = priv;
- pthread_mutex_lock(&mesh->mesh_mutex);
+ pthread_mutex_lock(&mesh->mutex);
/* Append the AIO buffer descriptor to the end of the chain */
meshlink_aio_buffer_t **p = &channel->aio_receive;
*p = aio;
- pthread_mutex_unlock(&mesh->mesh_mutex);
+ pthread_mutex_unlock(&mesh->mutex);
return true;
}
return utcp_get_recvq(channel->c);
}
+void meshlink_set_node_channel_timeout(meshlink_handle_t *mesh, meshlink_node_t *node, int timeout) {
+ if(!mesh || !node) {
+ meshlink_errno = MESHLINK_EINVAL;
+ return;
+ }
+
+ node_t *n = (node_t *)node;
+
+ pthread_mutex_lock(&mesh->mutex);
+
+ if(!n->utcp) {
+ n->utcp = utcp_init(channel_accept, channel_pre_accept, channel_send, n);
+ }
+
+ utcp_set_user_timeout(n->utcp, timeout);
+
+ pthread_mutex_unlock(&mesh->mutex);
+}
+
void update_node_status(meshlink_handle_t *mesh, node_t *n) {
if(n->status.reachable && mesh->channel_accept_cb && !n->utcp) {
n->utcp = utcp_init(channel_accept, channel_pre_accept, channel_send, n);
if(mesh->node_status_cb) {
mesh->node_status_cb(mesh, (meshlink_node_t *)n, n->status.reachable && !n->status.blacklisted);
}
+
+ if(mesh->node_pmtu_cb) {
+ mesh->node_pmtu_cb(mesh, (meshlink_node_t *)n, n->minmtu);
+ }
+}
+
+void update_node_pmtu(meshlink_handle_t *mesh, node_t *n) {
+ if(mesh->node_pmtu_cb && !n->status.blacklisted) {
+ mesh->node_pmtu_cb(mesh, (meshlink_node_t *)n, n->minmtu);
+ }
}
void handle_duplicate_node(meshlink_handle_t *mesh, node_t *n) {
return;
}
- pthread_mutex_lock(&mesh->mesh_mutex);
+ pthread_mutex_lock(&mesh->mutex);
if(mesh->discovery == enable) {
goto end;
mesh->discovery = enable;
end:
- pthread_mutex_unlock(&mesh->mesh_mutex);
+ pthread_mutex_unlock(&mesh->mutex);
#else
(void)mesh;
(void)enable;
return;
}
- pthread_mutex_lock(&mesh->mesh_mutex);
+ pthread_mutex_lock(&mesh->mutex);
mesh->dev_class_traits[devclass].pinginterval = pinginterval;
mesh->dev_class_traits[devclass].pingtimeout = pingtimeout;
- pthread_mutex_unlock(&mesh->mesh_mutex);
+ pthread_mutex_unlock(&mesh->mutex);
}
void handle_network_change(meshlink_handle_t *mesh, bool online) {
(void)online;
- if(!mesh->connections) {
+ if(!mesh->connections || !mesh->loop.running) {
return;
}
retry(mesh);
}
+void call_error_cb(meshlink_handle_t *mesh, meshlink_errno_t meshlink_errno) {
+ // We should only call the callback function if we are in the background thread.
+ if(!mesh->error_cb) {
+ return;
+ }
+
+ if(!mesh->threadstarted) {
+ return;
+ }
+
+ if(mesh->thread == pthread_self()) {
+ mesh->error_cb(mesh, meshlink_errno);
+ }
+}
+
+
static void __attribute__((constructor)) meshlink_init(void) {
crypto_init();
- unsigned int seed;
- randomize(&seed, sizeof(seed));
- srand(seed);
}
static void __attribute__((destructor)) meshlink_exit(void) {
projects / meshlink / blobdiff