X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fmeshlink.c;h=7ea3e440b0f941d773c06eba53a267b0199b7508;hb=9ba6a16d3c748d026f88b9cd96f908e95ef25521;hp=21838ab7d34b919251a0857c5863904020b35030;hpb=f1101fcd6147b5b2cf767caf1db7a42508bd640d;p=meshlink

diff --git a/src/meshlink.c b/src/meshlink.c
index 21838ab7..7ea3e440 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);
@@ -750,6 +715,7 @@ static bool meshlink_setup(meshlink_handle_t *mesh) {
 
 meshlink_handle_t *meshlink_open(const char *confbase, const char *name) {
 	// Validate arguments provided by the application
+	bool usingname = false;
 
 	if(!confbase || !*confbase) {
 		fprintf(stderr, "No confbase given!\n");
@@ -758,17 +724,22 @@ meshlink_handle_t *meshlink_open(const char *confbase, const char *name) {
 
 	if(!name || !*name) {
 		fprintf(stderr, "No name given!\n");
-		return NULL;
+		//return NULL;
 	}
+	else { //check name only if there is a name != NULL
 
-	if(!check_id(name)) {
-		fprintf(stderr, "Invalid name given!\n");
-		return NULL;
+		if(!check_id(name)) {
+			fprintf(stderr, "Invalid name given!\n");
+			return NULL;
+		} else { usingname = true;}
 	}
 
 	meshlink_handle_t *mesh = xzalloc(sizeof *mesh);
 	mesh->confbase = xstrdup(confbase);
-	mesh->name = xstrdup(name);
+	if (usingname) mesh->name = xstrdup(name);
+	pthread_mutex_init ( &(mesh->outpacketqueue_mutex), NULL);
+	pthread_mutex_init ( &(mesh->nodes_mutex), NULL);
+	mesh->threadstarted = false;
 	event_loop_init(&mesh->loop);
 	mesh->loop.data = mesh;
 
@@ -797,6 +768,11 @@ meshlink_handle_t *meshlink_open(const char *confbase, const char *name) {
 	if(!read_server_config(mesh))
 		return meshlink_close(mesh), NULL;
 
+#ifdef HAVE_MINGW
+	struct WSAData wsa_state;
+	WSAStartup(MAKEWORD(2, 2), &wsa_state);
+#endif
+
 	// Setup up everything
 	// TODO: we should not open listening sockets yet
 
@@ -819,6 +795,12 @@ void *meshlink_main_loop(void *arg) {
 bool meshlink_start(meshlink_handle_t *mesh) {
 	// TODO: open listening sockets first
 
+	//Check that a valid name is set
+	if(!mesh->name ) {
+		fprintf(stderr, "No name given!\n");
+		return false;
+	}
+
 	// Start the main thread
 
 	if(pthread_create(&mesh->thread, NULL, meshlink_main_loop, mesh) != 0) {
@@ -827,6 +809,8 @@ bool meshlink_start(meshlink_handle_t *mesh) {
 		return false;
 	}
 
+	mesh->threadstarted=true;
+
 	return true;
 }
 
@@ -852,6 +836,10 @@ void meshlink_close(meshlink_handle_t *mesh) {
 
 	exit_configuration(&mesh->config);
 	event_loop_exit(&mesh->loop);
+
+#ifdef HAVE_MINGW
+	WSACleanup();
+#endif
 }
 
 void meshlink_set_receive_cb(meshlink_handle_t *mesh, meshlink_receive_cb_t cb) {
@@ -868,25 +856,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_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) {
@@ -896,12 +911,17 @@ 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;
 }
 
@@ -919,14 +939,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;
@@ -978,18 +998,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);
@@ -1004,6 +1024,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)) {
@@ -1025,6 +1056,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;
 
@@ -1060,9 +1098,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)
@@ -1135,7 +1170,7 @@ bool meshlink_join(meshlink_handle_t *mesh, const char *invitation) {
 			*port++ = 0;
 	}
 
-	if(!*port)
+	if(!port)
 		port = "655";
 
 	if(!b64decode(slash, mesh->hash, 18) || !b64decode(slash + 24, mesh->cookie, 18))
@@ -1148,6 +1183,11 @@ bool meshlink_join(meshlink_handle_t *mesh, const char *invitation) {
 
 	char *b64key = ecdsa_get_base64_public_key(key);
 
+	//Before doing meshlink_join make sure we are not connected to another mesh
+	if ( mesh->threadstarted ){
+		goto invalid;
+	}
+
 	// Connect to the meshlink daemon mentioned in the URL.
 	struct addrinfo *ai = str2addrinfo(address, port, SOCK_STREAM);
 	if(!ai)
@@ -1238,16 +1278,82 @@ bool meshlink_join(meshlink_handle_t *mesh, const char *invitation) {
 	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) {