X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fmeshlink.c;h=dc897f478172e63fd2221b13e438dcdbd6687aaf;hb=refs%2Fheads%2Fapp2libraryqueue;hp=cd5b5642538a97ef441995bba9dca5c26e634e99;hpb=7593adb9ad9e6ff73afe29e9bd445cea8615a151;p=meshlink

diff --git a/src/meshlink.c b/src/meshlink.c
index cd5b5642..dc897f47 100644
--- a/src/meshlink.c
+++ b/src/meshlink.c
@@ -236,44 +236,9 @@ static char *get_my_hostname(meshlink_handle_t* mesh) {
 		}
 	}
 
-	//if(!tty) {
-	//	if(!hostname) {
-	//		fprintf(stderr, "Could not determine the external address or hostname. Please set Address manually.\n");
-	//		return NULL;
-	//	}
-	//	goto save;
-	//}
-
-again:
-	fprintf(stderr, "Please enter your host's external address or hostname");
-	if(hostname)
-		fprintf(stderr, " [%s]", hostname);
-	fprintf(stderr, ": ");
-
-	if(!fgets(line, sizeof line, stdin)) {
-		fprintf(stderr, "Error while reading stdin: %s\n", strerror(errno));
-		free(hostname);
+	if(!hostname)
 		return NULL;
-	}
-
-	if(!rstrip(line)) {
-		if(hostname)
-			goto save;
-		else
-			goto again;
-	}
-
-	for(char *p = line; *p; p++) {
-		if(isalnum(*p) || *p == '-' || *p == '.')
-			continue;
-		fprintf(stderr, "Invalid address or hostname.\n");
-		goto again;
-	}
-
-	free(hostname);
-	hostname = xstrdup(line);
 
-save:
 	f = fopen(filename, "a");
 	if(f) {
 		fprintf(f, "\nAddress = %s\n", hostname);
@@ -769,6 +734,7 @@ meshlink_handle_t *meshlink_open(const char *confbase, const char *name) {
 	meshlink_handle_t *mesh = xzalloc(sizeof *mesh);
 	mesh->confbase = xstrdup(confbase);
 	mesh->name = xstrdup(name);
+	pthread_mutex_init ( &(mesh->outpacketqueue_mutex), NULL);
 	event_loop_init(&mesh->loop);
 	mesh->loop.data = mesh;
 
@@ -877,25 +843,52 @@ void meshlink_set_log_cb(meshlink_handle_t *mesh, meshlink_log_level_t level, me
 }
 
 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_tail(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) {
@@ -928,14 +921,14 @@ static bool refresh_invitation_key(meshlink_handle_t *mesh) {
 	snprintf(filename, sizeof filename, "%s" SLASH "invitations", mesh->confbase);
 	if(mkdir(filename, 0700) && errno != EEXIST) {
 		fprintf(stderr, "Could not create directory %s: %s\n", filename, strerror(errno));
-		return NULL;
+		return false;
 	}
 
 	// Count the number of valid invitations, clean up old ones
 	DIR *dir = opendir(filename);
 	if(!dir) {
 		fprintf(stderr, "Could not read directory %s: %s\n", filename, strerror(errno));
-		return NULL;
+		return false;
 	}
 
 	errno = 0;
@@ -987,18 +980,18 @@ static bool refresh_invitation_key(meshlink_handle_t *mesh) {
 	if(!f) {
 		if(errno != ENOENT) {
 			fprintf(stderr, "Could not read %s: %s\n", filename, strerror(errno));
-			return NULL;
+			return false;
 		}
 
 		mesh->invitation_key = ecdsa_generate();
 		if(!mesh->invitation_key) {
 			fprintf(stderr, "Could not generate a new key!\n");
-			return NULL;
+			return false;
 		}
 		f = fopen(filename, "w");
 		if(!f) {
 			fprintf(stderr, "Could not write %s: %s\n", filename, strerror(errno));
-			return NULL;
+			return false;
 		}
 		chmod(filename, 0600);
 		ecdsa_write_pem_private_key(mesh->invitation_key, f);
@@ -1013,6 +1006,17 @@ static bool refresh_invitation_key(meshlink_handle_t *mesh) {
 	return mesh->invitation_key;
 }
 
+bool meshlink_add_address(meshlink_handle_t *mesh, const char *address) {
+	for(const char *p = address; *p; p++) {
+		if(isalnum(*p) || *p == '-' || *p == '.' || *p == ':')
+			continue;
+		fprintf(stderr, "Invalid character in address: %s\n", address);
+		return false;
+	}
+
+	return append_config_file(mesh, mesh->self->name, "Address", address);
+}
+
 char *meshlink_invite(meshlink_handle_t *mesh, const char *name) {
 	// Check validity of the new node's name
 	if(!check_id(name)) {
@@ -1034,6 +1038,13 @@ char *meshlink_invite(meshlink_handle_t *mesh, const char *name) {
 		return NULL;
 	}
 
+	// Get the local address
+	char *address = get_my_hostname(mesh);
+	if(!address) {
+		fprintf(stderr, "No Address known for ourselves!\n");
+		return NULL;
+	}
+
 	if(!refresh_invitation_key(mesh))
 		return NULL;
 
@@ -1069,9 +1080,6 @@ char *meshlink_invite(meshlink_handle_t *mesh, const char *name) {
 	if(!f)
 		abort();
 
-	// Get the local address
-	char *address = get_my_hostname(mesh);
-
 	// Fill in the details.
 	fprintf(f, "Name = %s\n", name);
 	//if(netname)