X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fmeshlink.c;h=6e2ca709b28679163d550d6890459904ed41d4a4;hb=2e606e5823d06aece9a0d4719e07ce3b28ebeadc;hp=d5ea5418e974c398ba181aa131dacf1cdd321df8;hpb=6d1ac53f5c34ece4c7a82efb432a8e1d81fcff0d;p=meshlink

diff --git a/src/meshlink.c b/src/meshlink.c
index d5ea5418..6e2ca709 100644
--- a/src/meshlink.c
+++ b/src/meshlink.c
@@ -47,6 +47,8 @@ typedef struct {
 #define MSG_NOSIGNAL 0
 #endif
 
+static pthread_mutex_t global_mutex;
+
 __thread meshlink_errno_t meshlink_errno;
 
 //TODO: this can go away completely
@@ -843,6 +845,9 @@ static void *meshlink_main_loop(void *arg) {
 }
 
 bool meshlink_start(meshlink_handle_t *mesh) {
+
+	fprintf(stderr, "meshlink_start called\n");
+
 	if(!mesh) {
 		meshlink_errno = MESHLINK_EINVAL;
 		return false;
@@ -868,14 +873,14 @@ bool meshlink_start(meshlink_handle_t *mesh) {
 
 	mesh->threadstarted=true;
 
-	// Start discovery
-	if(!discovery_start(mesh))
-		return false;
+	discovery_start(mesh);
 
 	return true;
 }
 
 void meshlink_stop(meshlink_handle_t *mesh) {
+
+	fprintf(stderr, "meshlink_stop called\n");
 	
 	if(!mesh) {
 		meshlink_errno = MESHLINK_EINVAL;
@@ -1672,40 +1677,21 @@ void meshlink_whitelist(meshlink_handle_t *mesh, meshlink_node_t *node) {
 /* Hint that a hostname may be found at an address
  * See header file for detailed comment.
  */
-extern void meshlink_hint_address(meshlink_handle_t *mesh, meshlink_node_t *node, struct sockaddr *addr) {
+extern void meshlink_hint_address(meshlink_handle_t *mesh, meshlink_node_t *node, const struct sockaddr *addr) {
 	if(!mesh || !node || !addr)
 		return;
 	
-	char *addr_str = malloc(MAX_ADDRESS_LENGTH*sizeof(char));
-	memset(addr_str, 0, MAX_ADDRESS_LENGTH*sizeof(char));
-
-	char *port_str = malloc(MAX_PORT_LENGTH*sizeof(char));
-	memset(port_str, 0, MAX_PORT_LENGTH*sizeof(char));
-	
-	// extra byte for a space, and one to make sure string is null-terminated
-	int full_addr_len = MAX_ADDRESS_LENGTH + MAX_PORT_LENGTH + 2;
+	char *host = NULL, *port = NULL, *str = NULL;
+	sockaddr2str((const sockaddr_t *)addr, &host, &port);
 
-	char *full_addr_str = malloc(full_addr_len*sizeof(char));
-	memset(full_addr_str, 0, full_addr_len*sizeof(char));
-	
-	// get address and port number
-	if(!get_ip_str(addr, addr_str, MAX_ADDRESS_LENGTH))
-		goto fail;
-	if(!get_port_str(addr, port_str, MAX_ADDRESS_LENGTH))
-		goto fail;
-
-	// append_config_file expects an address, a space, and then a port number
-	strcat(full_addr_str, addr_str);
-	strcat(full_addr_str, " ");
-	strcat(full_addr_str, port_str);
-	
-	append_config_file(mesh, node->name, "Address", full_addr_str);
+	if(host && port) {
+		xasprintf(&str, "%s %s", host, port);
+		append_config_file(mesh, node->name, "Address", str);
+	}
 
-fail:
-done:
-	free(addr_str);
-	free(port_str);
-	free(full_addr_str);
+	free(str);
+	free(host);
+	free(port);
 
 	// @TODO do we want to fire off a connection attempt right away?
 }