Merge branch 'discovery' into everbase

[meshlink] / src / meshlink.c

diff --git a/src/meshlink.c b/src/meshlink.c
index 33af6c36272a4c05aac9c1f1cfab87c0f5f5ccf4..d5ea5418e974c398ba181aa131dacf1cdd321df8 100644 (file)
--- a/src/meshlink.c
+++ b/src/meshlink.c
@@ -350,12 +350,7 @@ static bool try_bind(int port) {
 }
 
 static int check_port(meshlink_handle_t *mesh) {
-       if(try_bind(655))
-               return 655;
-
-       fprintf(stderr, "Warning: could not bind to port 655.\n");
-
-       for(int i = 0; i < 100; i++) {
+       for(int i = 0; i < 1000; i++) {
                int port = 0x1000 + (rand() & 0x7fff);
                if(try_bind(port)) {
                        char filename[PATH_MAX];
@@ -368,7 +363,6 @@ static int check_port(meshlink_handle_t *mesh) {
 
                        fprintf(f, "Port = %d\n", port);
                        fclose(f);
-                       fprintf(stderr, "MeshLink will instead listen on port %d.\n", port);
                        return port;
                }
        }
@@ -744,6 +738,11 @@ static bool meshlink_setup(meshlink_handle_t *mesh) {
 }
 
 meshlink_handle_t *meshlink_open(const char *confbase, const char *name, const char* appname) {
+       return meshlink_open_with_size(confbase, name, appname, sizeof(meshlink_handle_t));
+}
+
+meshlink_handle_t *meshlink_open_with_size(const char *confbase, const char *name, const char* appname, size_t size) {
+
        // Validate arguments provided by the application
        bool usingname = false;
 
@@ -772,11 +771,10 @@ meshlink_handle_t *meshlink_open(const char *confbase, const char *name, const c
                } else { usingname = true;}
        }
 
-       meshlink_handle_t *mesh = xzalloc(sizeof *mesh);
+       meshlink_handle_t *mesh = xzalloc(size);
        mesh->confbase = xstrdup(confbase);
        mesh->appname = xstrdup(appname);
        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);
@@ -837,7 +835,9 @@ static void *meshlink_main_loop(void *arg) {
 
        try_outgoing_connections(mesh);
 
+       fprintf(stderr, "Starting main_loop...\n");
        main_loop(mesh);
+       fprintf(stderr, "main_loop returned.\n");
 
        return NULL;
 }
@@ -876,6 +876,7 @@ bool meshlink_start(meshlink_handle_t *mesh) {
 }
 
 void meshlink_stop(meshlink_handle_t *mesh) {
+       
        if(!mesh) {
                meshlink_errno = MESHLINK_EINVAL;
                return;
@@ -884,16 +885,25 @@ void meshlink_stop(meshlink_handle_t *mesh) {
        // Stop discovery
        discovery_stop(mesh);
 
-       // Shut down the listening sockets to signal the main thread to shut down
+       // Shut down a listening socket to signal the main thread to shut down
 
-       for(int i = 0; i < mesh->listen_sockets; i++) {
-               shutdown(mesh->listen_socket[i].tcp.fd, SHUT_RDWR);
-               shutdown(mesh->listen_socket[i].udp.fd, SHUT_RDWR);
-       }
+       listen_socket_t *s = &mesh->listen_socket[0];
+       shutdown(s->tcp.fd, SHUT_RDWR);
 
        // Wait for the main thread to finish
 
        pthread_join(mesh->thread, NULL);
+       mesh->threadstarted = false;
+
+       // Fix the socket
+       
+       closesocket(s->tcp.fd);
+       io_del(&mesh->loop, &s->tcp);
+       s->tcp.fd = setup_listen_socket(&s->sa);
+       if(s->tcp.fd < 0)
+               logger(DEBUG_ALWAYS, LOG_ERR, "Could not repair listenen socket!");
+       else
+               io_add(&mesh->loop, &s->tcp, handle_new_meta_connection, s, s->tcp.fd, IO_READ);
 }
 
 void meshlink_close(meshlink_handle_t *mesh) {
@@ -968,19 +978,15 @@ bool meshlink_send(meshlink_handle_t *mesh, meshlink_node_t *destination, const
                return false;
        }
 
-       /* 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));
+       if(!meshlink_queue_push(&mesh->outpacketqueue, packet_in_queue)) {
+               free(packet_in_queue);
+               return false;
+       }
 
        //notify event loop
        signal_trigger(&(mesh->loop),&(mesh->datafromapp));
@@ -991,10 +997,9 @@ 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;
 
-       outpacketqueue_t* p = list_get_tail(mesh->outpacketqueue);
-       if (p)
-       list_delete_tail(mesh->outpacketqueue);
-       else return ;
+       outpacketqueue_t* p = meshlink_queue_pop(&mesh->outpacketqueue);
+       if(!p)
+               return;
 
        if (sizeof(meshlink_packethdr_t) + p->len > MAXSIZE) {
                //log something
@@ -1403,7 +1408,7 @@ bool meshlink_join(meshlink_handle_t *mesh, const char *invitation) {
        }
 
        if(!port)
-               port = "655";
+               goto invalid;
 
        if(!b64decode(slash, mesh->hash, 18) || !b64decode(slash + 24, mesh->cookie, 18))
                goto invalid;