X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnet_socket.c;h=10f2ca0106c407d6dba832a99bf39c199ad3fa99;hp=5f9e2173e749355b88ed7ec0d523cca1adcda08d;hb=0e59fb022c6c015a5be7ed70e0378cb011be98b5;hpb=0e945413315c9d15a3eb013fa3731dd978a8c7b8

diff --git a/src/net_socket.c b/src/net_socket.c
index 5f9e2173..10f2ca01 100644
--- a/src/net_socket.c
+++ b/src/net_socket.c
@@ -17,7 +17,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: net_socket.c,v 1.1.2.32 2003/07/28 22:06:09 guus Exp $
+    $Id: net_socket.c,v 1.1.2.34 2003/10/06 14:41:45 guus Exp $
 */
 
 #include "system.h"
@@ -62,7 +62,7 @@ int setup_listen_socket(const sockaddr_t *sa)
 	nfd = socket(sa->sa.sa_family, SOCK_STREAM, IPPROTO_TCP);
 
 	if(nfd < 0) {
-		logger(LOG_ERR, _("Creating metasocket failed: %s"), strerror(errno));
+		ifdebug(STATUS) logger(LOG_ERR, _("Creating metasocket failed: %s"), strerror(errno));
 		return -1;
 	}
 
@@ -70,7 +70,7 @@ int setup_listen_socket(const sockaddr_t *sa)
 	flags = fcntl(nfd, F_GETFL);
 
 	if(fcntl(nfd, F_SETFL, flags | O_NONBLOCK) < 0) {
-		close(nfd);
+		closesocket(nfd);
 		logger(LOG_ERR, _("System call `%s' failed: %s"), "fcntl",
 			   strerror(errno));
 		return -1;
@@ -98,7 +98,7 @@ int setup_listen_socket(const sockaddr_t *sa)
 		strncpy(ifr.ifr_ifrn.ifrn_name, iface, IFNAMSIZ);
 
 		if(setsockopt(nfd, SOL_SOCKET, SO_BINDTODEVICE, &ifr, sizeof(ifr))) {
-			close(nfd);
+			closesocket(nfd);
 			logger(LOG_ERR, _("Can't bind to interface %s: %s"), iface,
 				   strerror(errno));
 			return -1;
@@ -109,7 +109,7 @@ int setup_listen_socket(const sockaddr_t *sa)
 	}
 
 	if(bind(nfd, &sa->sa, SALEN(sa->sa))) {
-		close(nfd);
+		closesocket(nfd);
 		addrstr = sockaddr2hostname(sa);
 		logger(LOG_ERR, _("Can't bind to %s/tcp: %s"), addrstr,
 			   strerror(errno));
@@ -118,7 +118,7 @@ int setup_listen_socket(const sockaddr_t *sa)
 	}
 
 	if(listen(nfd, 3)) {
-		close(nfd);
+		closesocket(nfd);
 		logger(LOG_ERR, _("System call `%s' failed: %s"), "listen",
 			   strerror(errno));
 		return -1;
@@ -149,7 +149,7 @@ int setup_vpn_in_socket(const sockaddr_t *sa)
 #ifdef O_NONBLOCK
 	flags = fcntl(nfd, F_GETFL);
 	if(fcntl(nfd, F_SETFL, flags | O_NONBLOCK) < 0) {
-		close(nfd);
+		closesocket(nfd);
 		logger(LOG_ERR, _("System call `%s' failed: %s"), "fcntl",
 			   strerror(errno));
 		return -1;
@@ -166,7 +166,7 @@ int setup_vpn_in_socket(const sockaddr_t *sa)
 		strncpy(ifr.ifr_ifrn.ifrn_name, iface, IFNAMSIZ);
 
 		if(setsockopt(nfd, SOL_SOCKET, SO_BINDTODEVICE, &ifr, sizeof(ifr))) {
-			close(nfd);
+			closesocket(nfd);
 			logger(LOG_ERR, _("Can't bind to interface %s: %s"), iface,
 				   strerror(errno));
 			return -1;
@@ -175,7 +175,7 @@ int setup_vpn_in_socket(const sockaddr_t *sa)
 #endif
 
 	if(bind(nfd, &sa->sa, SALEN(sa->sa))) {
-		close(nfd);
+		closesocket(nfd);
 		addrstr = sockaddr2hostname(sa);
 		logger(LOG_ERR, _("Can't bind to %s/udp: %s"), addrstr,
 			   strerror(errno));
@@ -308,7 +308,7 @@ begin:
 			return;
 		}
 
-		close(c->socket);
+		closesocket(c->socket);
 
 		ifdebug(CONNECTIONS) logger(LOG_ERR, _("%s: %s"), c->hostname, strerror(errno));