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

diff --git a/src/net_socket.c b/src/net_socket.c
index 82875bba..5f9e2173 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.29 2003/07/18 13:45:06 guus Exp $
+    $Id: net_socket.c,v 1.1.2.32 2003/07/28 22:06:09 guus Exp $
 */
 
 #include "system.h"
@@ -34,6 +34,10 @@
 #include "utils.h"
 #include "xalloc.h"
 
+#ifdef WSAEINPROGRESS
+#define EINPROGRESS WSAEINPROGRESS
+#endif
+
 int addressfamily = AF_UNSPEC;
 int maxtimeout = 900;
 int seconds_till_retry = 5;
@@ -43,13 +47,15 @@ int listen_sockets;
 
 /* Setup sockets */
 
-int setup_listen_socket(sockaddr_t *sa)
+int setup_listen_socket(const sockaddr_t *sa)
 {
 	int nfd, flags;
 	char *addrstr;
 	int option;
 	char *iface;
+#ifdef SO_BINDTODEVICE
 	struct ifreq ifr;
+#endif
 
 	cp();
 
@@ -60,6 +66,7 @@ int setup_listen_socket(sockaddr_t *sa)
 		return -1;
 	}
 
+#ifdef O_NONBLOCK
 	flags = fcntl(nfd, F_GETFL);
 
 	if(fcntl(nfd, F_SETFL, flags | O_NONBLOCK) < 0) {
@@ -68,6 +75,7 @@ int setup_listen_socket(sockaddr_t *sa)
 			   strerror(errno));
 		return -1;
 	}
+#endif
 
 	/* Optimize TCP settings */
 
@@ -119,7 +127,7 @@ int setup_listen_socket(sockaddr_t *sa)
 	return nfd;
 }
 
-int setup_vpn_in_socket(sockaddr_t *sa)
+int setup_vpn_in_socket(const sockaddr_t *sa)
 {
 	int nfd, flags;
 	char *addrstr;
@@ -138,6 +146,7 @@ int setup_vpn_in_socket(sockaddr_t *sa)
 		return -1;
 	}
 
+#ifdef O_NONBLOCK
 	flags = fcntl(nfd, F_GETFL);
 	if(fcntl(nfd, F_SETFL, flags | O_NONBLOCK) < 0) {
 		close(nfd);
@@ -145,6 +154,7 @@ int setup_vpn_in_socket(sockaddr_t *sa)
 			   strerror(errno));
 		return -1;
 	}
+#endif
 
 	option = 1;
 	setsockopt(nfd, SOL_SOCKET, SO_REUSEADDR, &option, sizeof(option));
@@ -221,7 +231,7 @@ begin:
 		if(!c->outgoing->cfg) {
 			ifdebug(CONNECTIONS) logger(LOG_ERR, _("Could not set up a meta connection to %s"),
 					   c->name);
-			c->status.remove = 1;
+			c->status.remove = true;
 			retry_outgoing(c->outgoing);
 			return;
 		}
@@ -280,11 +290,13 @@ begin:
 
 	/* Non-blocking */
 
+#ifdef O_NONBLOCK
 	flags = fcntl(c->socket, F_GETFL);
 
 	if(fcntl(c->socket, F_SETFL, flags | O_NONBLOCK) < 0) {
 		logger(LOG_ERR, _("fcntl for %s: %s"), c->hostname, strerror(errno));
 	}
+#endif
 
 	/* Connect */
 
@@ -292,7 +304,7 @@ begin:
 
 	if(result == -1) {
 		if(errno == EINPROGRESS) {
-			c->status.connecting = 1;
+			c->status.connecting = true;
 			return;
 		}
 
@@ -357,7 +369,7 @@ void setup_outgoing_connection(outgoing_t *outgoing)
   accept a new tcp connect and create a
   new connection
 */
-int handle_new_meta_connection(int sock)
+bool handle_new_meta_connection(int sock)
 {
 	connection_t *c;
 	sockaddr_t sa;
@@ -370,7 +382,7 @@ int handle_new_meta_connection(int sock)
 	if(fd < 0) {
 		logger(LOG_ERR, _("Accepting a new connection failed: %s"),
 			   strerror(errno));
-		return -1;
+		return false;
 	}
 
 	sockaddrunmap(&sa);
@@ -393,7 +405,7 @@ int handle_new_meta_connection(int sock)
 	c->allow_request = ID;
 	send_id(c);
 
-	return 0;
+	return true;
 }
 
 void try_outgoing_connections(void)
@@ -408,7 +420,7 @@ void try_outgoing_connections(void)
 		cfg = lookup_config_next(config_tree, cfg)) {
 		get_config_string(cfg, &name);
 
-		if(check_id(name)) {
+		if(!check_id(name)) {
 			logger(LOG_ERR,
 				   _("Invalid name for outgoing connection in %s line %d"),
 				   cfg->file, cfg->line);