#ifndef MSG_NOSIGNAL
#define MSG_NOSIGNAL 0
#endif
-
__thread meshlink_errno_t meshlink_errno;
meshlink_log_cb_t global_log_cb;
meshlink_log_level_t global_log_level;
+typedef bool (*search_node_by_condition_t)(const node_t *, const void *);
+
//TODO: this can go away completely
const var_t variables[] = {
/* Server configuration */
int fd;
};
+#ifdef HAVE_SETNS
static void *socket_in_netns_thread(void *arg) {
struct socket_in_netns_params *params = arg;
if(setns(params->netns, CLONE_NEWNET) == -1) {
meshlink_errno = MESHLINK_EINVAL;
- } else {
- params->fd = socket(params->domain, params->type, params->protocol);
+ return NULL;
}
+ params->fd = socket(params->domain, params->type, params->protocol);
+
return NULL;
}
+#endif // HAVE_SETNS
static int socket_in_netns(int domain, int type, int protocol, int netns) {
if(netns == -1) {
return socket(domain, type, protocol);
}
+#ifdef HAVE_SETNS
struct socket_in_netns_params params = {domain, type, protocol, netns, -1};
pthread_t thr;
}
return params.fd;
+#else
+ return -1;
+#endif // HAVE_SETNS
+
}
// Find out what local address a socket would use if we connect to the given address.
return false;
}
- while(ai) {
- int fd = socket(ai->ai_family, SOCK_STREAM, IPPROTO_TCP);
+ //while(ai) {
+ for(struct addrinfo *aip = ai; aip; aip = aip->ai_next) {
+ int fd = socket(aip->ai_family, SOCK_STREAM, IPPROTO_TCP);
if(!fd) {
freeaddrinfo(ai);
return false;
}
- int result = bind(fd, ai->ai_addr, ai->ai_addrlen);
+ int result = bind(fd, aip->ai_addr, aip->ai_addrlen);
closesocket(fd);
if(result) {
freeaddrinfo(ai);
return false;
}
-
- ai = ai->ai_next;
}
freeaddrinfo(ai);
return finalize_join(mesh);
case 2:
- logger(mesh, MESHLINK_DEBUG, "Invitation succesfully accepted.\n");
+ logger(mesh, MESHLINK_DEBUG, "Invitation successfully accepted.\n");
shutdown(mesh->sock, SHUT_RDWR);
mesh->success = true;
break;
return true;
}
+#ifdef HAVE_SETNS
static void *setup_network_in_netns_thread(void *arg) {
meshlink_handle_t *mesh = arg;
add_local_addresses(mesh);
return success ? arg : NULL;
}
+#endif // HAVE_SETNS
meshlink_open_params_t *meshlink_open_params_init(const char *confbase, const char *name, const char *appname, dev_class_t devclass) {
if(!confbase || !*confbase) {
meshlink_handle_t *meshlink_open(const char *confbase, 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.confbase = (char *)confbase;
params.name = (char *)name;
bool success = false;
if(mesh->netns != -1) {
+#ifdef HAVE_SETNS
pthread_t thr;
if(pthread_create(&thr, NULL, setup_network_in_netns_thread, mesh) == 0) {
void *retval = NULL;
success = pthread_join(thr, &retval) == 0 && retval;
}
+
+#else
+ meshlink_errno = MESHLINK_EINTERNAL;
+ return NULL;
+
+#endif // HAVE_SETNS
} else {
success = setup_network(mesh);
add_local_addresses(mesh);
return NULL;
}
- s = (meshlink_submesh_t *)lookup_submesh(mesh, submesh);
-
- if(s) {
- logger(NULL, MESHLINK_ERROR, "SubMesh Already exists!\n");
- meshlink_errno = MESHLINK_EEXIST;
- return NULL;
- }
+ //lock mesh->nodes
+ pthread_mutex_lock(&(mesh->mesh_mutex));
- s = (meshlink_submesh_t *)new_submesh();
- s->name = xstrdup(submesh);
+ s = (meshlink_submesh_t *)create_submesh(mesh, submesh);
- submesh_add(mesh, (submesh_t *)s);
+ pthread_mutex_unlock(&(mesh->mesh_mutex));
- meshlink_errno = MESHLINK_OK;
return s;
}
meshlink_handle_t *mesh = arg;
if(mesh->netns != -1) {
+#ifdef HAVE_SETNS
+
if(setns(mesh->netns, CLONE_NEWNET) != 0) {
return NULL;
}
+
+#else
+ return NULL;
+#endif // HAVE_SETNS
}
pthread_mutex_lock(&(mesh->mesh_mutex));
pthread_mutex_unlock(&(mesh->mesh_mutex));
}
+void meshlink_set_connection_try_cb(meshlink_handle_t *mesh, meshlink_connection_try_cb_t cb) {
+ if(!mesh) {
+ meshlink_errno = MESHLINK_EINVAL;
+ return;
+ }
+
+ pthread_mutex_lock(&(mesh->mesh_mutex));
+ mesh->connection_try_cb = cb;
+ pthread_mutex_unlock(&(mesh->mesh_mutex));
+}
+
void meshlink_set_node_status_cb(meshlink_handle_t *mesh, meshlink_node_status_cb_t cb) {
if(!mesh) {
meshlink_errno = MESHLINK_EINVAL;
return node;
}
+meshlink_submesh_t *meshlink_get_submesh(meshlink_handle_t *mesh, const char *name) {
+ if(!mesh || !name) {
+ meshlink_errno = MESHLINK_EINVAL;
+ return NULL;
+ }
+
+ meshlink_submesh_t *submesh = NULL;
+
+ pthread_mutex_lock(&(mesh->mesh_mutex));
+ submesh = (meshlink_submesh_t *)lookup_submesh(mesh, name);
+ pthread_mutex_unlock(&(mesh->mesh_mutex));
+ return submesh;
+}
+
meshlink_node_t **meshlink_get_all_nodes(meshlink_handle_t *mesh, meshlink_node_t **nodes, size_t *nmemb) {
if(!mesh || !nmemb || (*nmemb && !nodes)) {
meshlink_errno = MESHLINK_EINVAL;
return result;
}
-meshlink_node_t **meshlink_get_all_nodes_by_dev_class(meshlink_handle_t *mesh, dev_class_t devclass, meshlink_node_t **nodes, size_t *nmemb) {
- if(!mesh || ((int)devclass < 0) || (devclass > _DEV_CLASS_MAX) || !nmemb) {
- meshlink_errno = MESHLINK_EINVAL;
- return NULL;
- }
-
+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));
*nmemb = 0;
for splay_each(node_t, n, mesh->nodes) {
- if(n->devclass == devclass) {
+ if(true == search_node(n, condition)) {
*nmemb = *nmemb + 1;
}
}
meshlink_node_t **p = result;
for splay_each(node_t, n, mesh->nodes) {
- if(n->devclass == devclass) {
+ if(true == search_node(n, condition)) {
*p++ = (meshlink_node_t *)n;
}
}
return result;
}
+static bool search_node_by_dev_class(const node_t *node, const void *condition) {
+ dev_class_t *devclass = (dev_class_t *)condition;
+
+ if(*devclass == node->devclass) {
+ return true;
+ }
+
+ return false;
+}
+
+static bool search_node_by_submesh(const node_t *node, const void *condition) {
+ if(condition == node->submesh) {
+ return true;
+ }
+
+ return false;
+}
+
+meshlink_node_t **meshlink_get_all_nodes_by_dev_class(meshlink_handle_t *mesh, dev_class_t devclass, meshlink_node_t **nodes, size_t *nmemb) {
+ if(!mesh || ((int)devclass < 0) || (devclass > _DEV_CLASS_MAX) || !nmemb) {
+ meshlink_errno = MESHLINK_EINVAL;
+ return NULL;
+ }
+
+ return meshlink_get_all_nodes_by_condition(mesh, &devclass, nodes, nmemb, search_node_by_dev_class);
+}
+
+meshlink_node_t **meshlink_get_all_nodes_by_submesh(meshlink_handle_t *mesh, meshlink_submesh_t *submesh, meshlink_node_t **nodes, size_t *nmemb) {
+ if(!mesh || !submesh || !nmemb) {
+ meshlink_errno = MESHLINK_EINVAL;
+ return NULL;
+ }
+
+ return meshlink_get_all_nodes_by_condition(mesh, submesh, nodes, nmemb, search_node_by_submesh);
+}
+
dev_class_t meshlink_get_node_dev_class(meshlink_handle_t *mesh, meshlink_node_t *node) {
if(!mesh || !node) {
meshlink_errno = MESHLINK_EINVAL;
return devclass;
}
+meshlink_submesh_t *meshlink_get_node_submesh(meshlink_handle_t *mesh, meshlink_node_t *node) {
+ if(!mesh || !node) {
+ meshlink_errno = MESHLINK_EINVAL;
+ return NULL;
+ }
+
+ node_t *n = (node_t *)node;
+
+ meshlink_submesh_t *s;
+
+ s = (meshlink_submesh_t *)n->submesh;
+
+ return s;
+}
+
bool meshlink_sign(meshlink_handle_t *mesh, const void *data, size_t len, void *signature, size_t *siglen) {
if(!mesh || !data || !len || !signature || !siglen) {
meshlink_errno = MESHLINK_EINVAL;
}
if(!stat(invname, &st)) {
- if(mesh->invitation_key && deadline < st.st_mtime) {
+ if(mesh->invitation_key && deadline < (time_t)st.st_mtime) {
count++;
} else {
unlink(invname);
done:
pthread_mutex_unlock(&(mesh->mesh_mutex));
- return rval;
+ return rval && meshlink_get_port(mesh) == port;
}
void meshlink_set_invitation_timeout(meshlink_handle_t *mesh, int timeout) {
meshlink_errno = MESHLINK_EINVAL;
return NULL;
}
+ } else {
+ s = (meshlink_submesh_t *)mesh->self->submesh;
}
pthread_mutex_lock(&(mesh->mesh_mutex));
// TODO: more finegrained locking.
// Ideally we want to put the data into the UTCP connection's send buffer.
- // Then, preferrably only if there is room in the receiver window,
+ // Then, preferably only if there is room in the receiver window,
// kick the meshlink thread to go send packets.
pthread_mutex_lock(&mesh->mesh_mutex);
return channel->c->flags;
}
+size_t meshlink_channel_get_sendq(meshlink_handle_t *mesh, meshlink_channel_t *channel) {
+ if(!mesh || !channel) {
+ meshlink_errno = MESHLINK_EINVAL;
+ return -1;
+ }
+
+ return utcp_get_sendq(channel->c);
+}
+
+size_t meshlink_channel_get_recvq(meshlink_handle_t *mesh, meshlink_channel_t *channel) {
+ if(!mesh || !channel) {
+ meshlink_errno = MESHLINK_EINVAL;
+ return -1;
+ }
+
+ return utcp_get_recvq(channel->c);
+}
+
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);
projects / meshlink / blobdiff