Merge remote-tracking branch 'origin/everbase' into discovery

[meshlink] / src / meshlink.c

diff --git a/src/meshlink.c b/src/meshlink.c
index e5ff36f03452c5e94a0039a7e80b15c0fbe32005..f9e7e9054d291c308b6987a6d4460794e6c030f7 100644 (file)
--- a/src/meshlink.c
+++ b/src/meshlink.c
@@ -39,6 +39,7 @@ typedef struct {
 #include "utils.h"
 #include "xalloc.h"
 #include "ed25519/sha512.h"
+#include "discovery.h"
 
 #ifndef MSG_NOSIGNAL
 #define MSG_NOSIGNAL 0
@@ -783,12 +784,15 @@ meshlink_handle_t *meshlink_open(const char *confbase, const char *name) {
        if(access(filename, R_OK)) {
                if(errno == ENOENT) {
                        // If not, create it
-                       if(!meshlink_setup(mesh))
+                       if(!meshlink_setup(mesh)) {
                                // meshlink_errno is set by meshlink_setup()
                                return NULL;
+                       }
                } else {
                        fprintf(stderr, "Cannot not read from %s: %s\n", filename, strerror(errno));
-                       return meshlink_close(mesh), NULL;
+                       meshlink_close(mesh);
+                       meshlink_errno = MESHLINK_ESTORAGE;
+                       return NULL;
                }
        }
 
@@ -796,8 +800,11 @@ meshlink_handle_t *meshlink_open(const char *confbase, const char *name) {
 
        init_configuration(&mesh->config);
 
-       if(!read_server_config(mesh))
-               return meshlink_close(mesh), NULL;
+       if(!read_server_config(mesh)) {
+               meshlink_close(mesh);
+               meshlink_errno = MESHLINK_ESTORAGE;
+               return NULL;
+       };
 
 #ifdef HAVE_MINGW
        struct WSAData wsa_state;
@@ -807,8 +814,11 @@ meshlink_handle_t *meshlink_open(const char *confbase, const char *name) {
        // Setup up everything
        // TODO: we should not open listening sockets yet
 
-       if(!setup_network(mesh))
-               return meshlink_close(mesh), NULL;
+       if(!setup_network(mesh)) {
+               meshlink_close(mesh);
+               meshlink_errno = MESHLINK_ENETWORK;
+               return NULL;
+       }
 
        return mesh;
 }
@@ -849,6 +859,10 @@ bool meshlink_start(meshlink_handle_t *mesh) {
 
        mesh->threadstarted=true;
 
+       // Start discovery
+       if(!discovery_start(mesh))
+               return false;
+
        return true;
 }
 
@@ -858,6 +872,9 @@ void meshlink_stop(meshlink_handle_t *mesh) {
                return;
        }
 
+       // Stop discovery
+       discovery_stop(mesh);
+
        // Shut down the listening sockets to signal the main thread to shut down
 
        for(int i = 0; i < mesh->listen_sockets; i++) {
@@ -1004,6 +1021,27 @@ ssize_t meshlink_get_pmtu(meshlink_handle_t *mesh, meshlink_node_t *destination)
                return MTU;
 }
 
+char *meshlink_get_fingerprint(meshlink_handle_t *mesh, meshlink_node_t *node) {
+       if(!mesh || !node) {
+               meshlink_errno = MESHLINK_EINVAL;
+               return NULL;
+       }
+
+       node_t *n = (node_t *)node;
+
+       if(!node_read_ecdsa_public_key(mesh, n) || !n->ecdsa) {
+               meshlink_errno = MESHLINK_EINTERNAL;
+               return false;
+       }
+
+       char *fingerprint = ecdsa_get_base64_public_key(n->ecdsa);
+
+       if(!fingerprint)
+               meshlink_errno = MESHLINK_EINTERNAL;
+
+       return fingerprint;
+}
+
 meshlink_node_t *meshlink_get_node(meshlink_handle_t *mesh, const char *name) {
        if(!mesh || !name) {
                meshlink_errno = MESHLINK_EINVAL;
@@ -1014,12 +1052,12 @@ meshlink_node_t *meshlink_get_node(meshlink_handle_t *mesh, const char *name) {
 }
 
 meshlink_node_t **meshlink_get_all_nodes(meshlink_handle_t *mesh, meshlink_node_t **nodes, size_t *nmemb) {
-       if(!mesh || (nmemb && !nodes)) {
+       if(!mesh || !nmemb || (*nmemb && !nodes)) {
                meshlink_errno = MESHLINK_EINVAL;
                return NULL;
        }
 
-       meshlink_node_t **result, **p;
+       meshlink_node_t **result;
 
        //lock mesh->nodes
        pthread_mutex_lock(&(mesh->nodes_mutex));
@@ -1028,6 +1066,7 @@ meshlink_node_t **meshlink_get_all_nodes(meshlink_handle_t *mesh, meshlink_node_
        result = realloc(nodes, *nmemb * sizeof *nodes);
 
        if(result) {
+               meshlink_node_t **p = result;
                for splay_each(node_t, n, mesh->nodes)
                        *p++ = (meshlink_node_t *)n;
        } else {