X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fmeshlink.c;h=f9e7e9054d291c308b6987a6d4460794e6c030f7;hb=efbdf1564bb6a8f17ca28e61ccc6a507f1159994;hp=e4061f93de6194c73f071c44eb452b81ee14fd45;hpb=0334735f0ff7fc3fc004aaf91e8a19b9709f7289;p=meshlink

diff --git a/src/meshlink.c b/src/meshlink.c
index e4061f93..f9e7e905 100644
--- 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
@@ -858,6 +859,10 @@ bool meshlink_start(meshlink_handle_t *mesh) {
 
 	mesh->threadstarted=true;
 
+	// Start discovery
+	if(!discovery_start(mesh))
+		return false;
+
 	return true;
 }
 
@@ -867,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++) {
@@ -1013,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;
@@ -1023,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));
@@ -1037,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 {