Skeleton design for opening a reliable channel

[meshlink] / src / meshlink.c

diff --git a/src/meshlink.c b/src/meshlink.c
index 50a5a483c138b437808818f03a63f23239dd8867..7d717e5ac564c7957f468635651b56e995f53583 100644 (file)
--- a/src/meshlink.c
+++ b/src/meshlink.c
@@ -715,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");
@@ -723,17 +724,19 @@ 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;
@@ -792,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) {
@@ -828,6 +837,8 @@ void meshlink_close(meshlink_handle_t *mesh) {
        exit_configuration(&mesh->config);
        event_loop_exit(&mesh->loop);
 
+       free(mesh);
+
 #ifdef HAVE_MINGW
        WSACleanup();
 #endif
@@ -1359,6 +1370,16 @@ void meshlink_blacklist(meshlink_handle_t *mesh, meshlink_node_t *node) {
 
 }
 
+meshlink_connection_t* meshlink_open_rchannel(meshlink_handle_t *mesh, meshlink_node_t *destination, uint16_t dport) {
+
+//TODO: check in mesh->socketsbitmap for a free descriptor and allocate a source port for this connection
+
+//TODO: register a callback for the data that will be received from this connection
+
+//TODO: return a description value that the user will use to write on this channel
+
+}
+
 static void __attribute__((constructor)) meshlink_init(void) {
        crypto_init();
 }