From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 3 Aug 2006 07:46:25 +0000 (+0000)
Subject: Patch from Frediano Ziglio: Windows compilation fixes on eventdns.c.
X-Git-Tag: tor-0.1.2.1-alpha~114
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=19cf66c0f1b509aa5b3e63bc7b3749ede273fe34;p=thirdparty%2Ftor.git

Patch from Frediano Ziglio: Windows compilation fixes on eventdns.c.

svn:r6971
---

diff --git a/src/or/eventdns.c b/src/or/eventdns.c
index 88a512f51c..583f8f7289 100644
--- a/src/or/eventdns.c
+++ b/src/or/eventdns.c
@@ -1186,8 +1186,8 @@ eventdns_nameserver_add(unsigned long int address) {
 	if (ns->socket < 0) { err = 1; goto out1; }
 #ifdef MS_WINDOWS
         {
-		int nonblocking = 1;
-		ioctlsocket(socket, FIONBIO, (unsigned long*) &nonblocking);
+		u_long nonblocking = 1;
+		ioctlsocket(ns->socket, FIONBIO, &nonblocking);
 	}
 #else
         fcntl(ns->socket, F_SETFL, O_NONBLOCK);
@@ -1223,7 +1223,11 @@ eventdns_nameserver_add(unsigned long int address) {
 	return 0;
 
 out2:
+#ifdef MS_WINDOWS
+	closesocket(ns->socket);
+#else
 	close(ns->socket);
+#endif
 out1:
 	free(ns);
 	return err;