X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fmeshlink.c;h=7f009d940468a30afd704c2371c3bd25261b4e18;hb=b70895cf367100792263f04d97a7533b26c5ece3;hp=0ecab432912b4dc9c384700aea5043ac9160169c;hpb=2200060c4eaadae36b8150aa33b0db7c0d74722f;p=meshlink

diff --git a/src/meshlink.c b/src/meshlink.c
index 0ecab432..7f009d94 100644
--- a/src/meshlink.c
+++ b/src/meshlink.c
@@ -1679,39 +1679,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 *host = NULL, *port = NULL, *str = NULL;
+	sockaddr2str((const sockaddr_t *)addr, &host, &port);
 
-	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 *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:
-	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?
 }
@@ -1726,7 +1708,17 @@ static void __attribute__((destructor)) meshlink_exit(void) {
 
 int weight_from_dclass(dclass_t dclass)
 {
-	if(dclass == PORTABLE)
+	switch(dclass)
+	{
+	case BACKBONE:
+		return 1;
+
+	case STATIONARY:
 		return 3;
-	return 1;
+
+	case PORTABLE:
+		return 6;
+	}
+
+	return 9;
 }