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);
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");
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();
+ if(!read_ecdsa_private_key(mesh))
+ return false;
+ 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;
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;
return mesh;
}
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) {
return false;
}
+ mesh->threadstarted=true;
+
return true;
}
exit_configuration(&mesh->config);
event_loop_exit(&mesh->loop);
+ free(mesh);
+
#ifdef HAVE_MINGW
WSACleanup();
#endif
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;
}