X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fresolve.cpp;h=6e17a1abb38a1318bfacf8e4b2fa8adf09a58583;hb=9661bcedc3518124bcdd95c239fa92419cd31216;hp=31b15fb9dd40ece09c09d2e25515bce25c2e00fd;hpb=4696a776e2875697ea0d6a733609dd9c37918971;p=libs%2Fnet.git

diff --git a/source/resolve.cpp b/source/resolve.cpp
index 31b15fb..6e17a1a 100644
--- a/source/resolve.cpp
+++ b/source/resolve.cpp
@@ -6,6 +6,7 @@
 #endif
 #include <msp/core/systemerror.h>
 #include <msp/strings/format.h>
+#include "sockaddr_private.h"
 #include "socket.h"
 #include "resolve.h"
 
@@ -37,14 +38,26 @@ SockAddr *resolve(const string &s, Family family)
 			host = s;
 	}
 
-	addrinfo hints = {0, family, 0, 0, 0, 0, 0, 0};
+	unsigned flags = 0;
+	if(host=="*")
+	{
+		flags = AI_PASSIVE;
+		host = string();
+	}
+
+	addrinfo hints = { flags, family_to_sys(family), 0, 0, 0, 0, 0, 0 };
 	addrinfo *res;
 	const char *chost = (host.empty() ? 0 : host.c_str());
 	const char *cserv = (serv.empty() ? 0 : serv.c_str());
 	int err = getaddrinfo(chost, cserv, &hints, &res);
 	if(err==0)
 	{
-		SockAddr *addr = SockAddr::create(*res->ai_addr);
+		SockAddr::SysAddr sa;
+		sa.size = res->ai_addrlen;
+		const char *sptr = reinterpret_cast<const char *>(res->ai_addr);
+		char *dptr = reinterpret_cast<char *>(&sa.addr);
+		copy(sptr, sptr+res->ai_addrlen, dptr);
+		SockAddr *addr = SockAddr::new_from_sys(sa);
 		freeaddrinfo(res);
 		return addr;
 	}