pthread_t thr;
if(pthread_create(&thr, NULL, socket_in_netns_thread, ¶ms) == 0) {
- pthread_join(thr, NULL);
+ assert(pthread_join(thr, NULL) == 0);
}
return params.fd;
// Find out what local address a socket would use if we connect to the given address.
// We do this using connect() on a UDP socket, so the kernel has to resolve the address
// of both endpoints, but this will actually not send any UDP packet.
-static bool getlocaladdr(char *destaddr, sockaddr_t *sa, socklen_t *salen, int netns) {
+static bool getlocaladdr(const char *destaddr, sockaddr_t *sa, socklen_t *salen, int netns) {
struct addrinfo *rai = NULL;
const struct addrinfo hint = {
.ai_family = AF_UNSPEC,
return true;
}
-static bool getlocaladdrname(char *destaddr, char *host, socklen_t hostlen, int netns) {
+static bool getlocaladdrname(const char *destaddr, char *host, socklen_t hostlen, int netns) {
sockaddr_t sa;
socklen_t salen = sizeof(sa);
}
logger(mesh, MESHLINK_DEBUG, "Trying to discover externally visible hostname...\n");
- struct addrinfo *ai = adns_blocking_request(mesh, xstrdup(host), xstrdup(port ? port : "80"), 5);
+ struct addrinfo *ai = adns_blocking_request(mesh, xstrdup(host), xstrdup(port ? port : "80"), SOCK_STREAM, 5);
char line[256];
char *hostname = NULL;
int s = socket_in_netns(aip->ai_family, aip->ai_socktype, aip->ai_protocol, mesh->netns);
+#ifdef SO_NOSIGPIPE
+ int nosigpipe = 1;
+ setsockopt(s, SOL_SOCKET, SO_NOSIGPIPE, &nosigpipe, sizeof(nosigpipe));
+#endif
+
if(s >= 0) {
set_timeout(s, 5000);
return xstrdup(localaddr);
}
-void remove_duplicate_hostnames(char *host[], char *port[], int n) {
+static void remove_duplicate_hostnames(char *host[], char *port[], int n) {
for(int i = 0; i < n; i++) {
if(!host[i]) {
continue;
}
// Convert what we have to a sockaddr
- struct addrinfo *ai_in = adns_blocking_request(mesh, xstrdup(hostname[i]), xstrdup(port[i]), 5);
+ struct addrinfo *ai_in = adns_blocking_request(mesh, xstrdup(hostname[i]), xstrdup(port[i]), SOCK_STREAM, 5);
if(!ai_in) {
continue;
// Write host config files
for(uint32_t i = 0; i < count; i++) {
const void *data;
- uint32_t len = packmsg_get_bin_raw(&in, &data);
+ uint32_t data_len = packmsg_get_bin_raw(&in, &data);
- if(!len) {
+ if(!data_len) {
logger(mesh, MESHLINK_ERROR, "Incomplete invitation file!\n");
return false;
}
- packmsg_input_t in2 = {data, len};
- uint32_t version = packmsg_get_uint32(&in2);
- char *name = packmsg_get_str_dup(&in2);
+ packmsg_input_t in2 = {data, data_len};
+ uint32_t version2 = packmsg_get_uint32(&in2);
+ char *name2 = packmsg_get_str_dup(&in2);
- if(!packmsg_input_ok(&in2) || version != MESHLINK_CONFIG_VERSION || !check_id(name)) {
- free(name);
+ if(!packmsg_input_ok(&in2) || version2 != MESHLINK_CONFIG_VERSION || !check_id(name2)) {
+ free(name2);
packmsg_input_invalidate(&in);
break;
}
- if(!check_id(name)) {
- free(name);
+ if(!check_id(name2)) {
+ free(name2);
break;
}
- if(!strcmp(name, mesh->name)) {
+ if(!strcmp(name2, mesh->name)) {
logger(mesh, MESHLINK_DEBUG, "Secondary chunk would overwrite our own host config file.\n");
- free(name);
+ free(name2);
meshlink_errno = MESHLINK_EPEER;
return false;
}
node_t *n = new_node();
- n->name = name;
+ n->name = name2;
- config_t config = {data, len};
+ config_t config = {data, data_len};
if(!node_read_from_config(mesh, n, &config)) {
free_node(n);
return true;
}
-static bool sendline(int fd, char *format, ...) {
+static bool sendline(int fd, const char *format, ...) {
char buffer[4096];
char *p = buffer;
int blen = 0;
return false;
}
- pthread_mutex_lock(&mesh->mutex);
+ assert(pthread_mutex_lock(&mesh->mutex) == 0);
// 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->mutex);
+ assert(pthread_mutex_unlock(&mesh->mutex) == 0);
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->mutex);
+ assert(pthread_mutex_unlock(&mesh->mutex) == 0);
return false;
}
if(!config_rename(mesh, "current", "old")) {
logger(mesh, MESHLINK_ERROR, "Cannot rename %s/current to %s/old\n", mesh->confbase, mesh->confbase);
meshlink_errno = MESHLINK_ESTORAGE;
- pthread_mutex_unlock(&mesh->mutex);
+ assert(pthread_mutex_unlock(&mesh->mutex) == 0);
return false;
}
if(!config_rename(mesh, "new", "current")) {
logger(mesh, MESHLINK_ERROR, "Cannot rename %s/new to %s/current\n", mesh->confbase, mesh->confbase);
meshlink_errno = MESHLINK_ESTORAGE;
- pthread_mutex_unlock(&mesh->mutex);
+ assert(pthread_mutex_unlock(&mesh->mutex) == 0);
return false;
}
// Cleanup the "old" confbase sub-directory
if(!config_destroy(mesh->confbase, "old")) {
- pthread_mutex_unlock(&mesh->mutex);
+ assert(pthread_mutex_unlock(&mesh->mutex) == 0);
return false;
}
free(mesh->config_key);
mesh->config_key = new_config_key;
- pthread_mutex_unlock(&mesh->mutex);
+ assert(pthread_mutex_unlock(&mesh->mutex) == 0);
return true;
}
/// Device class traits
static const dev_class_traits_t default_class_traits[DEV_CLASS_COUNT] = {
- { .pingtimeout = 5, .pinginterval = 60, .min_connects = 3, .max_connects = 10000, .edge_weight = 1 }, // DEV_CLASS_BACKBONE
- { .pingtimeout = 5, .pinginterval = 60, .min_connects = 3, .max_connects = 100, .edge_weight = 3 }, // DEV_CLASS_STATIONARY
- { .pingtimeout = 5, .pinginterval = 60, .min_connects = 3, .max_connects = 3, .edge_weight = 6 }, // DEV_CLASS_PORTABLE
- { .pingtimeout = 5, .pinginterval = 60, .min_connects = 1, .max_connects = 1, .edge_weight = 9 }, // DEV_CLASS_UNKNOWN
+ { .pingtimeout = 5, .pinginterval = 60, .maxtimeout = 900, .min_connects = 3, .max_connects = 10000, .edge_weight = 1 }, // DEV_CLASS_BACKBONE
+ { .pingtimeout = 5, .pinginterval = 60, .maxtimeout = 900, .min_connects = 3, .max_connects = 100, .edge_weight = 3 }, // DEV_CLASS_STATIONARY
+ { .pingtimeout = 5, .pinginterval = 60, .maxtimeout = 900, .min_connects = 3, .max_connects = 3, .edge_weight = 6 }, // DEV_CLASS_PORTABLE
+ { .pingtimeout = 5, .pinginterval = 60, .maxtimeout = 900, .min_connects = 1, .max_connects = 1, .edge_weight = 9 }, // DEV_CLASS_UNKNOWN
};
meshlink_handle_t *meshlink_open(const char *confbase, const char *name, const char *appname, dev_class_t devclass) {
}
}
- // initialize mutex
+ // initialize mutexes and conds
pthread_mutexattr_t attr;
- pthread_mutexattr_init(&attr);
- pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
- pthread_mutex_init(&mesh->mutex, &attr);
+ assert(pthread_mutexattr_init(&attr) == 0);
+ assert(pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE) == 0);
+ assert(pthread_mutex_init(&mesh->mutex, &attr) == 0);
+ assert(pthread_cond_init(&mesh->cond, NULL) == 0);
+
+ assert(pthread_mutex_init(&mesh->discovery_mutex, NULL) == 0);
+ assert(pthread_cond_init(&mesh->discovery_cond, NULL) == 0);
+
+ assert(pthread_cond_init(&mesh->adns_cond, NULL) == 0);
mesh->threadstarted = false;
event_loop_init(&mesh->loop);
}
//lock mesh->nodes
- pthread_mutex_lock(&mesh->mutex);
+ assert(pthread_mutex_lock(&mesh->mutex) == 0);
s = (meshlink_submesh_t *)create_submesh(mesh, submesh);
- pthread_mutex_unlock(&mesh->mutex);
+ assert(pthread_mutex_unlock(&mesh->mutex) == 0);
return s;
}
#ifdef HAVE_SETNS
if(setns(mesh->netns, CLONE_NEWNET) != 0) {
- pthread_cond_signal(&mesh->cond);
+ assert(pthread_cond_signal(&mesh->cond) == 0);
return NULL;
}
#else
- pthread_cond_signal(&mesh->cond);
+ assert(pthread_cond_signal(&mesh->cond) == 0);
return NULL;
#endif // HAVE_SETNS
}
#endif
- pthread_mutex_lock(&mesh->mutex);
+ assert(pthread_mutex_lock(&mesh->mutex) == 0);
logger(mesh, MESHLINK_DEBUG, "Starting main_loop...\n");
- pthread_cond_broadcast(&mesh->cond);
+ assert(pthread_cond_broadcast(&mesh->cond) == 0);
main_loop(mesh);
logger(mesh, MESHLINK_DEBUG, "main_loop returned.\n");
- pthread_mutex_unlock(&mesh->mutex);
+ assert(pthread_mutex_unlock(&mesh->mutex) == 0);
#if HAVE_CATTA
logger(mesh, MESHLINK_DEBUG, "meshlink_start called\n");
- pthread_mutex_lock(&mesh->mutex);
+ assert(pthread_mutex_lock(&mesh->mutex) == 0);
assert(mesh->self);
assert(mesh->private_key);
if(mesh->threadstarted) {
logger(mesh, MESHLINK_DEBUG, "thread was already running\n");
- pthread_mutex_unlock(&mesh->mutex);
+ assert(pthread_mutex_unlock(&mesh->mutex) == 0);
return true;
}
if(!mesh->name) {
logger(mesh, MESHLINK_DEBUG, "No name given!\n");
meshlink_errno = MESHLINK_EINVAL;
- pthread_mutex_unlock(&mesh->mutex);
+ assert(pthread_mutex_unlock(&mesh->mutex) == 0);
return false;
}
event_loop_start(&mesh->loop);
- if(pthread_create(&mesh->thread, NULL, meshlink_main_loop, mesh) != 0) {
+ // Ensure we have a decent amount of stack space. Musl's default of 80 kB is too small.
+ pthread_attr_t attr;
+ assert(pthread_attr_init(&attr) == 0);
+ assert(pthread_attr_setstacksize(&attr, 1024 * 1024) == 0);
+
+ if(pthread_create(&mesh->thread, &attr, meshlink_main_loop, mesh) != 0) {
logger(mesh, MESHLINK_DEBUG, "Could not start thread: %s\n", strerror(errno));
memset(&mesh->thread, 0, sizeof(mesh)->thread);
meshlink_errno = MESHLINK_EINTERNAL;
event_loop_stop(&mesh->loop);
- pthread_mutex_unlock(&mesh->mutex);
+ assert(pthread_mutex_unlock(&mesh->mutex) == 0);
return false;
}
- pthread_cond_wait(&mesh->cond, &mesh->mutex);
+ assert(pthread_cond_wait(&mesh->cond, &mesh->mutex) == 0);
mesh->threadstarted = true;
// Ensure we are considered reachable
graph(mesh);
- pthread_mutex_unlock(&mesh->mutex);
+ assert(pthread_mutex_unlock(&mesh->mutex) == 0);
return true;
}
return;
}
- pthread_mutex_lock(&mesh->mutex);
+ assert(pthread_mutex_lock(&mesh->mutex) == 0);
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->mutex);
- pthread_join(mesh->thread, NULL);
- pthread_mutex_lock(&mesh->mutex);
+ assert(pthread_mutex_unlock(&mesh->mutex) == 0);
+ assert(pthread_join(mesh->thread, NULL) == 0);
+ assert(pthread_mutex_lock(&mesh->mutex) == 0);
mesh->threadstarted = false;
}
}
}
- pthread_mutex_unlock(&mesh->mutex);
+ assert(pthread_mutex_unlock(&mesh->mutex) == 0);
}
void meshlink_close(meshlink_handle_t *mesh) {
meshlink_stop(mesh);
// lock is not released after this
- pthread_mutex_lock(&mesh->mutex);
+ assert(pthread_mutex_lock(&mesh->mutex) == 0);
// Close and free all resources used.
main_config_unlock(mesh);
- pthread_mutex_unlock(&mesh->mutex);
- pthread_mutex_destroy(&mesh->mutex);
+ assert(pthread_mutex_unlock(&mesh->mutex) == 0);
+ assert(pthread_mutex_destroy(&mesh->mutex) == 0);
memset(mesh, 0, sizeof(*mesh));
return;
}
- pthread_mutex_lock(&mesh->mutex);
+ assert(pthread_mutex_lock(&mesh->mutex) == 0);
mesh->receive_cb = cb;
- pthread_mutex_unlock(&mesh->mutex);
+ assert(pthread_mutex_unlock(&mesh->mutex) == 0);
}
void meshlink_set_connection_try_cb(meshlink_handle_t *mesh, meshlink_connection_try_cb_t cb) {
return;
}
- pthread_mutex_lock(&mesh->mutex);
+ assert(pthread_mutex_lock(&mesh->mutex) == 0);
mesh->connection_try_cb = cb;
- pthread_mutex_unlock(&mesh->mutex);
+ assert(pthread_mutex_unlock(&mesh->mutex) == 0);
}
void meshlink_set_node_status_cb(meshlink_handle_t *mesh, meshlink_node_status_cb_t cb) {
return;
}
- pthread_mutex_lock(&mesh->mutex);
+ assert(pthread_mutex_lock(&mesh->mutex) == 0);
mesh->node_status_cb = cb;
- pthread_mutex_unlock(&mesh->mutex);
+ assert(pthread_mutex_unlock(&mesh->mutex) == 0);
}
void meshlink_set_node_pmtu_cb(meshlink_handle_t *mesh, meshlink_node_pmtu_cb_t cb) {
return;
}
- pthread_mutex_lock(&mesh->mutex);
+ assert(pthread_mutex_lock(&mesh->mutex) == 0);
mesh->node_pmtu_cb = cb;
- pthread_mutex_unlock(&mesh->mutex);
+ assert(pthread_mutex_unlock(&mesh->mutex) == 0);
}
void meshlink_set_node_duplicate_cb(meshlink_handle_t *mesh, meshlink_node_duplicate_cb_t cb) {
return;
}
- pthread_mutex_lock(&mesh->mutex);
+ assert(pthread_mutex_lock(&mesh->mutex) == 0);
mesh->node_duplicate_cb = cb;
- pthread_mutex_unlock(&mesh->mutex);
+ assert(pthread_mutex_unlock(&mesh->mutex) == 0);
}
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->mutex);
+ assert(pthread_mutex_lock(&mesh->mutex) == 0);
mesh->log_cb = cb;
mesh->log_level = cb ? level : 0;
- pthread_mutex_unlock(&mesh->mutex);
+ assert(pthread_mutex_unlock(&mesh->mutex) == 0);
} else {
global_log_cb = cb;
global_log_level = cb ? level : 0;
return;
}
- pthread_mutex_lock(&mesh->mutex);
+ assert(pthread_mutex_lock(&mesh->mutex) == 0);
mesh->error_cb = cb;
- pthread_mutex_unlock(&mesh->mutex);
+ assert(pthread_mutex_unlock(&mesh->mutex) == 0);
}
static bool prepare_packet(meshlink_handle_t *mesh, meshlink_node_t *destination, const void *data, size_t len, vpn_packet_t *packet) {
meshlink_packethdr_t *hdr;
- if(len >= MAXSIZE - sizeof(*hdr)) {
+ if(len > MAXSIZE - sizeof(*hdr)) {
meshlink_errno = MESHLINK_EINVAL;
return false;
}
memset(hdr, 0, sizeof(*hdr));
// leave the last byte as 0 to make sure strings are always
// null-terminated if they are longer than the buffer
- strncpy((char *)hdr->destination, destination->name, (sizeof(hdr)->destination) - 1);
- strncpy((char *)hdr->source, mesh->self->name, (sizeof(hdr)->source) - 1);
+ strncpy((char *)hdr->destination, destination->name, sizeof(hdr->destination) - 1);
+ strncpy((char *)hdr->source, mesh->self->name, sizeof(hdr->source) - 1);
memcpy(packet->data + sizeof(*hdr), data, len);
if(!prepare_packet(mesh, destination, data, len, packet)) {
free(packet);
+ return false;
}
// Queue it
return -1;
}
- pthread_mutex_lock(&mesh->mutex);
+ assert(pthread_mutex_lock(&mesh->mutex) == 0);
node_t *n = (node_t *)destination;
if(!n->status.reachable) {
- pthread_mutex_unlock(&mesh->mutex);
+ assert(pthread_mutex_unlock(&mesh->mutex) == 0);
return 0;
} else if(n->mtuprobes > 30 && n->minmtu) {
- pthread_mutex_unlock(&mesh->mutex);
+ assert(pthread_mutex_unlock(&mesh->mutex) == 0);
return n->minmtu;
} else {
- pthread_mutex_unlock(&mesh->mutex);
+ assert(pthread_mutex_unlock(&mesh->mutex) == 0);
return MTU;
}
}
return NULL;
}
- pthread_mutex_lock(&mesh->mutex);
+ assert(pthread_mutex_lock(&mesh->mutex) == 0);
node_t *n = (node_t *)node;
if(!node_read_public_key(mesh, n) || !n->ecdsa) {
meshlink_errno = MESHLINK_EINTERNAL;
- pthread_mutex_unlock(&mesh->mutex);
+ assert(pthread_mutex_unlock(&mesh->mutex) == 0);
return false;
}
meshlink_errno = MESHLINK_EINTERNAL;
}
- pthread_mutex_unlock(&mesh->mutex);
+ assert(pthread_mutex_unlock(&mesh->mutex) == 0);
return fingerprint;
}
node_t *n = NULL;
- pthread_mutex_lock(&mesh->mutex);
+ assert(pthread_mutex_lock(&mesh->mutex) == 0);
n = lookup_node(mesh, (char *)name); // TODO: make lookup_node() use const
- pthread_mutex_unlock(&mesh->mutex);
+ assert(pthread_mutex_unlock(&mesh->mutex) == 0);
if(!n) {
meshlink_errno = MESHLINK_ENOENT;
meshlink_submesh_t *submesh = NULL;
- pthread_mutex_lock(&mesh->mutex);
+ assert(pthread_mutex_lock(&mesh->mutex) == 0);
submesh = (meshlink_submesh_t *)lookup_submesh(mesh, name);
- pthread_mutex_unlock(&mesh->mutex);
+ assert(pthread_mutex_unlock(&mesh->mutex) == 0);
if(!submesh) {
meshlink_errno = MESHLINK_ENOENT;
meshlink_node_t **result;
//lock mesh->nodes
- pthread_mutex_lock(&mesh->mutex);
+ assert(pthread_mutex_lock(&mesh->mutex) == 0);
*nmemb = mesh->nodes->count;
result = realloc(nodes, *nmemb * sizeof(*nodes));
meshlink_errno = MESHLINK_ENOMEM;
}
- pthread_mutex_unlock(&mesh->mutex);
+ assert(pthread_mutex_unlock(&mesh->mutex) == 0);
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->mutex);
+ assert(pthread_mutex_lock(&mesh->mutex) == 0);
*nmemb = 0;
if(*nmemb == 0) {
free(nodes);
- pthread_mutex_unlock(&mesh->mutex);
+ assert(pthread_mutex_unlock(&mesh->mutex) == 0);
return NULL;
}
meshlink_errno = MESHLINK_ENOMEM;
}
- pthread_mutex_unlock(&mesh->mutex);
+ assert(pthread_mutex_unlock(&mesh->mutex) == 0);
return result;
}
dev_class_t devclass;
- pthread_mutex_lock(&mesh->mutex);
+ assert(pthread_mutex_lock(&mesh->mutex) == 0);
devclass = ((node_t *)node)->devclass;
- pthread_mutex_unlock(&mesh->mutex);
+ assert(pthread_mutex_unlock(&mesh->mutex) == 0);
return devclass;
}
node_t *n = (node_t *)node;
bool reachable;
- pthread_mutex_lock(&mesh->mutex);
+ assert(pthread_mutex_lock(&mesh->mutex) == 0);
reachable = n->status.reachable && !n->status.blacklisted;
if(last_reachable) {
*last_unreachable = n->last_unreachable;
}
- pthread_mutex_unlock(&mesh->mutex);
+ assert(pthread_mutex_unlock(&mesh->mutex) == 0);
return reachable;
}
return false;
}
- pthread_mutex_lock(&mesh->mutex);
+ assert(pthread_mutex_lock(&mesh->mutex) == 0);
if(!ecdsa_sign(mesh->private_key, data, len, signature)) {
meshlink_errno = MESHLINK_EINTERNAL;
- pthread_mutex_unlock(&mesh->mutex);
+ assert(pthread_mutex_unlock(&mesh->mutex) == 0);
return false;
}
*siglen = MESHLINK_SIGLEN;
- pthread_mutex_unlock(&mesh->mutex);
+ assert(pthread_mutex_unlock(&mesh->mutex) == 0);
return true;
}
return false;
}
- pthread_mutex_lock(&mesh->mutex);
+ assert(pthread_mutex_lock(&mesh->mutex) == 0);
bool rval = false;
rval = ecdsa_verify(((struct node_t *)source)->ecdsa, data, len, signature);
}
- pthread_mutex_unlock(&mesh->mutex);
+ assert(pthread_mutex_unlock(&mesh->mutex) == 0);
return rval;
}
static bool refresh_invitation_key(meshlink_handle_t *mesh) {
- pthread_mutex_lock(&mesh->mutex);
+ assert(pthread_mutex_lock(&mesh->mutex) == 0);
size_t count = invitation_purge_old(mesh, time(NULL) - mesh->invitation_timeout);
// TODO: Update invitation key if necessary?
}
- pthread_mutex_unlock(&mesh->mutex);
+ assert(pthread_mutex_unlock(&mesh->mutex) == 0);
return mesh->invitation_key;
}
}
if(!is_valid_hostname(address)) {
- logger(mesh, MESHLINK_DEBUG, "Invalid character in address: %s\n", address);
+ logger(mesh, MESHLINK_DEBUG, "Invalid character in address: %s", address);
meshlink_errno = MESHLINK_EINVAL;
return false;
}
+ if((node_t *)node != mesh->self && !port) {
+ logger(mesh, MESHLINK_DEBUG, "Missing port number!");
+ meshlink_errno = MESHLINK_EINVAL;
+ return false;
+
+ }
+
if(port && !is_valid_port(port)) {
- logger(mesh, MESHLINK_DEBUG, "Invalid character in port: %s\n", address);
+ logger(mesh, MESHLINK_DEBUG, "Invalid character in port: %s", address);
meshlink_errno = MESHLINK_EINVAL;
return false;
}
canonical_address = xstrdup(address);
}
- pthread_mutex_lock(&mesh->mutex);
+ assert(pthread_mutex_lock(&mesh->mutex) == 0);
node_t *n = (node_t *)node;
free(n->canonical_address);
n->canonical_address = canonical_address;
if(!node_write_config(mesh, n)) {
- pthread_mutex_unlock(&mesh->mutex);
+ assert(pthread_mutex_unlock(&mesh->mutex) == 0);
return false;
}
- pthread_mutex_unlock(&mesh->mutex);
+ assert(pthread_mutex_unlock(&mesh->mutex) == 0);
return config_sync(mesh, "current");
}
combo = xstrdup(address);
}
- pthread_mutex_lock(&mesh->mutex);
+ assert(pthread_mutex_lock(&mesh->mutex) == 0);
if(!mesh->invitation_addresses) {
mesh->invitation_addresses = list_alloc((list_action_t)free);
}
list_insert_tail(mesh->invitation_addresses, combo);
- pthread_mutex_unlock(&mesh->mutex);
+ assert(pthread_mutex_unlock(&mesh->mutex) == 0);
return true;
}
return;
}
- pthread_mutex_lock(&mesh->mutex);
+ assert(pthread_mutex_lock(&mesh->mutex) == 0);
if(mesh->invitation_addresses) {
list_delete_list(mesh->invitation_addresses);
mesh->invitation_addresses = NULL;
}
- pthread_mutex_unlock(&mesh->mutex);
+ assert(pthread_mutex_unlock(&mesh->mutex) == 0);
}
bool meshlink_add_address(meshlink_handle_t *mesh, const char *address) {
int port;
- pthread_mutex_lock(&mesh->mutex);
+ assert(pthread_mutex_lock(&mesh->mutex) == 0);
port = atoi(mesh->myport);
- pthread_mutex_unlock(&mesh->mutex);
+ assert(pthread_mutex_unlock(&mesh->mutex) == 0);
return port;
}
bool rval = false;
- pthread_mutex_lock(&mesh->mutex);
+ assert(pthread_mutex_lock(&mesh->mutex) == 0);
if(mesh->threadstarted) {
meshlink_errno = MESHLINK_EINVAL;
rval = config_sync(mesh, "current");
done:
- pthread_mutex_unlock(&mesh->mutex);
+ assert(pthread_mutex_unlock(&mesh->mutex) == 0);
return rval && meshlink_get_port(mesh) == port;
}
s = (meshlink_submesh_t *)mesh->self->submesh;
}
- pthread_mutex_lock(&mesh->mutex);
+ assert(pthread_mutex_lock(&mesh->mutex) == 0);
// Check validity of the new node's name
if(!check_id(name)) {
logger(mesh, MESHLINK_ERROR, "Invalid name for node.\n");
meshlink_errno = MESHLINK_EINVAL;
- pthread_mutex_unlock(&mesh->mutex);
+ assert(pthread_mutex_unlock(&mesh->mutex) == 0);
return NULL;
}
if(config_exists(mesh, "current", name)) {
logger(mesh, MESHLINK_ERROR, "A host config file for %s already exists!\n", name);
meshlink_errno = MESHLINK_EEXIST;
- pthread_mutex_unlock(&mesh->mutex);
+ assert(pthread_mutex_unlock(&mesh->mutex) == 0);
return NULL;
}
if(lookup_node(mesh, name)) {
logger(mesh, MESHLINK_ERROR, "A node with name %s is already known!\n", name);
meshlink_errno = MESHLINK_EEXIST;
- pthread_mutex_unlock(&mesh->mutex);
+ assert(pthread_mutex_unlock(&mesh->mutex) == 0);
return NULL;
}
if(!address) {
logger(mesh, MESHLINK_ERROR, "No Address known for ourselves!\n");
meshlink_errno = MESHLINK_ERESOLV;
- pthread_mutex_unlock(&mesh->mutex);
+ assert(pthread_mutex_unlock(&mesh->mutex) == 0);
return NULL;
}
if(!refresh_invitation_key(mesh)) {
meshlink_errno = MESHLINK_EINTERNAL;
- pthread_mutex_unlock(&mesh->mutex);
+ assert(pthread_mutex_unlock(&mesh->mutex) == 0);
return NULL;
}
if(mesh->self->status.dirty) {
if(!node_write_config(mesh, mesh->self)) {
logger(mesh, MESHLINK_ERROR, "Could not write our own host config file!\n");
- pthread_mutex_unlock(&mesh->mutex);
+ assert(pthread_mutex_unlock(&mesh->mutex) == 0);
return NULL;
}
}
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->mutex);
+ assert(pthread_mutex_unlock(&mesh->mutex) == 0);
return NULL;
}
xasprintf(&url, "%s/%s%s", address, hash, cookie);
free(address);
- pthread_mutex_unlock(&mesh->mutex);
+ assert(pthread_mutex_unlock(&mesh->mutex) == 0);
return url;
}
//TODO: think of a better name for this variable, or of a different way to tokenize the invitation URL.
char copy[strlen(invitation) + 1];
- pthread_mutex_lock(&mesh->mutex);
+ assert(pthread_mutex_lock(&mesh->mutex) == 0);
//Before doing meshlink_join make sure we are not connected to another mesh
if(mesh->threadstarted) {
}
// Connect to the meshlink daemon mentioned in the URL.
- struct addrinfo *ai = adns_blocking_request(mesh, xstrdup(address), xstrdup(port), 5);
+ struct addrinfo *ai = adns_blocking_request(mesh, xstrdup(address), xstrdup(port), SOCK_STREAM, 5);
if(ai) {
for(struct addrinfo *aip = ai; aip; aip = aip->ai_next) {
- state.sock = socket_in_netns(aip->ai_family, aip->ai_socktype, aip->ai_protocol, mesh->netns);
+ state.sock = socket_in_netns(aip->ai_family, SOCK_STREAM, IPPROTO_TCP, mesh->netns);
if(state.sock == -1) {
logger(mesh, MESHLINK_DEBUG, "Could not open socket: %s\n", strerror(errno));
continue;
}
+#ifdef SO_NOSIGPIPE
+ int nosigpipe = 1;
+ setsockopt(state.sock, SOL_SOCKET, SO_NOSIGPIPE, &nosigpipe, sizeof(nosigpipe));
+#endif
+
set_timeout(state.sock, 5000);
if(connect(state.sock, aip->ai_addr, aip->ai_addrlen)) {
ecdsa_free(key);
closesocket(state.sock);
- pthread_mutex_unlock(&mesh->mutex);
+ assert(pthread_mutex_unlock(&mesh->mutex) == 0);
return true;
invalid:
closesocket(state.sock);
}
- pthread_mutex_unlock(&mesh->mutex);
+ assert(pthread_mutex_unlock(&mesh->mutex) == 0);
return false;
}
packmsg_add_str(&out, mesh->name);
packmsg_add_str(&out, CORE_MESH);
- pthread_mutex_lock(&mesh->mutex);
+ assert(pthread_mutex_lock(&mesh->mutex) == 0);
packmsg_add_int32(&out, mesh->self->devclass);
packmsg_add_bool(&out, mesh->self->status.blacklisted);
packmsg_add_bin(&out, ecdsa_get_public_key(mesh->private_key), 32);
- packmsg_add_str(&out, mesh->self->canonical_address ? mesh->self->canonical_address : "");
+
+ if(mesh->self->canonical_address && !strchr(mesh->self->canonical_address, ' ')) {
+ char *canonical_address = NULL;
+ xasprintf(&canonical_address, "%s %s", mesh->self->canonical_address, mesh->myport);
+ packmsg_add_str(&out, canonical_address);
+ free(canonical_address);
+ } else {
+ packmsg_add_str(&out, mesh->self->canonical_address ? mesh->self->canonical_address : "");
+ }
uint32_t count = 0;
packmsg_add_int64(&out, 0);
packmsg_add_int64(&out, 0);
- pthread_mutex_unlock(&mesh->mutex);
+ assert(pthread_mutex_unlock(&mesh->mutex) == 0);
if(!packmsg_output_ok(&out)) {
logger(mesh, MESHLINK_DEBUG, "Error creating export data\n");
return false;
}
- pthread_mutex_lock(&mesh->mutex);
+ assert(pthread_mutex_lock(&mesh->mutex) == 0);
while(count--) {
- const void *data;
- uint32_t len = packmsg_get_bin_raw(&in, &data);
+ const void *data2;
+ uint32_t len2 = packmsg_get_bin_raw(&in, &data2);
- if(!len) {
+ if(!len2) {
break;
}
- packmsg_input_t in2 = {data, len};
+ packmsg_input_t in2 = {data2, len2};
uint32_t version = packmsg_get_uint32(&in2);
char *name = packmsg_get_str_dup(&in2);
n = new_node();
n->name = name;
- config_t config = {data, len};
+ config_t config = {data2, len2};
if(!node_read_from_config(mesh, n, &config)) {
free_node(n);
node_add(mesh, n);
}
- pthread_mutex_unlock(&mesh->mutex);
+ assert(pthread_mutex_unlock(&mesh->mutex) == 0);
free(buf);
return false;
}
- pthread_mutex_lock(&mesh->mutex);
+ assert(pthread_mutex_lock(&mesh->mutex) == 0);
if(!blacklist(mesh, (node_t *)node)) {
- pthread_mutex_unlock(&mesh->mutex);
+ assert(pthread_mutex_unlock(&mesh->mutex) == 0);
return false;
}
- pthread_mutex_unlock(&mesh->mutex);
+ assert(pthread_mutex_unlock(&mesh->mutex) == 0);
logger(mesh, MESHLINK_DEBUG, "Blacklisted %s.\n", node->name);
return true;
return false;
}
- pthread_mutex_lock(&mesh->mutex);
+ assert(pthread_mutex_lock(&mesh->mutex) == 0);
node_t *n = lookup_node(mesh, (char *)name);
}
if(!blacklist(mesh, (node_t *)n)) {
- pthread_mutex_unlock(&mesh->mutex);
+ assert(pthread_mutex_unlock(&mesh->mutex) == 0);
return false;
}
- pthread_mutex_unlock(&mesh->mutex);
+ assert(pthread_mutex_unlock(&mesh->mutex) == 0);
logger(mesh, MESHLINK_DEBUG, "Blacklisted %s.\n", name);
return true;
return false;
}
- pthread_mutex_lock(&mesh->mutex);
+ assert(pthread_mutex_lock(&mesh->mutex) == 0);
if(!whitelist(mesh, (node_t *)node)) {
- pthread_mutex_unlock(&mesh->mutex);
+ assert(pthread_mutex_unlock(&mesh->mutex) == 0);
return false;
}
- pthread_mutex_unlock(&mesh->mutex);
+ assert(pthread_mutex_unlock(&mesh->mutex) == 0);
logger(mesh, MESHLINK_DEBUG, "Whitelisted %s.\n", node->name);
return true;
return false;
}
- pthread_mutex_lock(&mesh->mutex);
+ assert(pthread_mutex_lock(&mesh->mutex) == 0);
node_t *n = lookup_node(mesh, (char *)name);
}
if(!whitelist(mesh, (node_t *)n)) {
- pthread_mutex_unlock(&mesh->mutex);
+ assert(pthread_mutex_unlock(&mesh->mutex) == 0);
return false;
}
- pthread_mutex_unlock(&mesh->mutex);
+ assert(pthread_mutex_unlock(&mesh->mutex) == 0);
logger(mesh, MESHLINK_DEBUG, "Whitelisted %s.\n", name);
return true;
node_t *n = (node_t *)node;
- pthread_mutex_lock(&mesh->mutex);
+ assert(pthread_mutex_lock(&mesh->mutex) == 0);
/* Check that the node is not reachable */
if(n->status.reachable || n->connection) {
- pthread_mutex_unlock(&mesh->mutex);
+ assert(pthread_mutex_unlock(&mesh->mutex) == 0);
logger(mesh, MESHLINK_WARNING, "Could not forget %s: still reachable", n->name);
return false;
}
/* Check that we don't have any active UTCP connections */
if(n->utcp && utcp_is_active(n->utcp)) {
- pthread_mutex_unlock(&mesh->mutex);
+ assert(pthread_mutex_unlock(&mesh->mutex) == 0);
logger(mesh, MESHLINK_WARNING, "Could not forget %s: active UTCP connections", n->name);
return false;
}
/* Check that we have no active connections to this node */
for list_each(connection_t, c, mesh->connections) {
if(c->node == n) {
- pthread_mutex_unlock(&mesh->mutex);
+ assert(pthread_mutex_unlock(&mesh->mutex) == 0);
logger(mesh, MESHLINK_WARNING, "Could not forget %s: active connection", n->name);
return false;
}
if(mesh->outgoings) {
for list_each(outgoing_t, outgoing, mesh->outgoings) {
if(outgoing->node == n) {
- list_delete_node(mesh->outgoings, node);
+ list_delete_node(mesh->outgoings, list_node);
}
}
}
/* Delete the config file for this node */
if(!config_delete(mesh, "current", n->name)) {
- pthread_mutex_unlock(&mesh->mutex);
+ assert(pthread_mutex_unlock(&mesh->mutex) == 0);
return false;
}
/* Delete the node struct and any remaining edges referencing this node */
node_del(mesh, n);
- pthread_mutex_unlock(&mesh->mutex);
+ assert(pthread_mutex_unlock(&mesh->mutex) == 0);
return config_sync(mesh, "current");
}
return;
}
- pthread_mutex_lock(&mesh->mutex);
+ assert(pthread_mutex_lock(&mesh->mutex) == 0);
node_t *n = (node_t *)node;
}
}
- pthread_mutex_unlock(&mesh->mutex);
+ assert(pthread_mutex_unlock(&mesh->mutex) == 0);
// @TODO do we want to fire off a connection attempt right away?
}
return mesh->channel_accept_cb;
}
-static void aio_signal(meshlink_handle_t *mesh, meshlink_channel_t *channel, meshlink_aio_buffer_t *aio) {
- if(aio->data) {
- if(aio->cb.buffer) {
- aio->cb.buffer(mesh, channel, aio->data, aio->len, aio->priv);
+/* Finish one AIO buffer, return true if the channel is still open. */
+static bool aio_finish_one(meshlink_handle_t *mesh, meshlink_channel_t *channel, meshlink_aio_buffer_t **head) {
+ meshlink_aio_buffer_t *aio = *head;
+ *head = aio->next;
+
+ if(channel->c) {
+ channel->in_callback = true;
+
+ if(aio->data) {
+ if(aio->cb.buffer) {
+ aio->cb.buffer(mesh, channel, aio->data, aio->done, aio->priv);
+ }
+ } else {
+ if(aio->cb.fd) {
+ aio->cb.fd(mesh, channel, aio->fd, aio->done, aio->priv);
+ }
}
- } else {
- if(aio->cb.fd) {
- aio->cb.fd(mesh, channel, aio->fd, aio->done, aio->priv);
+
+ channel->in_callback = false;
+
+ if(!channel->c) {
+ free(aio);
+ free(channel);
+ return false;
+ }
+ }
+
+ free(aio);
+ return true;
+}
+
+/* Finish all AIO buffers, return true if the channel is still open. */
+static bool aio_abort(meshlink_handle_t *mesh, meshlink_channel_t *channel, meshlink_aio_buffer_t **head) {
+ while(*head) {
+ if(!aio_finish_one(mesh, channel, head)) {
+ return false;
}
}
+
+ return true;
}
static ssize_t channel_recv(struct utcp_connection *connection, const void *data, size_t len) {
size_t left = len;
while(channel->aio_receive) {
+ if(!len) {
+ /* This receive callback signalled an error, abort all outstanding AIO buffers. */
+ if(!aio_abort(mesh, channel, &channel->aio_receive)) {
+ return len;
+ }
+
+ break;
+ }
+
meshlink_aio_buffer_t *aio = channel->aio_receive;
size_t todo = aio->len - aio->done;
} else {
ssize_t result = write(aio->fd, p, todo);
- if(result > 0) {
- todo = result;
+ if(result <= 0) {
+ if(result < 0 && errno == EINTR) {
+ continue;
+ }
+
+ /* Writing to fd failed, cancel just this AIO buffer. */
+ logger(mesh, MESHLINK_ERROR, "Writing to AIO fd %d failed: %s", aio->fd, strerror(errno));
+
+ if(!aio_finish_one(mesh, channel, &channel->aio_receive)) {
+ return len;
+ }
+
+ continue;
}
+
+ todo = result;
}
aio->done += todo;
+ p += todo;
+ left -= todo;
if(aio->done == aio->len) {
- channel->aio_receive = aio->next;
- aio_signal(mesh, channel, aio);
- free(aio);
+ if(!aio_finish_one(mesh, channel, &channel->aio_receive)) {
+ return len;
+ }
}
- p += todo;
- left -= todo;
-
- if(!left && len) {
+ if(!left) {
return len;
}
}
}
}
+static void channel_retransmit(struct utcp_connection *utcp_connection) {
+ node_t *n = utcp_connection->utcp->priv;
+ meshlink_handle_t *mesh = n->mesh;
+
+ if(n->mtuprobes == 31) {
+ timeout_set(&mesh->loop, &n->mtutimeout, &(struct timespec) {
+ 0, 0
+ });
+ }
+}
+
static ssize_t channel_send(struct utcp *utcp, const void *data, size_t len) {
node_t *n = utcp->priv;
node_t *n = channel->node;
meshlink_handle_t *mesh = n->mesh;
- meshlink_aio_buffer_t *aio = channel->aio_send;
- if(aio) {
- /* We at least one AIO buffer. Send as much as possible form the first buffer. */
- size_t left = aio->len - aio->done;
+ while(channel->aio_send) {
+ if(!len) {
+ /* This poll callback signalled an error, abort all outstanding AIO buffers. */
+ if(!aio_abort(mesh, channel, &channel->aio_send)) {
+ return;
+ }
+
+ break;
+ }
+
+ /* We have at least one AIO buffer. Send as much as possible from the buffers. */
+ meshlink_aio_buffer_t *aio = channel->aio_send;
+ size_t todo = aio->len - aio->done;
ssize_t sent;
- if(len > left) {
- len = left;
+ if(todo > len) {
+ todo = len;
}
if(aio->data) {
- sent = utcp_send(connection, (char *)aio->data + aio->done, len);
+ sent = utcp_send(connection, (char *)aio->data + aio->done, todo);
} else {
- char buf[65536];
- size_t todo = utcp_get_sndbuf_free(connection);
-
- if(todo > left) {
- todo = left;
- }
-
- if(todo > sizeof(buf)) {
- todo = sizeof(buf);
+ /* Limit the amount we read at once to avoid stack overflows */
+ if(todo > 65536) {
+ todo = 65536;
}
+ char buf[todo];
ssize_t result = read(aio->fd, buf, todo);
if(result > 0) {
- sent = utcp_send(connection, buf, result);
+ todo = result;
+ sent = utcp_send(connection, buf, todo);
} else {
- sent = result;
+ if(result < 0 && errno == EINTR) {
+ continue;
+ }
+
+ /* Reading from fd failed, cancel just this AIO buffer. */
+ if(result != 0) {
+ logger(mesh, MESHLINK_ERROR, "Reading from AIO fd %d failed: %s", aio->fd, strerror(errno));
+ }
+
+ if(!aio_finish_one(mesh, channel, &channel->aio_send)) {
+ return;
+ }
+
+ continue;
}
}
- if(sent >= 0) {
- aio->done += sent;
+ if(sent != (ssize_t)todo) {
+ /* We should never get a partial send at this point */
+ assert(sent <= 0);
+
+ /* Sending failed, abort all outstanding AIO buffers and send a poll callback. */
+ if(!aio_abort(mesh, channel, &channel->aio_send)) {
+ return;
+ }
+
+ len = 0;
+ break;
}
- /* If the buffer is now completely sent, call the callback and dispose of it. */
- if(aio->done >= aio->len) {
- channel->aio_send = aio->next;
- aio_signal(mesh, channel, aio);
- free(aio);
+ aio->done += sent;
+ len -= sent;
+
+ /* If we didn't finish this buffer, exit early. */
+ if(aio->done < aio->len) {
+ return;
}
- } else {
- if(channel->poll_cb) {
- channel->poll_cb(mesh, channel, len);
- } else {
- utcp_set_poll_cb(connection, NULL);
+
+ /* Signal completion of this buffer, and go to the next one. */
+ if(!aio_finish_one(mesh, channel, &channel->aio_send)) {
+ return;
}
+
+ if(!len) {
+ return;
+ }
+ }
+
+ if(channel->poll_cb) {
+ channel->poll_cb(mesh, channel, len);
+ } else {
+ utcp_set_poll_cb(connection, NULL);
}
}
return;
}
- pthread_mutex_lock(&mesh->mutex);
+ assert(pthread_mutex_lock(&mesh->mutex) == 0);
channel->poll_cb = cb;
utcp_set_poll_cb(channel->c, (cb || channel->aio_send) ? channel_poll : NULL);
- pthread_mutex_unlock(&mesh->mutex);
+ assert(pthread_mutex_unlock(&mesh->mutex) == 0);
}
void meshlink_set_channel_accept_cb(meshlink_handle_t *mesh, meshlink_channel_accept_cb_t cb) {
return;
}
- pthread_mutex_lock(&mesh->mutex);
+ assert(pthread_mutex_lock(&mesh->mutex) == 0);
mesh->channel_accept_cb = cb;
mesh->receive_cb = channel_receive;
if(!n->utcp && n != mesh->self) {
n->utcp = utcp_init(channel_accept, channel_pre_accept, channel_send, n);
utcp_set_mtu(n->utcp, n->mtu - sizeof(meshlink_packethdr_t));
+ utcp_set_retransmit_cb(n->utcp, channel_retransmit);
}
}
- pthread_mutex_unlock(&mesh->mutex);
+ assert(pthread_mutex_unlock(&mesh->mutex) == 0);
}
void meshlink_set_channel_sndbuf(meshlink_handle_t *mesh, meshlink_channel_t *channel, size_t size) {
return;
}
- pthread_mutex_lock(&mesh->mutex);
+ assert(pthread_mutex_lock(&mesh->mutex) == 0);
utcp_set_sndbuf(channel->c, size);
- pthread_mutex_unlock(&mesh->mutex);
+ assert(pthread_mutex_unlock(&mesh->mutex) == 0);
}
void meshlink_set_channel_rcvbuf(meshlink_handle_t *mesh, meshlink_channel_t *channel, size_t size) {
return;
}
- pthread_mutex_lock(&mesh->mutex);
+ assert(pthread_mutex_lock(&mesh->mutex) == 0);
utcp_set_rcvbuf(channel->c, size);
- pthread_mutex_unlock(&mesh->mutex);
+ assert(pthread_mutex_unlock(&mesh->mutex) == 0);
}
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);
+ assert(pthread_mutex_lock(&mesh->mutex) == 0);
node_t *n = (node_t *)node;
if(!n->utcp) {
n->utcp = utcp_init(channel_accept, channel_pre_accept, channel_send, n);
utcp_set_mtu(n->utcp, n->mtu - sizeof(meshlink_packethdr_t));
+ utcp_set_retransmit_cb(n->utcp, channel_retransmit);
mesh->receive_cb = channel_receive;
if(!n->utcp) {
meshlink_errno = errno == ENOMEM ? MESHLINK_ENOMEM : MESHLINK_EINTERNAL;
- pthread_mutex_unlock(&mesh->mutex);
+ assert(pthread_mutex_unlock(&mesh->mutex) == 0);
return NULL;
}
}
if(n->status.blacklisted) {
logger(mesh, MESHLINK_ERROR, "Cannot open a channel with blacklisted node\n");
meshlink_errno = MESHLINK_EBLACKLISTED;
- pthread_mutex_unlock(&mesh->mutex);
+ assert(pthread_mutex_unlock(&mesh->mutex) == 0);
return NULL;
}
channel->c = utcp_connect_ex(n->utcp, port, channel_recv, channel, flags);
- pthread_mutex_unlock(&mesh->mutex);
+ assert(pthread_mutex_unlock(&mesh->mutex) == 0);
if(!channel->c) {
meshlink_errno = errno == ENOMEM ? MESHLINK_ENOMEM : MESHLINK_EINTERNAL;
return;
}
- pthread_mutex_lock(&mesh->mutex);
+ assert(pthread_mutex_lock(&mesh->mutex) == 0);
utcp_shutdown(channel->c, direction);
- pthread_mutex_unlock(&mesh->mutex);
+ assert(pthread_mutex_unlock(&mesh->mutex) == 0);
}
void meshlink_channel_close(meshlink_handle_t *mesh, meshlink_channel_t *channel) {
return;
}
- pthread_mutex_lock(&mesh->mutex);
+ assert(pthread_mutex_lock(&mesh->mutex) == 0);
- utcp_close(channel->c);
+ if(channel->c) {
+ utcp_close(channel->c);
+ channel->c = NULL;
- /* Clean up any outstanding AIO buffers. */
- for(meshlink_aio_buffer_t *aio = channel->aio_send, *next; aio; aio = next) {
- next = aio->next;
- aio_signal(mesh, channel, aio);
- free(aio);
+ /* Clean up any outstanding AIO buffers. */
+ aio_abort(mesh, channel, &channel->aio_send);
+ aio_abort(mesh, channel, &channel->aio_receive);
}
- for(meshlink_aio_buffer_t *aio = channel->aio_receive, *next; aio; aio = next) {
- next = aio->next;
- aio_signal(mesh, channel, aio);
- free(aio);
+ if(!channel->in_callback) {
+ free(channel);
}
- pthread_mutex_unlock(&mesh->mutex);
-
- free(channel);
+ assert(pthread_mutex_unlock(&mesh->mutex) == 0);
}
ssize_t meshlink_channel_send(meshlink_handle_t *mesh, meshlink_channel_t *channel, const void *data, size_t len) {
ssize_t retval;
- pthread_mutex_lock(&mesh->mutex);
+ assert(pthread_mutex_lock(&mesh->mutex) == 0);
/* 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->mutex);
+ assert(pthread_mutex_unlock(&mesh->mutex) == 0);
if(retval < 0) {
meshlink_errno = MESHLINK_ENETWORK;
aio->cb.buffer = cb;
aio->priv = priv;
- pthread_mutex_lock(&mesh->mutex);
+ assert(pthread_mutex_lock(&mesh->mutex) == 0);
/* Append the AIO buffer descriptor to the end of the chain */
meshlink_aio_buffer_t **p = &channel->aio_send;
/* Ensure the poll callback is set, and call it right now to push data if possible */
utcp_set_poll_cb(channel->c, channel_poll);
- channel_poll(channel->c, len);
+ size_t todo = MIN(len, utcp_get_rcvbuf_free(channel->c));
- pthread_mutex_unlock(&mesh->mutex);
+ if(todo) {
+ channel_poll(channel->c, todo);
+ }
+
+ assert(pthread_mutex_unlock(&mesh->mutex) == 0);
return true;
}
aio->cb.fd = cb;
aio->priv = priv;
- pthread_mutex_lock(&mesh->mutex);
+ assert(pthread_mutex_lock(&mesh->mutex) == 0);
/* Append the AIO buffer descriptor to the end of the chain */
meshlink_aio_buffer_t **p = &channel->aio_send;
/* Ensure the poll callback is set, and call it right now to push data if possible */
utcp_set_poll_cb(channel->c, channel_poll);
- channel_poll(channel->c, len);
+ size_t left = utcp_get_rcvbuf_free(channel->c);
+
+ if(left) {
+ channel_poll(channel->c, left);
+ }
- pthread_mutex_unlock(&mesh->mutex);
+ assert(pthread_mutex_unlock(&mesh->mutex) == 0);
return true;
}
aio->cb.buffer = cb;
aio->priv = priv;
- pthread_mutex_lock(&mesh->mutex);
+ assert(pthread_mutex_lock(&mesh->mutex) == 0);
/* 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->mutex);
+ assert(pthread_mutex_unlock(&mesh->mutex) == 0);
return true;
}
aio->cb.fd = cb;
aio->priv = priv;
- pthread_mutex_lock(&mesh->mutex);
+ assert(pthread_mutex_lock(&mesh->mutex) == 0);
/* 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->mutex);
+ assert(pthread_mutex_unlock(&mesh->mutex) == 0);
return true;
}
node_t *n = (node_t *)node;
- pthread_mutex_lock(&mesh->mutex);
+ assert(pthread_mutex_lock(&mesh->mutex) == 0);
if(!n->utcp) {
n->utcp = utcp_init(channel_accept, channel_pre_accept, channel_send, n);
utcp_set_mtu(n->utcp, n->mtu - sizeof(meshlink_packethdr_t));
+ utcp_set_retransmit_cb(n->utcp, channel_retransmit);
}
utcp_set_user_timeout(n->utcp, timeout);
- pthread_mutex_unlock(&mesh->mutex);
+ assert(pthread_mutex_unlock(&mesh->mutex) == 0);
}
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);
utcp_set_mtu(n->utcp, n->mtu - sizeof(meshlink_packethdr_t));
+ utcp_set_retransmit_cb(n->utcp, channel_retransmit);
}
if(mesh->node_status_cb) {
return;
}
- pthread_mutex_lock(&mesh->mutex);
+ assert(pthread_mutex_lock(&mesh->mutex) == 0);
if(mesh->discovery == enable) {
goto end;
mesh->discovery = enable;
end:
- pthread_mutex_unlock(&mesh->mutex);
+ assert(pthread_mutex_unlock(&mesh->mutex) == 0);
#else
(void)mesh;
(void)enable;
return;
}
- pthread_mutex_lock(&mesh->mutex);
+ assert(pthread_mutex_lock(&mesh->mutex) == 0);
mesh->dev_class_traits[devclass].pinginterval = pinginterval;
mesh->dev_class_traits[devclass].pingtimeout = pingtimeout;
- pthread_mutex_unlock(&mesh->mutex);
+ assert(pthread_mutex_unlock(&mesh->mutex) == 0);
}
void meshlink_set_dev_class_fast_retry_period(meshlink_handle_t *mesh, dev_class_t devclass, int fast_retry_period) {
return;
}
- pthread_mutex_lock(&mesh->mutex);
+ assert(pthread_mutex_lock(&mesh->mutex) == 0);
mesh->dev_class_traits[devclass].fast_retry_period = fast_retry_period;
- pthread_mutex_unlock(&mesh->mutex);
+ assert(pthread_mutex_unlock(&mesh->mutex) == 0);
+}
+
+void meshlink_set_dev_class_maxtimeout(struct meshlink_handle *mesh, dev_class_t devclass, int maxtimeout) {
+ if(!mesh || devclass < 0 || devclass >= DEV_CLASS_COUNT) {
+ meshlink_errno = EINVAL;
+ return;
+ }
+
+ if(maxtimeout < 0) {
+ meshlink_errno = EINVAL;
+ return;
+ }
+
+ assert(pthread_mutex_lock(&mesh->mutex) == 0);
+ mesh->dev_class_traits[devclass].maxtimeout = maxtimeout;
+ assert(pthread_mutex_unlock(&mesh->mutex) == 0);
}
extern void meshlink_set_inviter_commits_first(struct meshlink_handle *mesh, bool inviter_commits_first) {
return;
}
- pthread_mutex_lock(&mesh->mutex);
+ assert(pthread_mutex_lock(&mesh->mutex) == 0);
mesh->inviter_commits_first = inviter_commits_first;
- pthread_mutex_unlock(&mesh->mutex);
+ assert(pthread_mutex_unlock(&mesh->mutex) == 0);
}
void meshlink_set_external_address_discovery_url(struct meshlink_handle *mesh, const char *url) {
return;
}
- pthread_mutex_lock(&mesh->mutex);
+ assert(pthread_mutex_lock(&mesh->mutex) == 0);
free(mesh->external_address_url);
mesh->external_address_url = url ? xstrdup(url) : NULL;
- pthread_mutex_unlock(&mesh->mutex);
+ assert(pthread_mutex_unlock(&mesh->mutex) == 0);
}
void meshlink_set_scheduling_granularity(struct meshlink_handle *mesh, long granularity) {
}
retry(mesh);
+ signal_trigger(&mesh->loop, &mesh->datafromapp);
}
-void call_error_cb(meshlink_handle_t *mesh, meshlink_errno_t meshlink_errno) {
+void call_error_cb(meshlink_handle_t *mesh, meshlink_errno_t cb_errno) {
// We should only call the callback function if we are in the background thread.
if(!mesh->error_cb) {
return;
}
if(mesh->thread == pthread_self()) {
- mesh->error_cb(mesh, meshlink_errno);
+ mesh->error_cb(mesh, cb_errno);
}
}
projects / meshlink / blobdiff