pthread_t thr;
if(pthread_create(&thr, NULL, socket_in_netns_thread, ¶ms) == 0) {
- pthread_join(thr, NULL);
+ if(pthread_join(thr, NULL) != 0) {
+ abort();
+ }
}
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);
}
}
+#ifdef HAVE_GETIFADDRS
+struct getifaddrs_in_netns_params {
+ struct ifaddrs **ifa;
+ int netns;
+};
+
+#ifdef HAVE_SETNS
+static void *getifaddrs_in_netns_thread(void *arg) {
+ struct getifaddrs_in_netns_params *params = arg;
+
+ if(setns(params->netns, CLONE_NEWNET) == -1) {
+ meshlink_errno = MESHLINK_EINVAL;
+ return NULL;
+ }
+
+ if(getifaddrs(params->ifa) != 0) {
+ *params->ifa = NULL;
+ }
+
+ return NULL;
+}
+#endif // HAVE_SETNS
+
+static int getifaddrs_in_netns(struct ifaddrs **ifa, int netns) {
+ if(netns == -1) {
+ return getifaddrs(ifa);
+ }
+
+#ifdef HAVE_SETNS
+ struct getifaddrs_in_netns_params params = {ifa, netns};
+ pthread_t thr;
+
+ if(pthread_create(&thr, NULL, getifaddrs_in_netns_thread, ¶ms) == 0) {
+ if(pthread_join(thr, NULL) != 0) {
+ abort();
+ }
+ }
+
+ return *params.ifa ? 0 : -1;
+#else
+ return -1;
+#endif // HAVE_SETNS
+
+}
+#endif
+
char *meshlink_get_local_address_for_family(meshlink_handle_t *mesh, int family) {
(void)mesh;
if(!success) {
struct ifaddrs *ifa = NULL;
- getifaddrs(&ifa);
+ getifaddrs_in_netns(&ifa, mesh->netns);
for(struct ifaddrs *ifap = ifa; ifap; ifap = ifap->ifa_next) {
sockaddr_t *sa = (sockaddr_t *)ifap->ifa_addr;
- if(sa->sa.sa_family != family) {
+ if(!sa || sa->sa.sa_family != family) {
continue;
}
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);
}
/* Ensure the configuration directory metadata is on disk */
- if(!config_sync(mesh, "current") || !sync_path(mesh->confbase)) {
+ if(!config_sync(mesh, "current") || (mesh->confbase && !sync_path(mesh->confbase))) {
return false;
}
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);
+ if(pthread_mutex_lock(&mesh->mutex) != 0) {
+ abort();
+ }
// Create hash for the new key
void *new_config_key;
/// 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);
+
+ if(pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE) != 0) {
+ abort();
+ }
+
pthread_mutex_init(&mesh->mutex, &attr);
+ pthread_cond_init(&mesh->cond, NULL);
+
+ pthread_mutex_init(&mesh->discovery_mutex, NULL);
+ pthread_cond_init(&mesh->discovery_cond, NULL);
+
+ pthread_cond_init(&mesh->adns_cond, NULL);
mesh->threadstarted = false;
event_loop_init(&mesh->loop);
}
//lock mesh->nodes
- pthread_mutex_lock(&mesh->mutex);
+ if(pthread_mutex_lock(&mesh->mutex) != 0) {
+ abort();
+ }
s = (meshlink_submesh_t *)create_submesh(mesh, submesh);
#endif
- pthread_mutex_lock(&mesh->mutex);
+ if(pthread_mutex_lock(&mesh->mutex) != 0) {
+ abort();
+ }
logger(mesh, MESHLINK_DEBUG, "Starting main_loop...\n");
pthread_cond_broadcast(&mesh->cond);
logger(mesh, MESHLINK_DEBUG, "meshlink_start called\n");
- pthread_mutex_lock(&mesh->mutex);
+ if(pthread_mutex_lock(&mesh->mutex) != 0) {
+ abort();
+ }
assert(mesh->self);
assert(mesh->private_key);
return false;
}
+ // Reset node connection timers
+ for splay_each(node_t, n, mesh->nodes) {
+ n->last_connect_try = 0;
+ }
+
// TODO: open listening sockets first
//Check that a valid name is set
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;
+ pthread_attr_init(&attr);
+ pthread_attr_setstacksize(&attr, 1024 * 1024);
+
+ 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;
return;
}
- pthread_mutex_lock(&mesh->mutex);
+ if(pthread_mutex_lock(&mesh->mutex) != 0) {
+ abort();
+ }
+
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);
+
+ if(pthread_join(mesh->thread, NULL) != 0) {
+ abort();
+ }
+
+ if(pthread_mutex_lock(&mesh->mutex) != 0) {
+ abort();
+ }
mesh->threadstarted = false;
}
meshlink_stop(mesh);
// lock is not released after this
- pthread_mutex_lock(&mesh->mutex);
+ if(pthread_mutex_lock(&mesh->mutex) != 0) {
+ abort();
+ }
// Close and free all resources used.
return;
}
- pthread_mutex_lock(&mesh->mutex);
+ if(pthread_mutex_lock(&mesh->mutex) != 0) {
+ abort();
+ }
+
mesh->receive_cb = cb;
pthread_mutex_unlock(&mesh->mutex);
}
return;
}
- pthread_mutex_lock(&mesh->mutex);
+ if(pthread_mutex_lock(&mesh->mutex) != 0) {
+ abort();
+ }
+
mesh->connection_try_cb = cb;
pthread_mutex_unlock(&mesh->mutex);
}
return;
}
- pthread_mutex_lock(&mesh->mutex);
+ if(pthread_mutex_lock(&mesh->mutex) != 0) {
+ abort();
+ }
+
mesh->node_status_cb = cb;
pthread_mutex_unlock(&mesh->mutex);
}
return;
}
- pthread_mutex_lock(&mesh->mutex);
+ if(pthread_mutex_lock(&mesh->mutex) != 0) {
+ abort();
+ }
+
mesh->node_pmtu_cb = cb;
pthread_mutex_unlock(&mesh->mutex);
}
return;
}
- pthread_mutex_lock(&mesh->mutex);
+ if(pthread_mutex_lock(&mesh->mutex) != 0) {
+ abort();
+ }
+
mesh->node_duplicate_cb = cb;
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->mutex);
+ if(pthread_mutex_lock(&mesh->mutex) != 0) {
+ abort();
+ }
+
mesh->log_cb = cb;
mesh->log_level = cb ? level : 0;
pthread_mutex_unlock(&mesh->mutex);
return;
}
- pthread_mutex_lock(&mesh->mutex);
+ if(pthread_mutex_lock(&mesh->mutex) != 0) {
+ abort();
+ }
+
mesh->error_cb = cb;
pthread_mutex_unlock(&mesh->mutex);
}
return -1;
}
- pthread_mutex_lock(&mesh->mutex);
+ if(pthread_mutex_lock(&mesh->mutex) != 0) {
+ abort();
+ }
node_t *n = (node_t *)destination;
return NULL;
}
- pthread_mutex_lock(&mesh->mutex);
+ if(pthread_mutex_lock(&mesh->mutex) != 0) {
+ abort();
+ }
node_t *n = (node_t *)node;
node_t *n = NULL;
- pthread_mutex_lock(&mesh->mutex);
+ if(pthread_mutex_lock(&mesh->mutex) != 0) {
+ abort();
+ }
+
n = lookup_node(mesh, (char *)name); // TODO: make lookup_node() use const
pthread_mutex_unlock(&mesh->mutex);
meshlink_submesh_t *submesh = NULL;
- pthread_mutex_lock(&mesh->mutex);
+ if(pthread_mutex_lock(&mesh->mutex) != 0) {
+ abort();
+ }
+
submesh = (meshlink_submesh_t *)lookup_submesh(mesh, name);
pthread_mutex_unlock(&mesh->mutex);
meshlink_node_t **result;
//lock mesh->nodes
- pthread_mutex_lock(&mesh->mutex);
+ if(pthread_mutex_lock(&mesh->mutex) != 0) {
+ abort();
+ }
*nmemb = mesh->nodes->count;
result = realloc(nodes, *nmemb * sizeof(*nodes));
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);
+ if(pthread_mutex_lock(&mesh->mutex) != 0) {
+ abort();
+ }
*nmemb = 0;
dev_class_t devclass;
- pthread_mutex_lock(&mesh->mutex);
+ if(pthread_mutex_lock(&mesh->mutex) != 0) {
+ abort();
+ }
devclass = ((node_t *)node)->devclass;
node_t *n = (node_t *)node;
bool reachable;
- pthread_mutex_lock(&mesh->mutex);
+ if(pthread_mutex_lock(&mesh->mutex) != 0) {
+ abort();
+ }
+
reachable = n->status.reachable && !n->status.blacklisted;
if(last_reachable) {
return false;
}
- pthread_mutex_lock(&mesh->mutex);
+ if(pthread_mutex_lock(&mesh->mutex) != 0) {
+ abort();
+ }
if(!ecdsa_sign(mesh->private_key, data, len, signature)) {
meshlink_errno = MESHLINK_EINTERNAL;
return false;
}
- pthread_mutex_lock(&mesh->mutex);
+ if(pthread_mutex_lock(&mesh->mutex) != 0) {
+ abort();
+ }
bool rval = false;
}
static bool refresh_invitation_key(meshlink_handle_t *mesh) {
- pthread_mutex_lock(&mesh->mutex);
+ if(pthread_mutex_lock(&mesh->mutex) != 0) {
+ abort();
+ }
size_t count = invitation_purge_old(mesh, time(NULL) - mesh->invitation_timeout);
canonical_address = xstrdup(address);
}
- pthread_mutex_lock(&mesh->mutex);
+ if(pthread_mutex_lock(&mesh->mutex) != 0) {
+ abort();
+ }
node_t *n = (node_t *)node;
free(n->canonical_address);
combo = xstrdup(address);
}
- pthread_mutex_lock(&mesh->mutex);
+ if(pthread_mutex_lock(&mesh->mutex) != 0) {
+ abort();
+ }
if(!mesh->invitation_addresses) {
mesh->invitation_addresses = list_alloc((list_action_t)free);
return;
}
- pthread_mutex_lock(&mesh->mutex);
+ if(pthread_mutex_lock(&mesh->mutex) != 0) {
+ abort();
+ }
if(mesh->invitation_addresses) {
list_delete_list(mesh->invitation_addresses);
int port;
- pthread_mutex_lock(&mesh->mutex);
+ if(pthread_mutex_lock(&mesh->mutex) != 0) {
+ abort();
+ }
+
port = atoi(mesh->myport);
pthread_mutex_unlock(&mesh->mutex);
bool rval = false;
- pthread_mutex_lock(&mesh->mutex);
+ if(pthread_mutex_lock(&mesh->mutex) != 0) {
+ abort();
+ }
if(mesh->threadstarted) {
meshlink_errno = MESHLINK_EINVAL;
s = (meshlink_submesh_t *)mesh->self->submesh;
}
- pthread_mutex_lock(&mesh->mutex);
+ if(pthread_mutex_lock(&mesh->mutex) != 0) {
+ abort();
+ }
// Check validity of the new node's name
if(!check_id(name)) {
//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);
+ if(pthread_mutex_lock(&mesh->mutex) != 0) {
+ abort();
+ }
//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)) {
packmsg_add_str(&out, mesh->name);
packmsg_add_str(&out, CORE_MESH);
- pthread_mutex_lock(&mesh->mutex);
+ if(pthread_mutex_lock(&mesh->mutex) != 0) {
+ abort();
+ }
packmsg_add_int32(&out, mesh->self->devclass);
packmsg_add_bool(&out, mesh->self->status.blacklisted);
return false;
}
- pthread_mutex_lock(&mesh->mutex);
+ if(pthread_mutex_lock(&mesh->mutex) != 0) {
+ abort();
+ }
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);
return false;
}
- pthread_mutex_lock(&mesh->mutex);
+ if(pthread_mutex_lock(&mesh->mutex) != 0) {
+ abort();
+ }
if(!blacklist(mesh, (node_t *)node)) {
pthread_mutex_unlock(&mesh->mutex);
return false;
}
- pthread_mutex_lock(&mesh->mutex);
+ if(pthread_mutex_lock(&mesh->mutex) != 0) {
+ abort();
+ }
node_t *n = lookup_node(mesh, (char *)name);
return false;
}
- pthread_mutex_lock(&mesh->mutex);
+ if(pthread_mutex_lock(&mesh->mutex) != 0) {
+ abort();
+ }
if(!whitelist(mesh, (node_t *)node)) {
pthread_mutex_unlock(&mesh->mutex);
return false;
}
- pthread_mutex_lock(&mesh->mutex);
+ if(pthread_mutex_lock(&mesh->mutex) != 0) {
+ abort();
+ }
node_t *n = lookup_node(mesh, (char *)name);
node_t *n = (node_t *)node;
- pthread_mutex_lock(&mesh->mutex);
+ if(pthread_mutex_lock(&mesh->mutex) != 0) {
+ abort();
+ }
/* Check that the node is not reachable */
if(n->status.reachable || n->connection) {
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);
}
}
}
return;
}
- pthread_mutex_lock(&mesh->mutex);
+ if(pthread_mutex_lock(&mesh->mutex) != 0) {
+ abort();
+ }
node_t *n = (node_t *)node;
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;
}
-static void aio_abort(meshlink_handle_t *mesh, meshlink_channel_t *channel, meshlink_aio_buffer_t **aio) {
- while(*aio) {
- meshlink_aio_buffer_t *next = (*aio)->next;
- aio_signal(mesh, channel, *aio);
- free(*aio);
- *aio = next;
+/* 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) {
while(channel->aio_receive) {
if(!len) {
/* This receive callback signalled an error, abort all outstanding AIO buffers. */
- aio_abort(mesh, channel, &channel->aio_receive);
+ if(!aio_abort(mesh, channel, &channel->aio_receive)) {
+ return len;
+ }
+
break;
}
ssize_t result = write(aio->fd, p, todo);
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));
- channel->aio_receive = aio->next;
- aio_signal(mesh, channel, aio);
- free(aio);
+
+ if(!aio_finish_one(mesh, channel, &channel->aio_receive)) {
+ return len;
+ }
+
continue;
}
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;
+ }
}
if(!left) {
while(channel->aio_send) {
if(!len) {
/* This poll callback signalled an error, abort all outstanding AIO buffers. */
- aio_abort(mesh, channel, &channel->aio_send);
+ if(!aio_abort(mesh, channel, &channel->aio_send)) {
+ return;
+ }
+
break;
}
if(aio->data) {
sent = utcp_send(connection, (char *)aio->data + aio->done, todo);
} else {
+ /* 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);
todo = result;
sent = utcp_send(connection, buf, todo);
} else {
+ 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));
}
- channel->aio_send = aio->next;
- aio_signal(mesh, channel, aio);
- free(aio);
- aio = channel->aio_send;
+ if(!aio_finish_one(mesh, channel, &channel->aio_send)) {
+ return;
+ }
+
continue;
}
}
if(sent != (ssize_t)todo) {
/* We should never get a partial send at this point */
- assert(sent < 0);
+ assert(sent <= 0);
/* Sending failed, abort all outstanding AIO buffers and send a poll callback. */
- aio_abort(mesh, channel, &channel->aio_send);
+ if(!aio_abort(mesh, channel, &channel->aio_send)) {
+ return;
+ }
+
len = 0;
break;
}
}
/* Signal completion of this buffer, and go to the next one. */
- channel->aio_send = aio->next;
- aio_signal(mesh, channel, aio);
- free(aio);
+ if(!aio_finish_one(mesh, channel, &channel->aio_send)) {
+ return;
+ }
if(!len) {
return;
return;
}
- pthread_mutex_lock(&mesh->mutex);
+ if(pthread_mutex_lock(&mesh->mutex) != 0) {
+ abort();
+ }
+
channel->poll_cb = cb;
utcp_set_poll_cb(channel->c, (cb || channel->aio_send) ? channel_poll : NULL);
pthread_mutex_unlock(&mesh->mutex);
return;
}
- pthread_mutex_lock(&mesh->mutex);
+ if(pthread_mutex_lock(&mesh->mutex) != 0) {
+ abort();
+ }
+
mesh->channel_accept_cb = cb;
mesh->receive_cb = channel_receive;
return;
}
- pthread_mutex_lock(&mesh->mutex);
+ if(pthread_mutex_lock(&mesh->mutex) != 0) {
+ abort();
+ }
+
utcp_set_sndbuf(channel->c, size);
pthread_mutex_unlock(&mesh->mutex);
}
return;
}
- pthread_mutex_lock(&mesh->mutex);
+ if(pthread_mutex_lock(&mesh->mutex) != 0) {
+ abort();
+ }
+
utcp_set_rcvbuf(channel->c, size);
pthread_mutex_unlock(&mesh->mutex);
}
return NULL;
}
- pthread_mutex_lock(&mesh->mutex);
+ if(pthread_mutex_lock(&mesh->mutex) != 0) {
+ abort();
+ }
node_t *n = (node_t *)node;
return;
}
- pthread_mutex_lock(&mesh->mutex);
+ if(pthread_mutex_lock(&mesh->mutex) != 0) {
+ abort();
+ }
+
utcp_shutdown(channel->c, direction);
pthread_mutex_unlock(&mesh->mutex);
}
return;
}
- pthread_mutex_lock(&mesh->mutex);
+ if(pthread_mutex_lock(&mesh->mutex) != 0) {
+ abort();
+ }
- utcp_close(channel->c);
+ if(channel->c) {
+ utcp_close(channel->c);
+ channel->c = NULL;
- /* Clean up any outstanding AIO buffers. */
- aio_abort(mesh, channel, &channel->aio_send);
- aio_abort(mesh, channel, &channel->aio_receive);
+ /* Clean up any outstanding AIO buffers. */
+ aio_abort(mesh, channel, &channel->aio_send);
+ aio_abort(mesh, channel, &channel->aio_receive);
+ }
- pthread_mutex_unlock(&mesh->mutex);
+ if(!channel->in_callback) {
+ free(channel);
+ }
- free(channel);
+ pthread_mutex_unlock(&mesh->mutex);
}
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);
+ if(pthread_mutex_lock(&mesh->mutex) != 0) {
+ abort();
+ }
/* Disallow direct calls to utcp_send() while we still have AIO active. */
if(channel->aio_send) {
aio->cb.buffer = cb;
aio->priv = priv;
- pthread_mutex_lock(&mesh->mutex);
+ if(pthread_mutex_lock(&mesh->mutex) != 0) {
+ abort();
+ }
/* Append the AIO buffer descriptor to the end of the chain */
meshlink_aio_buffer_t **p = &channel->aio_send;
aio->cb.fd = cb;
aio->priv = priv;
- pthread_mutex_lock(&mesh->mutex);
+ if(pthread_mutex_lock(&mesh->mutex) != 0) {
+ abort();
+ }
/* Append the AIO buffer descriptor to the end of the chain */
meshlink_aio_buffer_t **p = &channel->aio_send;
aio->cb.buffer = cb;
aio->priv = priv;
- pthread_mutex_lock(&mesh->mutex);
+ if(pthread_mutex_lock(&mesh->mutex) != 0) {
+ abort();
+ }
/* Append the AIO buffer descriptor to the end of the chain */
meshlink_aio_buffer_t **p = &channel->aio_receive;
aio->cb.fd = cb;
aio->priv = priv;
- pthread_mutex_lock(&mesh->mutex);
+ if(pthread_mutex_lock(&mesh->mutex) != 0) {
+ abort();
+ }
/* Append the AIO buffer descriptor to the end of the chain */
meshlink_aio_buffer_t **p = &channel->aio_receive;
node_t *n = (node_t *)node;
- pthread_mutex_lock(&mesh->mutex);
+ if(pthread_mutex_lock(&mesh->mutex) != 0) {
+ abort();
+ }
if(!n->utcp) {
n->utcp = utcp_init(channel_accept, channel_pre_accept, channel_send, n);
return;
}
- pthread_mutex_lock(&mesh->mutex);
+ if(pthread_mutex_lock(&mesh->mutex) != 0) {
+ abort();
+ }
if(mesh->discovery == enable) {
goto end;
return;
}
- pthread_mutex_lock(&mesh->mutex);
+ if(pthread_mutex_lock(&mesh->mutex) != 0) {
+ abort();
+ }
+
mesh->dev_class_traits[devclass].pinginterval = pinginterval;
mesh->dev_class_traits[devclass].pingtimeout = pingtimeout;
pthread_mutex_unlock(&mesh->mutex);
return;
}
- pthread_mutex_lock(&mesh->mutex);
+ if(pthread_mutex_lock(&mesh->mutex) != 0) {
+ abort();
+ }
+
mesh->dev_class_traits[devclass].fast_retry_period = fast_retry_period;
pthread_mutex_unlock(&mesh->mutex);
}
-extern void meshlink_set_inviter_commits_first(struct meshlink_handle *mesh, bool inviter_commits_first) {
+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;
+ }
+
+ if(pthread_mutex_lock(&mesh->mutex) != 0) {
+ abort();
+ }
+
+ mesh->dev_class_traits[devclass].maxtimeout = maxtimeout;
+ pthread_mutex_unlock(&mesh->mutex);
+}
+
+void meshlink_reset_timers(struct meshlink_handle *mesh) {
+ if(!mesh) {
+ return;
+ }
+
+ if(pthread_mutex_lock(&mesh->mutex) != 0) {
+ abort();
+ }
+
+ handle_network_change(mesh, true);
+ pthread_mutex_unlock(&mesh->mutex);
+}
+
+void meshlink_set_inviter_commits_first(struct meshlink_handle *mesh, bool inviter_commits_first) {
if(!mesh) {
meshlink_errno = EINVAL;
return;
}
- pthread_mutex_lock(&mesh->mutex);
+ if(pthread_mutex_lock(&mesh->mutex) != 0) {
+ abort();
+ }
+
mesh->inviter_commits_first = inviter_commits_first;
pthread_mutex_unlock(&mesh->mutex);
}
return;
}
- pthread_mutex_lock(&mesh->mutex);
+ if(pthread_mutex_lock(&mesh->mutex) != 0) {
+ abort();
+ }
+
free(mesh->external_address_url);
mesh->external_address_url = url ? xstrdup(url) : NULL;
pthread_mutex_unlock(&mesh->mutex);
}
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