X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fnetutl.c;h=79dadea529beb918bbbdbe7500f503e393d2b664;hb=3be4a7ae10a1b558a77d9e9ac5fe138c9581b080;hp=5406bbb85e983f6fcfe1a48c0666c722a098e3e6;hpb=9506ae59be6efde85bc1b8dd1fe0ebbe009fb1f1;p=meshlink diff --git a/src/netutl.c b/src/netutl.c index 5406bbb8..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];