X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=src%2FIOHandler%2FIODNSEngine_cares.c;h=e37df98302d5dbbd085fc4993f6941f5c52edea5;hb=f40d2e60142d1cb141c46e63ed847b0d821ca920;hp=fd5cf48bd8a0bcc152e66eabcb5dfc3ed7b79bd1;hpb=d1112e33f9cd36560650f28a77d8d0b9716a1cea;p=NextIRCd.git

diff --git a/src/IOHandler/IODNSEngine_cares.c b/src/IOHandler/IODNSEngine_cares.c
index fd5cf48..e37df98 100644
--- a/src/IOHandler/IODNSEngine_cares.c
+++ b/src/IOHandler/IODNSEngine_cares.c
@@ -65,9 +65,9 @@ static int dnsengine_cares_init() {
 	// initialize cares
 	if((res = ares_init(&dnsengine_cares_channel)) != ARES_SUCCESS) {
 		iolog_trigger(IOLOG_ERROR, "Failed to initialize c-ares in %s:%d", __FILE__, __LINE__);
-        return 0;
-    }
-    return 1;
+		return 0;
+	}
+	return 1;
 }
 
 static void dnsengine_cares_update_sockets() {
@@ -250,6 +250,7 @@ static void dnsengine_cares_callback(void *arg, int status, int timeouts, struct
 					void *target = (host->h_addrtype == AF_INET ? ((void *) &((struct sockaddr_in *)dnsresult->result.addr.address)->sin_addr) : ((void *) &((struct sockaddr_in6 *)dnsresult->result.addr.address)->sin6_addr));
 					memcpy(target, *h_addr, host->h_length);
 					
+					dnsresult->result.addr.address->sa_family = host->h_addrtype;
 					if(host->h_addrtype == AF_INET) {
 						char str[INET_ADDRSTRLEN];
 						inet_ntop( AF_INET, &((struct sockaddr_in *)dnsresult->result.addr.address)->sin_addr, str, INET_ADDRSTRLEN );
@@ -336,28 +337,28 @@ static void dnsengine_cares_remove(struct _IODNSQuery *iodns) {
 }
 
 static void dnsengine_cares_loop() {
-    /* empty */
+	/* empty */
 }
 
 struct IODNSEngine dnsengine_cares = {
-    .name = "c-ares",
-    .init = dnsengine_cares_init,
+	.name = "c-ares",
+	.init = dnsengine_cares_init,
 	.stop = dnsengine_cares_stop,
-    .add = dnsengine_cares_add,
-    .remove = dnsengine_cares_remove,
-    .loop = dnsengine_cares_loop,
+	.add = dnsengine_cares_add,
+	.remove = dnsengine_cares_remove,
+	.loop = dnsengine_cares_loop,
 	.socket_callback = dnsengine_cares_socket_callback,
 };
 
 #else
 
 struct IODNSEngine dnsengine_cares = {
-    .name = "c-ares",
-    .init = NULL,
+	.name = "c-ares",
+	.init = NULL,
 	.stop = NULL,
-    .add = NULL,
-    .remove = NULL,
-    .loop = NULL,
+	.add = NULL,
+	.remove = NULL,
+	.loop = NULL,
 	.socket_callback = NULL,
 };