meshlink_handle_t *mesh = xzalloc(sizeof *mesh);
mesh->confbase = xstrdup(confbase);
mesh->name = xstrdup(name);
+ pthread_mutex_init ( &(mesh->outpacketqueue_mutex), NULL);
+ pthread_mutex_init ( &(mesh->nodes_mutex), NULL);
event_loop_init(&mesh->loop);
mesh->loop.data = mesh;
}
bool meshlink_send(meshlink_handle_t *mesh, meshlink_node_t *destination, const void *data, unsigned int len) {
+
+ /* If there is no outgoing list yet, create one. */
+
+ if(!mesh->outpacketqueue)
+ mesh->outpacketqueue = list_alloc(NULL);
+
+ //add packet to the queue
+ outpacketqueue_t *packet_in_queue = xzalloc(sizeof *packet_in_queue);
+ packet_in_queue->destination=destination;
+ packet_in_queue->data=data;
+ packet_in_queue->len=len;
+ pthread_mutex_lock(&(mesh->outpacketqueue_mutex));
+ list_insert_head(mesh->outpacketqueue,packet_in_queue);
+ pthread_mutex_unlock(&(mesh->outpacketqueue_mutex));
+
+ //notify event loop
+ signal_trigger(&(mesh->loop),&(mesh->datafromapp));
+ return true;
+}
+
+void meshlink_send_from_queue(event_loop_t* el,meshlink_handle_t *mesh) {
vpn_packet_t packet;
meshlink_packethdr_t *hdr = (meshlink_packethdr_t *)packet.data;
- if (sizeof(meshlink_packethdr_t) + len > MAXSIZE) {
+
+ outpacketqueue_t* p = list_get_tail(mesh->outpacketqueue);
+ if (p)
+ list_delete_tail(mesh->outpacketqueue);
+ else return ;
+
+ if (sizeof(meshlink_packethdr_t) + p->len > MAXSIZE) {
//log something
- return false;
+ return ;
}
packet.probe = false;
memset(hdr, 0, sizeof *hdr);
- memcpy(hdr->destination, destination->name, sizeof hdr->destination);
+ memcpy(hdr->destination, p->destination->name, sizeof hdr->destination);
memcpy(hdr->source, mesh->self->name, sizeof hdr->source);
- packet.len = sizeof *hdr + len;
- memcpy(packet.data + sizeof *hdr, data, len);
+ packet.len = sizeof *hdr + p->len;
+ memcpy(packet.data + sizeof *hdr, p->data, p->len);
mesh->self->in_packets++;
mesh->self->in_bytes += packet.len;
route(mesh, mesh->self, &packet);
- return false;
+ return ;
}
meshlink_node_t *meshlink_get_node(meshlink_handle_t *mesh, const char *name) {
size_t meshlink_get_all_nodes(meshlink_handle_t *mesh, meshlink_node_t **nodes, size_t nmemb) {
size_t i = 0;
+ //lock mesh->nodes
+ pthread_mutex_lock(&(mesh->nodes_mutex));
+
for splay_each(node_t, n, mesh->nodes) {
if(i < nmemb)
nodes[i] = (meshlink_node_t *)n;
i++;
}
+ pthread_mutex_unlock(&(mesh->nodes_mutex));
+
return i;
}
*port++ = 0;
}
- if(!*port)
+ if(!port)
port = "655";
if(!b64decode(slash, mesh->hash, 18) || !b64decode(slash + 24, mesh->cookie, 18))
char *b64key = ecdsa_get_base64_public_key(key);
+ //Before doing meshlink_join make sure we are not connected to another mesh
+ if ( pthread_kill(mesh->thread,0) == 0){
+ printf("HELLO\n");
+ goto invalid;
+ }
+
// Connect to the meshlink daemon mentioned in the URL.
struct addrinfo *ai = str2addrinfo(address, port, SOCK_STREAM);
if(!ai)
return true;
invalid:
- fprintf(stderr, "Invalid invitation URL.\n");
+ fprintf(stderr, "Invalid invitation URL or you are already connected to a Mesh ?\n");
return false;
}
char *meshlink_export(meshlink_handle_t *mesh) {
- return NULL;
+ char filename[PATH_MAX];
+ snprintf(filename, sizeof filename, "%s" SLASH "hosts" SLASH "%s", mesh->confbase, mesh->self->name);
+ FILE *f = fopen(filename, "r");
+ if(!f) {
+ fprintf(stderr, "Could not open %s: %s\n", filename, strerror(errno));
+ return NULL;
+ }
+
+ fseek(f, 0, SEEK_END);
+ int fsize = ftell(f);
+ rewind(f);
+
+ size_t len = fsize + 9 + strlen(mesh->self->name);
+ char *buf = xmalloc(len);
+ snprintf(buf, len, "Name = %s\n", mesh->self->name);
+ if(fread(buf + len - fsize - 1, fsize, 1, f) != 1) {
+ fprintf(stderr, "Error reading from %s: %s\n", filename, strerror(errno));
+ fclose(f);
+ return NULL;
+ }
+
+ fclose(f);
+ buf[len - 1] = 0;
+ return buf;
}
bool meshlink_import(meshlink_handle_t *mesh, const char *data) {
- return false;
+ if(strncmp(data, "Name = ", 7)) {
+ fprintf(stderr, "Invalid data\n");
+ return false;
+ }
+
+ char *end = strchr(data + 7, '\n');
+ if(!end) {
+ fprintf(stderr, "Invalid data\n");
+ return false;
+ }
+
+ int len = end - (data + 7);
+ char name[len + 1];
+ memcpy(name, data + 7, len);
+ name[len] = 0;
+ if(!check_id(name)) {
+ fprintf(stderr, "Invalid Name\n");
+ return false;
+ }
+
+ char filename[PATH_MAX];
+ snprintf(filename, sizeof filename, "%s" SLASH "hosts" SLASH "%s", mesh->confbase, name);
+ if(!access(filename, F_OK)) {
+ fprintf(stderr, "File %s already exists, not importing\n", filename);
+ return false;
+ }
+
+ if(errno != ENOENT) {
+ fprintf(stderr, "Error accessing %s: %s\n", filename, strerror(errno));
+ return false;
+ }
+
+ FILE *f = fopen(filename, "w");
+ if(!f) {
+ fprintf(stderr, "Could not create %s: %s\n", filename, strerror(errno));
+ return false;
+ }
+
+ fwrite(end + 1, strlen(end + 1), 1, f);
+ fclose(f);
+
+ load_all_nodes(mesh);
+
+ return true;
}
void meshlink_blacklist(meshlink_handle_t *mesh, meshlink_node_t *node) {
projects / meshlink / blobdiff