X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fmeshlink.c;h=af248044650af88ef395f27e6542f287bf3acb02;hb=1815910fc7409ffea2b386196c4d12af12578f42;hp=9a53d67aefae1c7e4e238fe9c784436c843bd58c;hpb=ef2f0d4510168a77a6da16822b9401d1f14b69e0;p=meshlink

diff --git a/src/meshlink.c b/src/meshlink.c
index 9a53d67a..af248044 100644
--- a/src/meshlink.c
+++ b/src/meshlink.c
@@ -508,6 +508,7 @@ static bool finalize_join(meshlink_handle_t *mesh) {
 	free(mesh->self->name);
 	free(mesh->self->connection->name);
 	mesh->self->name = xstrdup(name);
+	mesh->name = xstrdup(name);
 	mesh->self->connection->name = xstrdup(name);
 
 	fprintf(stderr, "Configuration stored in: %s\n", mesh->confbase);
@@ -715,6 +716,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");
@@ -723,19 +725,25 @@ 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);
+	mesh->self = new_node();
+	mesh->self->connection = new_connection();
+	init_nodes(mesh);
 	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;
 
@@ -769,11 +777,8 @@ meshlink_handle_t *meshlink_open(const char *confbase, const char *name) {
 	WSAStartup(MAKEWORD(2, 2), &wsa_state);
 #endif
 
-	// Setup up everything
-	// TODO: we should not open listening sockets yet
-
-	if(!setup_network(mesh))
-		return meshlink_close(mesh), NULL;
+	if(!read_ecdsa_private_key(mesh))
+		return false;
 
 	return mesh;
 }
@@ -791,6 +796,16 @@ 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;
+	}
+	// Setup up everything
+
+	if(!setup_network(mesh))
+		return meshlink_close(mesh), NULL;
+
 	// Start the main thread
 
 	if(pthread_create(&mesh->thread, NULL, meshlink_main_loop, mesh) != 0) {
@@ -799,6 +814,8 @@ bool meshlink_start(meshlink_handle_t *mesh) {
 		return false;
 	}
 
+	mesh->threadstarted=true;
+
 	return true;
 }
 
@@ -825,6 +842,8 @@ void meshlink_close(meshlink_handle_t *mesh) {
 	exit_configuration(&mesh->config);
 	event_loop_exit(&mesh->loop);
 
+	free(mesh);
+
 #ifdef HAVE_MINGW
 	WSACleanup();
 #endif
@@ -1172,8 +1191,7 @@ 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 ( pthread_kill(mesh->thread,0) == 0){
-		printf("HELLO\n");
+	if ( mesh->threadstarted ){
 		goto invalid;
 	}