X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fnetutl.c;h=f4ee5aa0f123151400b9628a1a0decd3a177b6a3;hb=HEAD;hp=6e7283505b5bb7464f1561a7a6054a97e448c283;hpb=e25f5166a3edc98f4a333c98881d4899635f1144;p=meshlink

diff --git a/src/netutl.c b/src/netutl.c
index 6e728350..79dadea5 100644
--- a/src/netutl.c
+++ b/src/netutl.c
@@ -19,6 +19,7 @@
 
 #include "system.h"
 
+#include "meshlink_internal.h"
 #include "net.h"
 #include "netutl.h"
 #include "logger.h"
@@ -57,7 +58,7 @@ sockaddr_t str2sockaddr(const char *address, const char *port) {
 
 	struct addrinfo hint = {
 		.ai_family = AF_UNSPEC,
-		.ai_flags = NI_NUMERICHOST | NI_NUMERICSERV,
+		.ai_flags = AI_NUMERICHOST | AI_NUMERICSERV,
 		.ai_socktype = SOCK_STREAM,
 	};
 
@@ -77,6 +78,44 @@ sockaddr_t str2sockaddr(const char *address, const char *port) {
 	return result;
 }
 
+sockaddr_t str2sockaddr_random(struct meshlink_handle *mesh, const char *address, const char *port) {
+	struct addrinfo *ai;
+	sockaddr_t result;
+	int err;
+
+	memset(&result, 0, sizeof(result));
+
+	struct addrinfo hint = {
+		.ai_family = AF_UNSPEC,
+		.ai_flags = AI_NUMERICHOST | AI_NUMERICSERV,
+		.ai_socktype = SOCK_STREAM,
+	};
+
+	err = getaddrinfo(address, port, &hint, &ai);
+
+	if(err || !ai) {
+		result.sa.sa_family = AF_UNKNOWN;
+		result.unknown.address = NULL;
+		result.unknown.port = NULL;
+		return result;
+	}
+
+	int count = 0;
+
+	for(struct addrinfo *aip = ai; aip; aip = aip->ai_next) {
+		count++;
+	}
+
+	struct addrinfo *aip = ai;
+
+	for(count = prng(mesh, count); count--; aip = aip->ai_next);
+
+	memcpy(&result, aip->ai_addr, aip->ai_addrlen);
+	freeaddrinfo(ai);
+
+	return result;
+}
+
 void sockaddr2str(const sockaddr_t *sa, char **addrstr, char **portstr) {
 	char address[NI_MAXHOST];
 	char port[NI_MAXSERV];
@@ -282,7 +321,8 @@ void packmsg_add_sockaddr(packmsg_output_t *out, const sockaddr_t *sa) {
 }
 
 sockaddr_t packmsg_get_sockaddr(packmsg_input_t *in) {
-	sockaddr_t sa = {0};
+	sockaddr_t sa;
+	memset(&sa, 0, sizeof sa);
 
 	int8_t type;
 	const void *data;